Merge remote-tracking branch 'origin/master' into feat/dashboard-plug…

…in-wrapper

CHANGELOG.md

@@ -1,3 +1,10 @@
+## [26.8.2](https://github.com/dhis2/analytics/compare/v26.8.1...v26.8.2) (2024-08-27)
+
+
+### Bug Fixes
+
+* add AO TYPE for event chart and event report ([#1697](https://github.com/dhis2/analytics/issues/1697)) ([efff1c8](https://github.com/dhis2/analytics/commit/efff1c81845a974fe8c60b593e6bbe42c19682d7))
+
 ## [26.8.1](https://github.com/dhis2/analytics/compare/v26.8.0...v26.8.1) (2024-08-08)
 
 

i18n/en.pot

@@ -5,8 +5,8 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"POT-Creation-Date: 2024-06-26T14:09:30.876Z\n"
-"PO-Revision-Date: 2024-06-26T14:09:30.876Z\n"
+"POT-Creation-Date: 2024-08-27T11:29:09.031Z\n"
+"PO-Revision-Date: 2024-08-27T11:29:09.033Z\n"
 
 msgid "view only"
 msgstr "view only"
@@ -67,6 +67,12 @@ msgstr "About this line list"
 msgid "About this visualization"
 msgstr "About this visualization"
 
+msgid "About this event chart"
+msgstr "About this event chart"
+
+msgid "About this event report"
+msgstr "About this event report"
+
 msgid "This app could not retrieve required data."
 msgstr "This app could not retrieve required data."
 

package.json

@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/analytics",
-    "version": "26.8.1",
+    "version": "26.8.2",
     "main": "./build/cjs/index.js",
     "module": "./build/es/index.js",
     "exports": {

src/components/AboutAOUnit/utils.js

@@ -3,6 +3,8 @@ import i18n from '@dhis2/d2-i18n'
 export const AO_TYPE_VISUALIZATION = 'visualization'
 export const AO_TYPE_MAP = 'map'
 export const AO_TYPE_EVENT_VISUALIZATION = 'eventVisualization'
+export const AO_TYPE_EVENT_CHART = 'eventChart'
+export const AO_TYPE_EVENT_REPORT = 'eventReport'
 
 export const AOTypeMap = {
     [AO_TYPE_VISUALIZATION]: {
@@ -14,6 +16,12 @@ export const AOTypeMap = {
     [AO_TYPE_EVENT_VISUALIZATION]: {
         apiEndpoint: 'eventVisualizations',
     },
+    [AO_TYPE_EVENT_CHART]: {
+        apiEndpoint: 'eventCharts',
+    },
+    [AO_TYPE_EVENT_REPORT]: {
+        apiEndpoint: 'eventReports',
+    },
 }
 
 const NO_TYPE = 'NO_TYPE'
@@ -28,6 +36,12 @@ const texts = {
     [AO_TYPE_VISUALIZATION]: {
         unitTitle: i18n.t('About this visualization'),
     },
+    [AO_TYPE_EVENT_CHART]: {
+        unitTitle: i18n.t('About this event chart'),
+    },
+    [AO_TYPE_EVENT_REPORT]: {
+        unitTitle: i18n.t('About this event report'),
+    },
     [NO_TYPE]: {
         unitTitle: i18n.t('About this visualization'),
     },

src/modules/__tests__/renderValue.spec.js

@@ -25,21 +25,21 @@ const tests = [
     // Numbers
     {
         value: 1000.5,
-        expected: '1 000.5',
+        expected: '1 000.50',
         valueType: VALUE_TYPE_NUMBER,
         round: true,
         dgs: DGS_SPACE,
     },
     {
-        value: 33777889.55,
-        expected: '33,777,889.5',
+        value: 33777889.555,
+        expected: '33,777,889.55',
         valueType: VALUE_TYPE_NUMBER,
         round: true,
         dgs: DGS_COMMA,
     },
     {
         value: 33777889.556,
-        expected: '33 777 889.6',
+        expected: '33 777 889.56',
         valueType: VALUE_TYPE_NUMBER,
         round: true,
         dgs: DGS_SPACE,
@@ -53,7 +53,7 @@ const tests = [
     },
     {
         value: 33777889.56,
-        expected: '33777889.6',
+        expected: '33777889.56',
         valueType: VALUE_TYPE_NUMBER,
         round: true,
         dgs: DGS_NONE,
@@ -74,7 +74,7 @@ const tests = [
     },
     {
         value: 1.101,
-        expected: '1.1',
+        expected: '1.10',
         valueType: VALUE_TYPE_NUMBER,
         round: true,
         dgs: DGS_SPACE,
@@ -135,16 +135,16 @@ const tests = [
         dgs: DGS_SPACE,
     },
     {
-        value: -0.0234,
-        expected: '-2.3%',
+        value: -0.02345,
+        expected: '-2.34%',
         valueType: VALUE_TYPE_NUMBER,
         numberType: NUMBER_TYPE_ROW_PERCENTAGE,
         round: true,
         dgs: DGS_SPACE,
     },
     {
-        value: -0.0234,
-        expected: '-2.34%',
+        value: -0.02345,
+        expected: '-2.345%',
         valueType: VALUE_TYPE_NUMBER,
         numberType: NUMBER_TYPE_ROW_PERCENTAGE,
         round: false,

src/modules/pivotTable/PivotTableEngine.js

@@ -8,7 +8,12 @@ import {
 } from '../dataTypes.js'
 import { DIMENSION_ID_ORGUNIT } from '../predefinedDimensions.js'
 import { renderValue } from '../renderValue.js'
-import { VALUE_TYPE_NUMBER, VALUE_TYPE_TEXT } from '../valueTypes.js'
+import {
+    VALUE_TYPE_NUMBER,
+    VALUE_TYPE_TEXT,
+    isBooleanValueType,
+    isNumericValueType,
+} from '../valueTypes.js'
 import { AdaptiveClippingController } from './AdaptiveClippingController.js'
 import { addToTotalIfNumber } from './addToTotalIfNumber.js'
 import { parseValue } from './parseValue.js'
@@ -744,7 +749,15 @@ export class PivotTableEngine {
                 totalCell.valueType = currentValueType
             }
 
-            if (dxDimension?.valueType === VALUE_TYPE_NUMBER) {
+            // compute subtotals and totals for all numeric and boolean value types
+            // in that case, force value type of subtotal and total cells to NUMBER to format them correctly
+            // (see DHIS2-9155)
+            if (
+                isNumericValueType(dxDimension?.valueType) ||
+                isBooleanValueType(dxDimension?.valueType)
+            ) {
+                totalCell.valueType = VALUE_TYPE_NUMBER
+
                 dataFields.forEach((field) => {
                     const headerIndex = this.dimensionLookup.dataHeaders[field]
                     const value = parseValue(dataRow[headerIndex])

src/modules/renderValue.js

@@ -47,7 +47,7 @@ const toFixedPrecisionString = (value, skipRounding) => {
         return value
     }
 
-    const precision = skipRounding ? 10 : value > -1 && value < 1 ? 2 : 1
+    const precision = skipRounding ? 10 : 2
 
     return value.toFixed(precision)
 }