@dhis2/analytics 26.8.1 → 26.8.3

package/build/cjs/components/AboutAOUnit/utils.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getTranslatedString = exports.AO_TYPE_VISUALIZATION = exports.AO_TYPE_MAP = exports.AO_TYPE_EVENT_VISUALIZATION = exports.AOTypeMap = void 0;
+exports.getTranslatedString = exports.AO_TYPE_VISUALIZATION = exports.AO_TYPE_MAP = exports.AO_TYPE_EVENT_VISUALIZATION = exports.AO_TYPE_EVENT_REPORT = exports.AO_TYPE_EVENT_CHART = exports.AOTypeMap = void 0;
 var _d2I18n = _interopRequireDefault(require("@dhis2/d2-i18n"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const AO_TYPE_VISUALIZATION = 'visualization';
@@ -12,6 +12,10 @@ const AO_TYPE_MAP = 'map';
 exports.AO_TYPE_MAP = AO_TYPE_MAP;
 const AO_TYPE_EVENT_VISUALIZATION = 'eventVisualization';
 exports.AO_TYPE_EVENT_VISUALIZATION = AO_TYPE_EVENT_VISUALIZATION;
+const AO_TYPE_EVENT_CHART = 'eventChart';
+exports.AO_TYPE_EVENT_CHART = AO_TYPE_EVENT_CHART;
+const AO_TYPE_EVENT_REPORT = 'eventReport';
+exports.AO_TYPE_EVENT_REPORT = AO_TYPE_EVENT_REPORT;
 const AOTypeMap = {
   [AO_TYPE_VISUALIZATION]: {
     apiEndpoint: 'visualizations'
@@ -21,6 +25,12 @@ const AOTypeMap = {
   },
   [AO_TYPE_EVENT_VISUALIZATION]: {
     apiEndpoint: 'eventVisualizations'
+  },
+  [AO_TYPE_EVENT_CHART]: {
+    apiEndpoint: 'eventCharts'
+  },
+  [AO_TYPE_EVENT_REPORT]: {
+    apiEndpoint: 'eventReports'
   }
 };
 exports.AOTypeMap = AOTypeMap;
@@ -35,6 +45,12 @@ const texts = {
   [AO_TYPE_VISUALIZATION]: {
     unitTitle: _d2I18n.default.t('About this visualization')
   },
+  [AO_TYPE_EVENT_CHART]: {
+    unitTitle: _d2I18n.default.t('About this event chart')
+  },
+  [AO_TYPE_EVENT_REPORT]: {
+    unitTitle: _d2I18n.default.t('About this event report')
+  },
   [NO_TYPE]: {
     unitTitle: _d2I18n.default.t('About this visualization')
   }

package/build/cjs/locales/en/translations.json

@@ -19,6 +19,8 @@
     "About this map": "About this map",
     "About this line list": "About this line list",
     "About this visualization": "About this visualization",
+    "About this event chart": "About this event chart",
+    "About this event report": "About this event report",
     "This app could not retrieve required data.": "This app could not retrieve required data.",
     "Network error": "Network error",
     "Data / Edit calculation": "Data / Edit calculation",

package/build/cjs/modules/__tests__/renderValue.spec.js

@@ -10,19 +10,19 @@ const tests = [
 // Numbers
 {
   value: 1000.5,
-  expected: '1 000.5',
+  expected: '1 000.50',
   valueType: _valueTypes.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: _valueTypes.VALUE_TYPE_NUMBER,
   round: true,
   dgs: DGS_COMMA
 }, {
   value: 33777889.556,
-  expected: '33 777 889.6',
+  expected: '33 777 889.56',
   valueType: _valueTypes.VALUE_TYPE_NUMBER,
   round: true,
   dgs: DGS_SPACE
@@ -35,7 +35,7 @@ const tests = [
   dgs: DGS_SPACE
 }, {
   value: 33777889.56,
-  expected: '33777889.6',
+  expected: '33777889.56',
   valueType: _valueTypes.VALUE_TYPE_NUMBER,
   round: true,
   dgs: DGS_NONE
@@ -53,7 +53,7 @@ const tests = [
   dgs: DGS_SPACE
 }, {
   value: 1.101,
-  expected: '1.1',
+  expected: '1.10',
   valueType: _valueTypes.VALUE_TYPE_NUMBER,
   round: true,
   dgs: DGS_SPACE
@@ -107,15 +107,15 @@ const tests = [
   round: false,
   dgs: DGS_SPACE
 }, {
-  value: -0.0234,
-  expected: '-2.3%',
+  value: -0.02345,
+  expected: '-2.34%',
   valueType: _valueTypes.VALUE_TYPE_NUMBER,
   numberType: _pivotTableConstants.NUMBER_TYPE_ROW_PERCENTAGE,
   round: true,
   dgs: DGS_SPACE
 }, {
-  value: -0.0234,
-  expected: '-2.34%',
+  value: -0.02345,
+  expected: '-2.345%',
   valueType: _valueTypes.VALUE_TYPE_NUMBER,
   numberType: _pivotTableConstants.NUMBER_TYPE_ROW_PERCENTAGE,
   round: false,

package/build/cjs/modules/pivotTable/PivotTableEngine.js

@@ -550,7 +550,12 @@ class PivotTableEngine {
       } else {
         totalCell.valueType = currentValueType;
       }
-      if ((dxDimension === null || dxDimension === void 0 ? void 0 : dxDimension.valueType) === _valueTypes.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 ((0, _valueTypes.isNumericValueType)(dxDimension === null || dxDimension === void 0 ? void 0 : dxDimension.valueType) || (0, _valueTypes.isBooleanValueType)(dxDimension === null || dxDimension === void 0 ? void 0 : dxDimension.valueType)) {
+        totalCell.valueType = _valueTypes.VALUE_TYPE_NUMBER;
         dataFields.forEach(field => {
           const headerIndex = this.dimensionLookup.dataHeaders[field];
           const value = (0, _parseValue.parseValue)(dataRow[headerIndex]);

package/build/cjs/modules/renderValue.js

@@ -43,7 +43,7 @@ const toFixedPrecisionString = (value, skipRounding) => {
     // Values returned from the server should keep their string representation
     return value;
   }
-  const precision = skipRounding ? 10 : value > -1 && value < 1 ? 2 : 1;
+  const precision = skipRounding ? 10 : 2;
   return value.toFixed(precision);
 };
 const renderValue = (value, valueType, visualization) => {

package/build/es/components/AboutAOUnit/utils.js

@@ -2,6 +2,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]: {
     apiEndpoint: 'visualizations'
@@ -11,6 +13,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';
@@ -24,6 +32,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')
   }

package/build/es/locales/en/translations.json

@@ -19,6 +19,8 @@
     "About this map": "About this map",
     "About this line list": "About this line list",
     "About this visualization": "About this visualization",
+    "About this event chart": "About this event chart",
+    "About this event report": "About this event report",
     "This app could not retrieve required data.": "This app could not retrieve required data.",
     "Network error": "Network error",
     "Data / Edit calculation": "Data / Edit calculation",

package/build/es/modules/__tests__/renderValue.spec.js

@@ -8,19 +8,19 @@ 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
@@ -33,7 +33,7 @@ const tests = [
   dgs: DGS_SPACE
 }, {
   value: 33777889.56,
-  expected: '33777889.6',
+  expected: '33777889.56',
   valueType: VALUE_TYPE_NUMBER,
   round: true,
   dgs: DGS_NONE
@@ -51,7 +51,7 @@ const tests = [
   dgs: DGS_SPACE
 }, {
   value: 1.101,
-  expected: '1.1',
+  expected: '1.10',
   valueType: VALUE_TYPE_NUMBER,
   round: true,
   dgs: DGS_SPACE
@@ -105,15 +105,15 @@ const tests = [
   round: false,
   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,

package/build/es/modules/pivotTable/PivotTableEngine.js

@@ -6,7 +6,7 @@ import times from 'lodash/times';
 import { DIMENSION_TYPE_DATA, DIMENSION_TYPE_DATA_ELEMENT_GROUP_SET, DIMENSION_TYPE_ORGANISATION_UNIT, DIMENSION_TYPE_PERIOD } 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';
@@ -543,7 +543,12 @@ export class PivotTableEngine {
       } else {
         totalCell.valueType = currentValueType;
       }
-      if ((dxDimension === null || dxDimension === void 0 ? void 0 : 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 === null || dxDimension === void 0 ? void 0 : dxDimension.valueType) || isBooleanValueType(dxDimension === null || dxDimension === void 0 ? void 0 : dxDimension.valueType)) {
+        totalCell.valueType = VALUE_TYPE_NUMBER;
         dataFields.forEach(field => {
           const headerIndex = this.dimensionLookup.dataHeaders[field];
           const value = parseValue(dataRow[headerIndex]);

package/build/es/modules/renderValue.js

@@ -36,7 +36,7 @@ const toFixedPrecisionString = (value, skipRounding) => {
     // Values returned from the server should keep their string representation
     return value;
   }
-  const precision = skipRounding ? 10 : value > -1 && value < 1 ? 2 : 1;
+  const precision = skipRounding ? 10 : 2;
   return value.toFixed(precision);
 };
 export const renderValue = (value, valueType, visualization) => {

package/package.json

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