Merge branch 'master' into fix/DHIS2-15558-interpretations-modal-height

dhis2 · Sep 4, 2023 · 4af256d · 4af256d
2 parents 25546ed + 6d1bcc9
commit 4af256d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [26.0.17](https://github.com/dhis2/analytics/compare/v26.0.16...v26.0.17) (2023-08-28)
+
+
+### Bug Fixes
+
+* use correct aggregation type if numberType undefined DHIS2-15698 ([#1564](https://github.com/dhis2/analytics/issues/1564)) ([c740e32](https://github.com/dhis2/analytics/commit/c740e320be568cce4430afaab688dd52ced83fa3))
+
 ## [26.0.16](https://github.com/dhis2/analytics/compare/v26.0.15...v26.0.16) (2023-08-18)
 
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/analytics",
-    "version": "26.0.16",
+    "version": "26.0.17",
     "main": "./build/cjs/index.js",
     "module": "./build/es/index.js",
     "exports": {

diff --git a/src/modules/pivotTable/PivotTableEngine.js b/src/modules/pivotTable/PivotTableEngine.js
@@ -835,7 +835,10 @@ export class PivotTableEngine {
         if (totalCell && totalCell.count) {
             totalCell.value = applyTotalAggregationType(
                 totalCell,
-                this.visualization.numberType !== NUMBER_TYPE_VALUE &&
+                // DHIS2-15698: do not override total aggregation type when numberType option is not present
+                // (numberType option default is VALUE)
+                this.visualization.numberType &&
+                    this.visualization.numberType !== NUMBER_TYPE_VALUE &&
                     AGGREGATE_TYPE_SUM
             )
             this.adaptiveClippingController.add(