@dhis2/analytics 26.0.16 → 26.0.17
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -626,7 +626,10 @@ class PivotTableEngine {
|
|
|
626
626
|
}
|
|
627
627
|
const totalCell = this.data[row][column];
|
|
628
628
|
if (totalCell && totalCell.count) {
|
|
629
|
-
totalCell.value = applyTotalAggregationType(totalCell,
|
|
629
|
+
totalCell.value = applyTotalAggregationType(totalCell,
|
|
630
|
+
// DHIS2-15698: do not override total aggregation type when numberType option is not present
|
|
631
|
+
// (numberType option default is VALUE)
|
|
632
|
+
this.visualization.numberType && this.visualization.numberType !== _pivotTableConstants.NUMBER_TYPE_VALUE && _pivotTableConstants.AGGREGATE_TYPE_SUM);
|
|
630
633
|
this.adaptiveClippingController.add({
|
|
631
634
|
row,
|
|
632
635
|
column
|
|
@@ -619,7 +619,10 @@ export class PivotTableEngine {
|
|
|
619
619
|
}
|
|
620
620
|
const totalCell = this.data[row][column];
|
|
621
621
|
if (totalCell && totalCell.count) {
|
|
622
|
-
totalCell.value = applyTotalAggregationType(totalCell,
|
|
622
|
+
totalCell.value = applyTotalAggregationType(totalCell,
|
|
623
|
+
// DHIS2-15698: do not override total aggregation type when numberType option is not present
|
|
624
|
+
// (numberType option default is VALUE)
|
|
625
|
+
this.visualization.numberType && this.visualization.numberType !== NUMBER_TYPE_VALUE && AGGREGATE_TYPE_SUM);
|
|
623
626
|
this.adaptiveClippingController.add({
|
|
624
627
|
row,
|
|
625
628
|
column
|