Skip to content

fix(tree-base): agg: remove now works #6828

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 4, 2018
Merged

fix(tree-base): agg: remove now works #6828

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions src/features/tree-base/js/tree-base.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1371,26 +1371,34 @@
* @param {array} parents the parents that we would want to aggregate onto
*/
aggregate: function( grid, row, parents ) {
if ( parents.length === 0 && row.treeNode && row.treeNode.aggregations ) {
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' ) {
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);
if (aggregation.col.treeAggregationFn) {
aggregation.col.treeAggregationFn(aggregation.col.treeFooterAggregation, fieldValue, numValue, row);
} else {
aggregation.col.treeFooterAggregation.value = undefined;
}
}
});
}

parents.forEach( function( parent, index ) {
if ( parent.treeNode.aggregations ) {
if (parent.treeNode.aggregations) {
parent.treeNode.aggregations.forEach( function( aggregation ) {
var fieldValue = grid.getCellValue(row, aggregation.col);
var numValue = Number(fieldValue);
aggregation.col.treeAggregationFn(aggregation, fieldValue, numValue, row);

if ( index === 0 && typeof(aggregation.col.treeFooterAggregation) !== 'undefined' ) {
aggregation.col.treeAggregationFn(aggregation.col.treeFooterAggregation, fieldValue, numValue, row);
if (index === 0 && typeof(aggregation.col.treeFooterAggregation) !== 'undefined') {
if (aggregation.col.treeAggregationFn) {
aggregation.col.treeAggregationFn(aggregation.col.treeFooterAggregation, fieldValue, numValue, row);
} else {
aggregation.col.treeFooterAggregation.value = undefined;
}
}
});
}
Expand Down