@dhis2/analytics 24.10.1 → 24.10.3

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [24.10.3](https://github.com/dhis2/analytics/compare/v24.10.2...v24.10.3) (2024-03-20)
+
+
+### Bug Fixes
+
+* show correct date and time in About AO Unit [DHIS2-15825, DHIS2-16365] [24.x] ([#1642](https://github.com/dhis2/analytics/issues/1642)) ([1c9068c](https://github.com/dhis2/analytics/commit/1c9068c9d153798ccbd61f6b916c1ee94ec122f8))
+
+## [24.10.2](https://github.com/dhis2/analytics/compare/v24.10.1...v24.10.2) (2023-10-25)
+
+
+### Bug Fixes
+
+* avoid undefined in totals DHIS2-14511 v39 ([#1587](https://github.com/dhis2/analytics/issues/1587)) ([9831c17](https://github.com/dhis2/analytics/commit/9831c17f696f763b4ef6125fef9a9999c520f5aa))
+
 ## [24.10.1](https://github.com/dhis2/analytics/compare/v24.10.0...v24.10.1) (2023-04-24)
 
 

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

@@ -81,6 +81,9 @@ const AboutAOUnit = /*#__PURE__*/(0, _react.forwardRef)((_ref3, ref) => {
     renderId
   } = _ref3;
   const [isExpanded, setIsExpanded] = (0, _react.useState)(true);
+  const {
+    fromServerDate
+  } = (0, _appRuntime.useTimeZoneConversion)();
   const queries = (0, _react.useMemo)(() => getQueries(type), [type]);
   const {
     data,
@@ -194,16 +197,16 @@ const AboutAOUnit = /*#__PURE__*/(0, _react.forwardRef)((_ref3, ref) => {
   }, /*#__PURE__*/_react.default.createElement(_ui.IconClock16, {
     color: _ui.colors.grey700
   }), _d2I18n.default.t('Last updated {{time}}', {
-    time: (0, _moment.default)(data.ao.lastUpdated).fromNow()
+    time: (0, _moment.default)(fromServerDate(data.ao.lastUpdated)).fromNow()
   })), /*#__PURE__*/_react.default.createElement("p", {
     className: "jsx-".concat(_AboutAOUnitStyle.default.__hash) + " " + "detailLine"
   }, /*#__PURE__*/_react.default.createElement(_ui.IconUser16, {
     color: _ui.colors.grey700
   }), (_data$ao$createdBy = data.ao.createdBy) !== null && _data$ao$createdBy !== void 0 && _data$ao$createdBy.displayName ? _d2I18n.default.t('Created {{time}} by {{author}}', {
-    time: (0, _moment.default)(data.ao.created).fromNow(),
+    time: (0, _moment.default)(fromServerDate(data.ao.created)).fromNow(),
     author: data.ao.createdBy.displayName
   }) : _d2I18n.default.t('Created {{time}}', {
-    time: (0, _moment.default)(data.ao.created).fromNow()
+    time: (0, _moment.default)(fromServerDate(data.ao.created)).fromNow()
   })), /*#__PURE__*/_react.default.createElement("p", {
     className: "jsx-".concat(_AboutAOUnitStyle.default.__hash) + " " + "detailLine"
   }, /*#__PURE__*/_react.default.createElement(_ui.IconView16, {

package/build/cjs/components/Interpretations/InterpretationModal/InterpretationThread.js

@@ -7,6 +7,8 @@ exports.InterpretationThread = void 0;
 
 var _style = _interopRequireDefault(require("styled-jsx/style"));
 
+var _appRuntime = require("@dhis2/app-runtime");
+
 var _ui = require("@dhis2/ui");
 
 var _classnames = _interopRequireDefault(require("classnames"));
@@ -39,6 +41,9 @@ const InterpretationThread = _ref => {
     onThreadUpdated,
     downloadMenuComponent: DownloadMenu
   } = _ref;
+  const {
+    fromServerDate
+  } = (0, _appRuntime.useTimeZoneConversion)();
   const focusRef = (0, _react.useRef)();
   (0, _react.useEffect)(() => {
     if (initialFocus && focusRef.current) {
@@ -57,7 +62,7 @@ const InterpretationThread = _ref => {
     className: "jsx-615306698" + " " + 'title'
   }, /*#__PURE__*/_react.default.createElement(_ui.IconClock16, {
     color: _ui.colors.grey700
-  }), (0, _moment.default)(interpretation.created).format('LLL')), DownloadMenu && /*#__PURE__*/_react.default.createElement(DownloadMenu, {
+  }), (0, _moment.default)(fromServerDate(interpretation.created)).format('LLL')), DownloadMenu && /*#__PURE__*/_react.default.createElement(DownloadMenu, {
     relativePeriodDate: interpretation.created,
     className: "jsx-615306698"
   }), /*#__PURE__*/_react.default.createElement("div", {

package/build/cjs/components/Interpretations/InterpretationsUnit/InterpretationList.js

@@ -7,6 +7,8 @@ exports.InterpretationList = void 0;
 
 var _style = _interopRequireDefault(require("styled-jsx/style"));
 
+var _appRuntime = require("@dhis2/app-runtime");
+
 var _ui = require("@dhis2/ui");
 
 var _moment = _interopRequireDefault(require("moment"));
@@ -43,6 +45,9 @@ const InterpretationList = _ref => {
     refresh,
     disabled
   } = _ref;
+  const {
+    fromServerDate
+  } = (0, _appRuntime.useTimeZoneConversion)();
   const interpretationsByDate = interpretations.reduce((groupedInterpretations, interpretation) => {
     const date = interpretation.created.split('T')[0];
 
@@ -67,7 +72,7 @@ const InterpretationList = _ref => {
   }), /*#__PURE__*/_react.default.createElement("time", {
     dateTime: date,
     className: _style.default.dynamic([["4058400613", [_ui.spacers.dp8, _ui.spacers.dp8, _ui.spacers.dp16, _ui.colors.grey800, _ui.spacers.dp12, _ui.spacers.dp12, _ui.spacers.dp32, _ui.spacers.dp4]]]) + " " + "date-header"
-  }, (0, _moment.default)(date).format('ll'))), /*#__PURE__*/_react.default.createElement("ol", {
+  }, (0, _moment.default)(fromServerDate(date)).format('ll'))), /*#__PURE__*/_react.default.createElement("ol", {
     className: _style.default.dynamic([["4058400613", [_ui.spacers.dp8, _ui.spacers.dp8, _ui.spacers.dp16, _ui.colors.grey800, _ui.spacers.dp12, _ui.spacers.dp12, _ui.spacers.dp32, _ui.spacers.dp4]]]) + " " + "interpretation-list"
   }, interpretationsByDate[date].sort(sortByCreatedDateDesc).map(interpretation => /*#__PURE__*/_react.default.createElement(_index.Interpretation, {
     key: interpretation.id,

package/build/cjs/components/Interpretations/common/Message/Message.js

@@ -7,6 +7,8 @@ exports.Message = void 0;
 
 var _style = _interopRequireDefault(require("styled-jsx/style"));
 
+var _appRuntime = require("@dhis2/app-runtime");
+
 var _d2UiRichText = require("@dhis2/d2-ui-rich-text");
 
 var _ui = require("@dhis2/ui");
@@ -26,24 +28,27 @@ const Message = _ref => {
     created,
     username
   } = _ref;
+  const {
+    fromServerDate
+  } = (0, _appRuntime.useTimeZoneConversion)();
   return /*#__PURE__*/_react.default.createElement("li", {
-    className: _style.default.dynamic([["2436588813", [_ui.spacers.dp8, _ui.colors.grey100, _ui.spacers.dp8, _ui.colors.grey900, _ui.colors.grey600, _ui.colors.grey900, _ui.spacers.dp8]]]) + " " + "container"
+    className: _style.default.dynamic([["4031345705", [_ui.spacers.dp8, _ui.colors.grey100, _ui.spacers.dp8, _ui.colors.grey900, _ui.colors.grey600, _ui.colors.grey900, _ui.spacers.dp8]]]) + " " + "container"
   }, /*#__PURE__*/_react.default.createElement("div", {
-    className: _style.default.dynamic([["2436588813", [_ui.spacers.dp8, _ui.colors.grey100, _ui.spacers.dp8, _ui.colors.grey900, _ui.colors.grey600, _ui.colors.grey900, _ui.spacers.dp8]]]) + " " + "header"
+    className: _style.default.dynamic([["4031345705", [_ui.spacers.dp8, _ui.colors.grey100, _ui.spacers.dp8, _ui.colors.grey900, _ui.colors.grey600, _ui.colors.grey900, _ui.spacers.dp8]]]) + " " + "header"
   }, /*#__PURE__*/_react.default.createElement(_ui.UserAvatar, {
     name: username,
     extrasmall: true
   }), username, /*#__PURE__*/_react.default.createElement("time", {
     dateTime: created,
-    className: _style.default.dynamic([["2436588813", [_ui.spacers.dp8, _ui.colors.grey100, _ui.spacers.dp8, _ui.colors.grey900, _ui.colors.grey600, _ui.colors.grey900, _ui.spacers.dp8]]])
-  }, (0, _moment.default)(created).format('lll'))), /*#__PURE__*/_react.default.createElement("div", {
-    className: _style.default.dynamic([["2436588813", [_ui.spacers.dp8, _ui.colors.grey100, _ui.spacers.dp8, _ui.colors.grey900, _ui.colors.grey600, _ui.colors.grey900, _ui.spacers.dp8]]]) + " " + "content"
+    className: _style.default.dynamic([["4031345705", [_ui.spacers.dp8, _ui.colors.grey100, _ui.spacers.dp8, _ui.colors.grey900, _ui.colors.grey600, _ui.colors.grey900, _ui.spacers.dp8]]])
+  }, (0, _moment.default)(fromServerDate(created)).format('lll'))), /*#__PURE__*/_react.default.createElement("div", {
+    className: _style.default.dynamic([["4031345705", [_ui.spacers.dp8, _ui.colors.grey100, _ui.spacers.dp8, _ui.colors.grey900, _ui.colors.grey600, _ui.colors.grey900, _ui.spacers.dp8]]]) + " " + "content"
   }, /*#__PURE__*/_react.default.createElement(_d2UiRichText.Parser, null, text)), /*#__PURE__*/_react.default.createElement("div", {
-    className: _style.default.dynamic([["2436588813", [_ui.spacers.dp8, _ui.colors.grey100, _ui.spacers.dp8, _ui.colors.grey900, _ui.colors.grey600, _ui.colors.grey900, _ui.spacers.dp8]]]) + " " + "footer"
+    className: _style.default.dynamic([["4031345705", [_ui.spacers.dp8, _ui.colors.grey100, _ui.spacers.dp8, _ui.colors.grey900, _ui.colors.grey600, _ui.colors.grey900, _ui.spacers.dp8]]]) + " " + "footer"
   }, children), /*#__PURE__*/_react.default.createElement(_style.default, {
-    id: "2436588813",
+    id: "4031345705",
     dynamic: [_ui.spacers.dp8, _ui.colors.grey100, _ui.spacers.dp8, _ui.colors.grey900, _ui.colors.grey600, _ui.colors.grey900, _ui.spacers.dp8]
-  }, [".container.__jsx-style-dynamic-selector{padding:".concat(_ui.spacers.dp8, ";background-color:").concat(_ui.colors.grey100, ";border-radius:5px;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;gap:").concat(_ui.spacers.dp8, ";}"), ".header.__jsx-style-dynamic-selector{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;gap:6px;-webkit-align-items:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;font-size:13px;line-height:16px;color:".concat(_ui.colors.grey900, ";}"), ".header.__jsx-style-dynamic-selector time.__jsx-style-dynamic-selector{font-size:12px;color:".concat(_ui.colors.grey600, ";}"), ".content.__jsx-style-dynamic-selector{font-size:14px;line-height:19px;color:".concat(_ui.colors.grey900, ";}"), ".content.__jsx-style-dynamic-selector p:first-child{margin:0;}", ".footer.__jsx-style-dynamic-selector{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;-webkit-align-items:flex-start;-webkit-box-align:flex-start;-ms-flex-align:flex-start;align-items:flex-start;gap:".concat(_ui.spacers.dp8, ";}")]));
+  }, [".container.__jsx-style-dynamic-selector{padding:".concat(_ui.spacers.dp8, ";background-color:").concat(_ui.colors.grey100, ";border-radius:5px;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;gap:").concat(_ui.spacers.dp8, ";}"), ".header.__jsx-style-dynamic-selector{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;gap:6px;-webkit-align-items:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;font-size:13px;line-height:16px;color:".concat(_ui.colors.grey900, ";}"), ".header.__jsx-style-dynamic-selector time.__jsx-style-dynamic-selector{font-size:12px;color:".concat(_ui.colors.grey600, ";}"), ".content.__jsx-style-dynamic-selector{font-size:14px;line-height:19px;color:".concat(_ui.colors.grey900, ";word-break:break-word;white-space:pre-line;}"), ".content.__jsx-style-dynamic-selector p:first-child{margin:0;}", ".footer.__jsx-style-dynamic-selector{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;-webkit-align-items:flex-start;-webkit-box-align:flex-start;-ms-flex-align:flex-start;align-items:flex-start;gap:".concat(_ui.spacers.dp8, ";}")]));
 };
 
 exports.Message = Message;

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

@@ -17,6 +17,8 @@ var _valueTypes = require("../valueTypes.js");
 
 var _AdaptiveClippingController = require("./AdaptiveClippingController.js");
 
+var _addToTotalIfNumber = require("./addToTotalIfNumber.js");
+
 var _parseValue = require("./parseValue.js");
 
 var _pivotTableConstants = require("./pivotTableConstants.js");
@@ -626,10 +628,7 @@ class PivotTableEngine {
         dataFields.forEach(field => {
           const headerIndex = this.dimensionLookup.dataHeaders[field];
           const value = (0, _parseValue.parseValue)(dataRow[headerIndex]);
-
-          if (value && !isNaN(value)) {
-            totalCell[field] = (totalCell[field] || 0) + value;
-          }
+          totalCell[field] = (0, _addToTotalIfNumber.addToTotalIfNumber)(value, totalCell[field]);
         });
       }
 
@@ -648,10 +647,7 @@ class PivotTableEngine {
       dataFields.forEach(field => {
         const headerIndex = this.dimensionLookup.dataHeaders[field];
         const value = (0, _parseValue.parseValue)(dataRow[headerIndex]);
-
-        if (value && !isNaN(value)) {
-          percentageTotal[field] = (percentageTotal[field] || 0) + value;
-        }
+        percentageTotal[field] = (0, _addToTotalIfNumber.addToTotalIfNumber)(value, percentageTotal[field]);
       });
 
       if (totals.columnSubtotal) {
@@ -666,10 +662,7 @@ class PivotTableEngine {
         dataFields.forEach(field => {
           const headerIndex = this.dimensionLookup.dataHeaders[field];
           const value = (0, _parseValue.parseValue)(dataRow[headerIndex]);
-
-          if (value && !isNaN(value)) {
-            percentageTotal[field] = (percentageTotal[field] || 0) + value;
-          }
+          percentageTotal[field] = (0, _addToTotalIfNumber.addToTotalIfNumber)(value, percentageTotal[field]);
         });
       }
 
@@ -685,10 +678,7 @@ class PivotTableEngine {
         dataFields.forEach(field => {
           const headerIndex = this.dimensionLookup.dataHeaders[field];
           const value = (0, _parseValue.parseValue)(dataRow[headerIndex]);
-
-          if (value && !isNaN(value)) {
-            percentageTotal[field] = (percentageTotal[field] || 0) + value;
-          }
+          percentageTotal[field] = (0, _addToTotalIfNumber.addToTotalIfNumber)(value, percentageTotal[field]);
         });
       }
     }
@@ -705,10 +695,7 @@ class PivotTableEngine {
       dataFields.forEach(field => {
         const headerIndex = this.dimensionLookup.dataHeaders[field];
         const value = (0, _parseValue.parseValue)(dataRow[headerIndex]);
-
-        if (value && !isNaN(value)) {
-          percentageTotal[field] = (percentageTotal[field] || 0) + value;
-        }
+        percentageTotal[field] = (0, _addToTotalIfNumber.addToTotalIfNumber)(value, percentageTotal[field]);
       });
 
       if (totals.rowSubtotal) {
@@ -723,10 +710,7 @@ class PivotTableEngine {
         dataFields.forEach(field => {
           const headerIndex = this.dimensionLookup.dataHeaders[field];
           const value = (0, _parseValue.parseValue)(dataRow[headerIndex]);
-
-          if (value && !isNaN(value)) {
-            percentageTotal[field] = (percentageTotal[field] || 0) + value;
-          }
+          percentageTotal[field] = (0, _addToTotalIfNumber.addToTotalIfNumber)(value, percentageTotal[field]);
         });
       }
 
@@ -742,10 +726,7 @@ class PivotTableEngine {
         dataFields.forEach(field => {
           const headerIndex = this.dimensionLookup.dataHeaders[field];
           const value = (0, _parseValue.parseValue)(dataRow[headerIndex]);
-
-          if (value && !isNaN(value)) {
-            percentageTotal[field] = (percentageTotal[field] || 0) + value;
-          }
+          percentageTotal[field] = (0, _addToTotalIfNumber.addToTotalIfNumber)(value, percentageTotal[field]);
         });
       }
     }

package/build/cjs/modules/pivotTable/__tests__/addToTotalIfNumber.spec.js

@@ -0,0 +1,72 @@
+"use strict";
+
+var _addToTotalIfNumber = require("../addToTotalIfNumber.js");
+
+const tests = [{
+  testName: 'negative value',
+  value: -1,
+  total: undefined,
+  expected: -1
+}, {
+  testName: 'zero value',
+  value: 0,
+  total: undefined,
+  expected: 0
+}, {
+  testName: 'positive value',
+  value: 1,
+  total: undefined,
+  expected: 1
+}, {
+  testName: 'null value',
+  value: null,
+  total: undefined,
+  expected: undefined
+}, {
+  testName: 'undefined value',
+  value: undefined,
+  total: undefined,
+  expected: undefined
+}, {
+  testName: 'string value',
+  value: 'string',
+  total: undefined,
+  expected: undefined
+}, {
+  testName: 'negative value with existing total',
+  value: -1,
+  total: 100,
+  expected: 99
+}, {
+  testName: 'zero value with existing total',
+  value: 0,
+  total: 100,
+  expected: 100
+}, {
+  testName: 'positive value with existing total',
+  value: 1,
+  total: 100,
+  expected: 101
+}, {
+  testName: 'null value with existing total',
+  value: null,
+  total: 100,
+  expected: 100
+}, {
+  testName: 'undefined value with existing total',
+  value: undefined,
+  total: 100,
+  expected: 100
+}, {
+  testName: 'string value with existing total',
+  value: 'string',
+  total: 100,
+  expected: 100
+}];
+describe('addToTotalIfNumber', () => {
+  tests.forEach(t => {
+    it(t.testName, () => {
+      expect((0, _addToTotalIfNumber.addToTotalIfNumber)(t.value, t.total)).toEqual(t.expected);
+    });
+  });
+});

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

@@ -0,0 +1,10 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.addToTotalIfNumber = void 0;
+
+const addToTotalIfNumber = (value, total) => typeof value === 'number' && Number.isFinite(value) ? (total !== null && total !== void 0 ? total : 0) + value : total;
+
+exports.addToTotalIfNumber = addToTotalIfNumber;

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

@@ -1,5 +1,5 @@
 import _JSXStyle from "styled-jsx/style";
-import { useDataQuery, useDataMutation } from '@dhis2/app-runtime';
+import { useDataQuery, useDataMutation, useTimeZoneConversion } from '@dhis2/app-runtime';
 import i18n from '@dhis2/d2-i18n';
 import { Parser as RichTextParser } from '@dhis2/d2-ui-rich-text';
 import { Button, CircularLoader, IconChevronDown24, IconChevronUp24, IconClock16, IconShare16, IconSubscribe24, IconSubscribeOff24, IconUser16, IconView16, colors } from '@dhis2/ui';
@@ -56,6 +56,9 @@ const AboutAOUnit = /*#__PURE__*/forwardRef((_ref3, ref) => {
     renderId
   } = _ref3;
   const [isExpanded, setIsExpanded] = useState(true);
+  const {
+    fromServerDate
+  } = useTimeZoneConversion();
   const queries = useMemo(() => getQueries(type), [type]);
   const {
     data,
@@ -169,16 +172,16 @@ const AboutAOUnit = /*#__PURE__*/forwardRef((_ref3, ref) => {
   }, /*#__PURE__*/React.createElement(IconClock16, {
     color: colors.grey700
   }), i18n.t('Last updated {{time}}', {
-    time: moment(data.ao.lastUpdated).fromNow()
+    time: moment(fromServerDate(data.ao.lastUpdated)).fromNow()
   })), /*#__PURE__*/React.createElement("p", {
     className: "jsx-".concat(styles.__hash) + " " + "detailLine"
   }, /*#__PURE__*/React.createElement(IconUser16, {
     color: colors.grey700
   }), (_data$ao$createdBy = data.ao.createdBy) !== null && _data$ao$createdBy !== void 0 && _data$ao$createdBy.displayName ? i18n.t('Created {{time}} by {{author}}', {
-    time: moment(data.ao.created).fromNow(),
+    time: moment(fromServerDate(data.ao.created)).fromNow(),
     author: data.ao.createdBy.displayName
   }) : i18n.t('Created {{time}}', {
-    time: moment(data.ao.created).fromNow()
+    time: moment(fromServerDate(data.ao.created)).fromNow()
   })), /*#__PURE__*/React.createElement("p", {
     className: "jsx-".concat(styles.__hash) + " " + "detailLine"
   }, /*#__PURE__*/React.createElement(IconView16, {

package/build/es/components/Interpretations/InterpretationModal/InterpretationThread.js

@@ -1,4 +1,5 @@
 import _JSXStyle from "styled-jsx/style";
+import { useTimeZoneConversion } from '@dhis2/app-runtime';
 import { IconClock16, colors } from '@dhis2/ui';
 import cx from 'classnames';
 import moment from 'moment';
@@ -18,6 +19,9 @@ const InterpretationThread = _ref => {
     onThreadUpdated,
     downloadMenuComponent: DownloadMenu
   } = _ref;
+  const {
+    fromServerDate
+  } = useTimeZoneConversion();
   const focusRef = useRef();
   useEffect(() => {
     if (initialFocus && focusRef.current) {
@@ -36,7 +40,7 @@ const InterpretationThread = _ref => {
     className: "jsx-615306698" + " " + 'title'
   }, /*#__PURE__*/React.createElement(IconClock16, {
     color: colors.grey700
-  }), moment(interpretation.created).format('LLL')), DownloadMenu && /*#__PURE__*/React.createElement(DownloadMenu, {
+  }), moment(fromServerDate(interpretation.created)).format('LLL')), DownloadMenu && /*#__PURE__*/React.createElement(DownloadMenu, {
     relativePeriodDate: interpretation.created,
     className: "jsx-615306698"
   }), /*#__PURE__*/React.createElement("div", {

package/build/es/components/Interpretations/InterpretationsUnit/InterpretationList.js

@@ -1,4 +1,5 @@
 import _JSXStyle from "styled-jsx/style";
+import { useTimeZoneConversion } from '@dhis2/app-runtime';
 import { IconCalendar24, colors, spacers } from '@dhis2/ui';
 import moment from 'moment';
 import PropTypes from 'prop-types';
@@ -29,6 +30,9 @@ export const InterpretationList = _ref => {
     refresh,
     disabled
   } = _ref;
+  const {
+    fromServerDate
+  } = useTimeZoneConversion();
   const interpretationsByDate = interpretations.reduce((groupedInterpretations, interpretation) => {
     const date = interpretation.created.split('T')[0];
 
@@ -53,7 +57,7 @@ export const InterpretationList = _ref => {
   }), /*#__PURE__*/React.createElement("time", {
     dateTime: date,
     className: _JSXStyle.dynamic([["4058400613", [spacers.dp8, spacers.dp8, spacers.dp16, colors.grey800, spacers.dp12, spacers.dp12, spacers.dp32, spacers.dp4]]]) + " " + "date-header"
-  }, moment(date).format('ll'))), /*#__PURE__*/React.createElement("ol", {
+  }, moment(fromServerDate(date)).format('ll'))), /*#__PURE__*/React.createElement("ol", {
     className: _JSXStyle.dynamic([["4058400613", [spacers.dp8, spacers.dp8, spacers.dp16, colors.grey800, spacers.dp12, spacers.dp12, spacers.dp32, spacers.dp4]]]) + " " + "interpretation-list"
   }, interpretationsByDate[date].sort(sortByCreatedDateDesc).map(interpretation => /*#__PURE__*/React.createElement(Interpretation, {
     key: interpretation.id,

package/build/es/components/Interpretations/common/Message/Message.js

@@ -1,4 +1,5 @@
 import _JSXStyle from "styled-jsx/style";
+import { useTimeZoneConversion } from '@dhis2/app-runtime';
 import { Parser as RichTextParser } from '@dhis2/d2-ui-rich-text';
 import { UserAvatar, spacers, colors } from '@dhis2/ui';
 import moment from 'moment';
@@ -12,24 +13,27 @@ const Message = _ref => {
     created,
     username
   } = _ref;
+  const {
+    fromServerDate
+  } = useTimeZoneConversion();
   return /*#__PURE__*/React.createElement("li", {
-    className: _JSXStyle.dynamic([["2436588813", [spacers.dp8, colors.grey100, spacers.dp8, colors.grey900, colors.grey600, colors.grey900, spacers.dp8]]]) + " " + "container"
+    className: _JSXStyle.dynamic([["4031345705", [spacers.dp8, colors.grey100, spacers.dp8, colors.grey900, colors.grey600, colors.grey900, spacers.dp8]]]) + " " + "container"
   }, /*#__PURE__*/React.createElement("div", {
-    className: _JSXStyle.dynamic([["2436588813", [spacers.dp8, colors.grey100, spacers.dp8, colors.grey900, colors.grey600, colors.grey900, spacers.dp8]]]) + " " + "header"
+    className: _JSXStyle.dynamic([["4031345705", [spacers.dp8, colors.grey100, spacers.dp8, colors.grey900, colors.grey600, colors.grey900, spacers.dp8]]]) + " " + "header"
   }, /*#__PURE__*/React.createElement(UserAvatar, {
     name: username,
     extrasmall: true
   }), username, /*#__PURE__*/React.createElement("time", {
     dateTime: created,
-    className: _JSXStyle.dynamic([["2436588813", [spacers.dp8, colors.grey100, spacers.dp8, colors.grey900, colors.grey600, colors.grey900, spacers.dp8]]])
-  }, moment(created).format('lll'))), /*#__PURE__*/React.createElement("div", {
-    className: _JSXStyle.dynamic([["2436588813", [spacers.dp8, colors.grey100, spacers.dp8, colors.grey900, colors.grey600, colors.grey900, spacers.dp8]]]) + " " + "content"
+    className: _JSXStyle.dynamic([["4031345705", [spacers.dp8, colors.grey100, spacers.dp8, colors.grey900, colors.grey600, colors.grey900, spacers.dp8]]])
+  }, moment(fromServerDate(created)).format('lll'))), /*#__PURE__*/React.createElement("div", {
+    className: _JSXStyle.dynamic([["4031345705", [spacers.dp8, colors.grey100, spacers.dp8, colors.grey900, colors.grey600, colors.grey900, spacers.dp8]]]) + " " + "content"
   }, /*#__PURE__*/React.createElement(RichTextParser, null, text)), /*#__PURE__*/React.createElement("div", {
-    className: _JSXStyle.dynamic([["2436588813", [spacers.dp8, colors.grey100, spacers.dp8, colors.grey900, colors.grey600, colors.grey900, spacers.dp8]]]) + " " + "footer"
+    className: _JSXStyle.dynamic([["4031345705", [spacers.dp8, colors.grey100, spacers.dp8, colors.grey900, colors.grey600, colors.grey900, spacers.dp8]]]) + " " + "footer"
   }, children), /*#__PURE__*/React.createElement(_JSXStyle, {
-    id: "2436588813",
+    id: "4031345705",
     dynamic: [spacers.dp8, colors.grey100, spacers.dp8, colors.grey900, colors.grey600, colors.grey900, spacers.dp8]
-  }, [".container.__jsx-style-dynamic-selector{padding:".concat(spacers.dp8, ";background-color:").concat(colors.grey100, ";border-radius:5px;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;gap:").concat(spacers.dp8, ";}"), ".header.__jsx-style-dynamic-selector{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;gap:6px;-webkit-align-items:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;font-size:13px;line-height:16px;color:".concat(colors.grey900, ";}"), ".header.__jsx-style-dynamic-selector time.__jsx-style-dynamic-selector{font-size:12px;color:".concat(colors.grey600, ";}"), ".content.__jsx-style-dynamic-selector{font-size:14px;line-height:19px;color:".concat(colors.grey900, ";}"), ".content.__jsx-style-dynamic-selector p:first-child{margin:0;}", ".footer.__jsx-style-dynamic-selector{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;-webkit-align-items:flex-start;-webkit-box-align:flex-start;-ms-flex-align:flex-start;align-items:flex-start;gap:".concat(spacers.dp8, ";}")]));
+  }, [".container.__jsx-style-dynamic-selector{padding:".concat(spacers.dp8, ";background-color:").concat(colors.grey100, ";border-radius:5px;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;gap:").concat(spacers.dp8, ";}"), ".header.__jsx-style-dynamic-selector{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;gap:6px;-webkit-align-items:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;font-size:13px;line-height:16px;color:".concat(colors.grey900, ";}"), ".header.__jsx-style-dynamic-selector time.__jsx-style-dynamic-selector{font-size:12px;color:".concat(colors.grey600, ";}"), ".content.__jsx-style-dynamic-selector{font-size:14px;line-height:19px;color:".concat(colors.grey900, ";word-break:break-word;white-space:pre-line;}"), ".content.__jsx-style-dynamic-selector p:first-child{margin:0;}", ".footer.__jsx-style-dynamic-selector{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;-webkit-align-items:flex-start;-webkit-box-align:flex-start;-ms-flex-align:flex-start;align-items:flex-start;gap:".concat(spacers.dp8, ";}")]));
 };
 
 Message.propTypes = {

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

@@ -6,6 +6,7 @@ import { DIMENSION_ID_ORGUNIT } from '../predefinedDimensions.js';
 import { renderValue } from '../renderValue.js';
 import { VALUE_TYPE_NUMBER, VALUE_TYPE_TEXT } from '../valueTypes.js';
 import { AdaptiveClippingController } from './AdaptiveClippingController.js';
+import { addToTotalIfNumber } from './addToTotalIfNumber.js';
 import { parseValue } from './parseValue.js';
 import { AGGREGATE_TYPE_NA, AGGREGATE_TYPE_AVERAGE, AGGREGATE_TYPE_SUM, CELL_TYPE_VALUE, CELL_TYPE_TOTAL, CELL_TYPE_SUBTOTAL, SORT_ORDER_ASCENDING, SORT_ORDER_DESCENDING, DISPLAY_DENSITY_PADDING_COMPACT, DISPLAY_DENSITY_PADDING_COMFORTABLE, DISPLAY_DENSITY_OPTION_COMFORTABLE, DISPLAY_DENSITY_OPTION_COMPACT, DISPLAY_DENSITY_OPTION_NORMAL, DISPLAY_DENSITY_PADDING_NORMAL, FONT_SIZE_OPTION_SMALL, FONT_SIZE_SMALL, FONT_SIZE_OPTION_LARGE, FONT_SIZE_LARGE, FONT_SIZE_OPTION_NORMAL, FONT_SIZE_NORMAL, NUMBER_TYPE_COLUMN_PERCENTAGE, NUMBER_TYPE_ROW_PERCENTAGE, NUMBER_TYPE_VALUE } from './pivotTableConstants.js';
 const dataFields = ['value', 'numerator', 'denominator', 'factor', 'multiplier', 'divisor'];
@@ -609,10 +610,7 @@ export class PivotTableEngine {
         dataFields.forEach(field => {
           const headerIndex = this.dimensionLookup.dataHeaders[field];
           const value = parseValue(dataRow[headerIndex]);
-
-          if (value && !isNaN(value)) {
-            totalCell[field] = (totalCell[field] || 0) + value;
-          }
+          totalCell[field] = addToTotalIfNumber(value, totalCell[field]);
         });
       }
 
@@ -631,10 +629,7 @@ export class PivotTableEngine {
       dataFields.forEach(field => {
         const headerIndex = this.dimensionLookup.dataHeaders[field];
         const value = parseValue(dataRow[headerIndex]);
-
-        if (value && !isNaN(value)) {
-          percentageTotal[field] = (percentageTotal[field] || 0) + value;
-        }
+        percentageTotal[field] = addToTotalIfNumber(value, percentageTotal[field]);
       });
 
       if (totals.columnSubtotal) {
@@ -649,10 +644,7 @@ export class PivotTableEngine {
         dataFields.forEach(field => {
           const headerIndex = this.dimensionLookup.dataHeaders[field];
           const value = parseValue(dataRow[headerIndex]);
-
-          if (value && !isNaN(value)) {
-            percentageTotal[field] = (percentageTotal[field] || 0) + value;
-          }
+          percentageTotal[field] = addToTotalIfNumber(value, percentageTotal[field]);
         });
       }
 
@@ -668,10 +660,7 @@ export class PivotTableEngine {
         dataFields.forEach(field => {
           const headerIndex = this.dimensionLookup.dataHeaders[field];
           const value = parseValue(dataRow[headerIndex]);
-
-          if (value && !isNaN(value)) {
-            percentageTotal[field] = (percentageTotal[field] || 0) + value;
-          }
+          percentageTotal[field] = addToTotalIfNumber(value, percentageTotal[field]);
         });
       }
     }
@@ -688,10 +677,7 @@ export class PivotTableEngine {
       dataFields.forEach(field => {
         const headerIndex = this.dimensionLookup.dataHeaders[field];
         const value = parseValue(dataRow[headerIndex]);
-
-        if (value && !isNaN(value)) {
-          percentageTotal[field] = (percentageTotal[field] || 0) + value;
-        }
+        percentageTotal[field] = addToTotalIfNumber(value, percentageTotal[field]);
       });
 
       if (totals.rowSubtotal) {
@@ -706,10 +692,7 @@ export class PivotTableEngine {
         dataFields.forEach(field => {
           const headerIndex = this.dimensionLookup.dataHeaders[field];
           const value = parseValue(dataRow[headerIndex]);
-
-          if (value && !isNaN(value)) {
-            percentageTotal[field] = (percentageTotal[field] || 0) + value;
-          }
+          percentageTotal[field] = addToTotalIfNumber(value, percentageTotal[field]);
         });
       }
 
@@ -725,10 +708,7 @@ export class PivotTableEngine {
         dataFields.forEach(field => {
           const headerIndex = this.dimensionLookup.dataHeaders[field];
           const value = parseValue(dataRow[headerIndex]);
-
-          if (value && !isNaN(value)) {
-            percentageTotal[field] = (percentageTotal[field] || 0) + value;
-          }
+          percentageTotal[field] = addToTotalIfNumber(value, percentageTotal[field]);
         });
       }
     }

package/build/es/modules/pivotTable/__tests__/addToTotalIfNumber.spec.js

@@ -0,0 +1,69 @@
+import { addToTotalIfNumber } from '../addToTotalIfNumber.js';
+const tests = [{
+  testName: 'negative value',
+  value: -1,
+  total: undefined,
+  expected: -1
+}, {
+  testName: 'zero value',
+  value: 0,
+  total: undefined,
+  expected: 0
+}, {
+  testName: 'positive value',
+  value: 1,
+  total: undefined,
+  expected: 1
+}, {
+  testName: 'null value',
+  value: null,
+  total: undefined,
+  expected: undefined
+}, {
+  testName: 'undefined value',
+  value: undefined,
+  total: undefined,
+  expected: undefined
+}, {
+  testName: 'string value',
+  value: 'string',
+  total: undefined,
+  expected: undefined
+}, {
+  testName: 'negative value with existing total',
+  value: -1,
+  total: 100,
+  expected: 99
+}, {
+  testName: 'zero value with existing total',
+  value: 0,
+  total: 100,
+  expected: 100
+}, {
+  testName: 'positive value with existing total',
+  value: 1,
+  total: 100,
+  expected: 101
+}, {
+  testName: 'null value with existing total',
+  value: null,
+  total: 100,
+  expected: 100
+}, {
+  testName: 'undefined value with existing total',
+  value: undefined,
+  total: 100,
+  expected: 100
+}, {
+  testName: 'string value with existing total',
+  value: 'string',
+  total: 100,
+  expected: 100
+}];
+describe('addToTotalIfNumber', () => {
+  tests.forEach(t => {
+    it(t.testName, () => {
+      expect(addToTotalIfNumber(t.value, t.total)).toEqual(t.expected);
+    });
+  });
+});

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

@@ -0,0 +1 @@
+export const addToTotalIfNumber = (value, total) => typeof value === 'number' && Number.isFinite(value) ? (total !== null && total !== void 0 ? total : 0) + value : total;

package/package.json

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