From f750cfb41d4f8b539202e93cbff56c18041f74ea Mon Sep 17 00:00:00 2001
From: alexs75 <alexs75@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Thu, 14 Aug 2014 12:50:39 +0000
Subject: [PATCH] RxDBGrid - not calc footer values for hidden columns, cacl
 footer values for AVG function

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@3482 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 components/rx/trunk/exsortzeos.pas  |  2 +-
 components/rx/trunk/rxdbgrid.pas    | 45 ++++++++++++++++++++---------
 components/rx/trunk/rxsortmemds.pas |  2 +-
 3 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/components/rx/trunk/exsortzeos.pas b/components/rx/trunk/exsortzeos.pas
index 296072963..1f05e93e6 100644
--- a/components/rx/trunk/exsortzeos.pas
+++ b/components/rx/trunk/exsortzeos.pas
@@ -75,7 +75,7 @@ begin
     begin
       Col:=TRxColumn(AGrid.Columns[i]);
       if THackRxColumnFooter(Col.Footer).ValueType in [fvtSum, fvtAvg, fvtMax, fvtMin] then
-        THackRxColumnFooter(Col.Footer).UpdateTestValueFromVar( ADataSet.FieldByName(Col.Footer.FieldName).Value);
+//        THackRxColumnFooter(Col.Footer).UpdateTestValueFromVar( ADataSet.FieldByName(Col.Footer.FieldName).Value);
     end;
 
     ADataSet.Next;
diff --git a/components/rx/trunk/rxdbgrid.pas b/components/rx/trunk/rxdbgrid.pas
index 28738a10d..c224dde0b 100644
--- a/components/rx/trunk/rxdbgrid.pas
+++ b/components/rx/trunk/rxdbgrid.pas
@@ -264,6 +264,7 @@ type
     FAlignment: TAlignment;
     FDisplayFormat: string;
     FFieldName: string;
+    FField:TField;
     FValue: string;
     FValueType: TFooterValueType;
     FTestValue: double;
@@ -4234,6 +4235,8 @@ var
   SaveBeforeScroll:TDataSetNotifyEvent;
   RCol:TRxColumn;
   AValue:Variant;
+
+  FCList:TFPList;
 begin
   if (not (FFooterOptions.Active and DatalinkActive)) or (Columns.Count = 0) or (gsAddingAutoColumns in GridStatus)  then
     Exit;
@@ -4298,30 +4301,44 @@ begin
   DHL.ActiveRecord:=0;
   SavePos:=DHS.RecNo;
 
+  FCList:=TFPList.Create;
+  for i:=0 to Columns.Count-1 do
+  begin
+    RCol:=TRxColumn(Columns[i]);
+    if (RCol.Footer.ValueType in [fvtSum, fvtAvg, fvtMax, fvtMin]) and RCol.Visible then
+    begin
+      FCList.Add(RCol);
+      RCol.Footer.FField:=DHS.FieldByName(RCol.Footer.FieldName);
+    end;
+  end;
 
   DHS.First;
   while not DHS.EOF do
   begin
-    for i:=0 to Columns.Count-1 do
+    for i:=0 to FCList.Count-1 do
     begin
-      RCol:=TRxColumn(Columns[i]);
-      if RCol.Footer.ValueType in [fvtSum, fvtAvg, fvtMax, fvtMin] then
-          RCol.Footer.UpdateTestValueFromVar( DHS.FieldByName(RCol.Footer.FieldName).Value);
+      RCol:=TRxColumn(FCList[i]);
+      if RCol.FFooter.FValueType in [fvtSum, fvtAvg, fvtMax, fvtMin] then
+        RCol.FFooter.UpdateTestValueFromVar( RCol.FFooter.FField.AsFloat)
     end;
     inc(cnt);
     DHS.Next;
   end;
 
+  FCList.Free;
+
   for i:=0 to Columns.Count-1 do
   begin
     RCol:=TRxColumn(Columns[i]);
     if RCol.Footer.ValueType = fvtCount then
-        RCol.Footer.FCountRec:=Cnt;
+        RCol.FFooter.FCountRec:=Cnt
+    else
+    if RCol.Footer.ValueType = fvtAvg then
+      RCol.FFooter.FTestValue:=RCol.FFooter.FTestValue / Cnt;
   end;
 
   DHS.RecNo := Min(DHL.RecordCount + SavePos - 1, DHS.RecNo);
   K:=DHS.RecNo;
-//  DHS.RecNo := SavePos;
 
   while not DHS.BOF do
   begin
@@ -4330,6 +4347,9 @@ begin
     DHS.Prior;
   end;
 
+  for i:=0 to Columns.Count-1 do
+    TRxColumn(Columns[i]).Footer.FField:=nil;
+
   DHL.ActiveRecord:=SaveActiveRecord;
   DHS.RestoreState(SaveState);
 
@@ -5650,15 +5670,12 @@ begin
 end;
 
 procedure TRxColumnFooter.UpdateTestValueFromVar(AValue: Variant);
-var
-  F: TField;
 begin
-  if ValueType in [fvtSum, fvtAvg, fvtMax, fvtMin] then
+  if FValueType in [fvtSum, fvtAvg, fvtMax, fvtMin] then
   begin
-    F := TRxDBGrid(FOwner.Grid).DataSource.DataSet.FindField(FFieldName);
-    if (not VarIsEmpty(AValue)) and (AValue <> null) and Assigned(F) then
+    if (not VarIsEmpty(AValue)) and (AValue <> null) and Assigned(FField) then
     begin
-      if F.DataType in [ftDate, ftTime, ftDateTime, ftTimeStamp] then
+      if FField.DataType in [ftDate, ftTime, ftDateTime, ftTimeStamp] then
       begin
         case FValueType of
           fvtMax: FTestValue := Max(FTestValue, AValue);
@@ -5668,8 +5685,8 @@ begin
       else
       begin
         case FValueType of
-          fvtSum: FTestValue := FTestValue + AValue;
-          //        fvtAvg:
+          fvtSum,
+          fvtAvg: FTestValue := FTestValue + AValue;
           fvtMax: FTestValue := Max(FTestValue, AValue);
           fvtMin: FTestValue := Min(FTestValue, AValue);
         end;
diff --git a/components/rx/trunk/rxsortmemds.pas b/components/rx/trunk/rxsortmemds.pas
index a5f7e1d8a..82210b284 100644
--- a/components/rx/trunk/rxsortmemds.pas
+++ b/components/rx/trunk/rxsortmemds.pas
@@ -92,7 +92,7 @@ begin
     begin
       Col:=TRxColumn(AGrid.Columns[i]);
       if THackRxColumnFooter(Col.Footer).ValueType in [fvtSum, fvtAvg, fvtMax, fvtMin] then
-        THackRxColumnFooter(Col.Footer).UpdateTestValueFromVar( ADataSet.FieldByName(Col.Footer.FieldName).Value);
+//        THackRxColumnFooter(Col.Footer).UpdateTestValueFromVar( ADataSet.FieldByName(Col.Footer.FieldName).Value);
     end;
 
     ADataSet.Next;