Merge pull request #3907 from AgDude/agdude-grouping

Fix bugs in footer aggregation in grouping

Author: AgDude

src/features/tree-base/js/tree-base.js

@@ -1327,8 +1327,15 @@
        * @param {array} parents the parents that we would want to aggregate onto
        */
       aggregate: function( grid, row, parents ){
-        if ( parents.length === 0 ){
-          return;
+        if ( parents.length === 0 && row.treeNode && row.treeNode.aggregations ){
+          row.treeNode.aggregations.forEach(function(aggregation){
+            // Calculate aggregations for footer even if there are no grouped rows
+            if ( typeof(aggregation.col.treeFooterAggregation) !== 'undefined' ) {
+              var fieldValue = grid.getCellValue(row, aggregation.col);
+              var numValue = Number(fieldValue);
+              aggregation.col.treeAggregationFn(aggregation.col.treeFooterAggregation, fieldValue, numValue, row);
+            }
+          });
         }
 
         parents.forEach( function( parent, index ){
@@ -1338,7 +1345,7 @@
               var numValue = Number(fieldValue);
               aggregation.col.treeAggregationFn(aggregation, fieldValue, numValue, row);
 
-              if ( index === 0 && typeof aggregation.col.treeFooterAggregation !== 'undefined' ){
+              if ( index === 0 && typeof(aggregation.col.treeFooterAggregation) !== 'undefined' ){
                 aggregation.col.treeAggregationFn(aggregation.col.treeFooterAggregation, fieldValue, numValue, row);
               }
             });
@@ -1507,6 +1514,10 @@
        */
       treeFooterAggregationType: function( rows, column ) {
         service.finaliseAggregation(undefined, column.treeFooterAggregation);
+        if ( typeof(column.treeFooterAggregation.value) === 'undefined' || column.treeFooterAggregation.rendered === null ){
+          // The was apparently no aggregation performed (perhaps this is a grouped column
+          return '';
+        }
         return column.treeFooterAggregation.rendered;
       }
     };