@dhis2/analytics 26.8.5 → 26.8.7

package/build/cjs/components/PivotTable/PivotTableValueCell.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.PivotTableValueCell = void 0;
+var _d2I18n = _interopRequireDefault(require("@dhis2/d2-i18n"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _react = _interopRequireWildcard(require("react"));
 var _applyLegendSet = require("../../modules/pivotTable/applyLegendSet.js");
@@ -16,7 +17,7 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const PivotTableValueCell = _ref => {
-  var _cellContent$rendered;
+  var _cellContent$titleVal, _cellContent$rendered;
   let {
     row,
     column,
@@ -54,7 +55,10 @@ const PivotTableValueCell = _ref => {
   return /*#__PURE__*/_react.default.createElement(_PivotTableCell.PivotTableCell, {
     key: column,
     classes: classes,
-    title: cellContent.renderedValue,
+    title: (_cellContent$titleVal = cellContent.titleValue) !== null && _cellContent$titleVal !== void 0 ? _cellContent$titleVal : _d2I18n.default.t('Value: {{value}}', {
+      value: cellContent.renderedValue,
+      nsSeparator: '^^'
+    }),
     style: style,
     onClick: isClickable ? onClick : undefined,
     ref: cellRef,

package/build/cjs/components/PivotTable/styles/PivotTable.style.js

@@ -9,9 +9,9 @@ var _pivotTableConstants = require("../../../modules/pivotTable/pivotTableConsta
 const table = [`div.pivot-table-container.jsx-3572446209{font-family:'Roboto',Arial,sans-serif;overflow:auto;color:${_ui.colors.grey900};}`, `div.pivot-table-container.jsx-3572446209 table{border-spacing:0;white-space:nowrap;box-sizing:border-box;text-align:center;border:1px solid ${_pivotTableConstants.BORDER_COLOR};border-width:1px 1px 0 0;}`, "div.pivot-table-container.jsx-3572446209 table.fixed-headers{border-width:0 0 0 1px;}", "div.pivot-table-container.jsx-3572446209 table.fixed-headers tr th,div.pivot-table-container.jsx-3572446209 table.fixed-headers tr td{border-width:0 1px 1px 0;}", "div.pivot-table-container.jsx-3572446209 table.fixed-column-headers{border-width:0 1px 0 0;}", "div.pivot-table-container.jsx-3572446209 table.fixed-column-headers tr th,div.pivot-table-container.jsx-3572446209 table.fixed-column-headers tr td{border-width:0 0 1px 1px;}", `div.pivot-table-container.jsx-3572446209 table.fixed-headers thead tr:first-of-type th,div.pivot-table-container.jsx-3572446209 table.fixed-column-headers thead tr:first-of-type th{border-top:1px solid ${_pivotTableConstants.BORDER_COLOR};}`, "div.pivot-table-container.jsx-3572446209 table.fixed-row-headers{border-width:0 0 1px 1px;}", "div.pivot-table-container.jsx-3572446209 table.fixed-row-headers tr th,div.pivot-table-container.jsx-3572446209 table.fixed-row-headers tr td{border-width:1px 1px 0 0;}"];
 exports.table = table;
 table.__hash = "3572446209";
-const cell = [`td.jsx-3234356038,th.jsx-3234356038{box-sizing:border-box;font-weight:normal;overflow:hidden;text-overflow:ellipsis;border:1px solid ${_pivotTableConstants.BORDER_COLOR};border-width:0 0 1px 1px;cursor:default;}`, "th.fixed-header.jsx-3234356038{position:-webkit-sticky;position:sticky;z-index:1;top:0;left:0;}", `.fontsize-SMALL.jsx-3234356038{font-size:${_pivotTableConstants.FONT_SIZE_SMALL}px;line-height:${_pivotTableConstants.FONT_SIZE_SMALL}px;}`, `.fontsize-NORMAL.jsx-3234356038{font-size:${_pivotTableConstants.FONT_SIZE_NORMAL}px;line-height:${_pivotTableConstants.FONT_SIZE_NORMAL}px;}`, `.fontsize-LARGE.jsx-3234356038{font-size:${_pivotTableConstants.FONT_SIZE_LARGE}px;line-height:${_pivotTableConstants.FONT_SIZE_LARGE}px;}`, `.displaydensity-COMPACT.jsx-3234356038{padding:${_pivotTableConstants.DISPLAY_DENSITY_PADDING_COMPACT}px;}`, `.displaydensity-NORMAL.jsx-3234356038{padding:${_pivotTableConstants.DISPLAY_DENSITY_PADDING_NORMAL}px;}`, `.displaydensity-COMFORTABLE.jsx-3234356038{padding:${_pivotTableConstants.DISPLAY_DENSITY_PADDING_COMFORTABLE}px;}`, ".column-header.jsx-3234356038{background-color:#dae6f8;}", "div.column-header-inner.jsx-3234356038{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:row;-ms-flex-direction:row;flex-direction:row;-webkit-align-items:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;}", ".title-cell.jsx-3234356038{font-weight:bold;background-color:#cddaed;padding:0;}", ".title-cell-content.jsx-3234356038{text-align:center;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;}", `.title-cell.displaydensity-COMPACT.jsx-3234356038>.title-cell-content.jsx-3234356038{padding:${_pivotTableConstants.DISPLAY_DENSITY_PADDING_COMPACT}px;}`, `.title-cell.displaydensity-NORMAL.jsx-3234356038>.title-cell-content.jsx-3234356038{padding:${_pivotTableConstants.DISPLAY_DENSITY_PADDING_NORMAL}px;}`, `.title-cell.displaydensity-COMFORTABLE.jsx-3234356038>.title-cell-content.jsx-3234356038{padding:${_pivotTableConstants.DISPLAY_DENSITY_PADDING_COMFORTABLE}px;}`, ".row-header.jsx-3234356038{background-color:#dae6f8;}", ".row-header-hierarchy.jsx-3234356038{text-align:left;}", ".empty-header.jsx-3234356038{background-color:#cddaed;}", ".total-header.jsx-3234356038{background-color:#bac6d8;}", ".value.jsx-3234356038{background-color:#ffffff;text-align:left;}", ".NUMBER.jsx-3234356038,.INTEGER.jsx-3234356038,.INTEGER_POSITIVE.jsx-3234356038,.INTEGER_NEGATIVE.jsx-3234356038,.INTEGER_ZERO_OR_POSITIVE.jsx-3234356038,.UNIT_INTERVAL.jsx-3234356038,.PERCENTAGE.jsx-3234356038,.BOOLEAN.jsx-3234356038,.TRUE_ONLY.jsx-3234356038{text-align:right;}", ".clickable.jsx-3234356038{cursor:pointer;}", ".value.jsx-3234356038:hover{background-color:#f3f3f3;}", ".subtotal.jsx-3234356038{background-color:#f4f4f4;}", ".total.jsx-3234356038{background-color:#d8d8d8;}", ".column-header-label.jsx-3234356038{overflow:hidden;text-overflow:ellipsis;}"];
+const cell = [`td.jsx-2444037071,th.jsx-2444037071{box-sizing:border-box;font-weight:normal;overflow:hidden;text-overflow:ellipsis;border:1px solid ${_pivotTableConstants.BORDER_COLOR};border-width:0 0 1px 1px;cursor:default;}`, "th.fixed-header.jsx-2444037071{position:-webkit-sticky;position:sticky;z-index:1;top:0;left:0;}", `.fontsize-SMALL.jsx-2444037071{font-size:${_pivotTableConstants.FONT_SIZE_SMALL}px;line-height:${_pivotTableConstants.FONT_SIZE_SMALL}px;}`, `.fontsize-NORMAL.jsx-2444037071{font-size:${_pivotTableConstants.FONT_SIZE_NORMAL}px;line-height:${_pivotTableConstants.FONT_SIZE_NORMAL}px;}`, `.fontsize-LARGE.jsx-2444037071{font-size:${_pivotTableConstants.FONT_SIZE_LARGE}px;line-height:${_pivotTableConstants.FONT_SIZE_LARGE}px;}`, `.displaydensity-COMPACT.jsx-2444037071{padding:${_pivotTableConstants.DISPLAY_DENSITY_PADDING_COMPACT}px;}`, `.displaydensity-NORMAL.jsx-2444037071{padding:${_pivotTableConstants.DISPLAY_DENSITY_PADDING_NORMAL}px;}`, `.displaydensity-COMFORTABLE.jsx-2444037071{padding:${_pivotTableConstants.DISPLAY_DENSITY_PADDING_COMFORTABLE}px;}`, ".column-header.jsx-2444037071{background-color:#dae6f8;}", "div.column-header-inner.jsx-2444037071{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:row;-ms-flex-direction:row;flex-direction:row;-webkit-align-items:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;}", ".title-cell.jsx-2444037071{font-weight:bold;background-color:#cddaed;padding:0;}", ".title-cell-content.jsx-2444037071{text-align:center;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;}", `.title-cell.displaydensity-COMPACT.jsx-2444037071>.title-cell-content.jsx-2444037071{padding:${_pivotTableConstants.DISPLAY_DENSITY_PADDING_COMPACT}px;}`, `.title-cell.displaydensity-NORMAL.jsx-2444037071>.title-cell-content.jsx-2444037071{padding:${_pivotTableConstants.DISPLAY_DENSITY_PADDING_NORMAL}px;}`, `.title-cell.displaydensity-COMFORTABLE.jsx-2444037071>.title-cell-content.jsx-2444037071{padding:${_pivotTableConstants.DISPLAY_DENSITY_PADDING_COMFORTABLE}px;}`, ".row-header.jsx-2444037071{background-color:#dae6f8;}", ".row-header-hierarchy.jsx-2444037071{text-align:left;}", ".empty-header.jsx-2444037071{background-color:#cddaed;}", ".total-header.jsx-2444037071{background-color:#bac6d8;}", ".value.jsx-2444037071{background-color:#ffffff;text-align:left;}", ".NUMBER.jsx-2444037071,.INTEGER.jsx-2444037071,.INTEGER_POSITIVE.jsx-2444037071,.INTEGER_NEGATIVE.jsx-2444037071,.INTEGER_ZERO_OR_POSITIVE.jsx-2444037071,.UNIT_INTERVAL.jsx-2444037071,.PERCENTAGE.jsx-2444037071,.BOOLEAN.jsx-2444037071,.TRUE_ONLY.jsx-2444037071{text-align:right;}", `.N_A.jsx-2444037071{text-align:center;color:${_ui.colors.grey600};}`, ".clickable.jsx-2444037071{cursor:pointer;}", ".value.jsx-2444037071:hover{background-color:#f3f3f3;}", ".subtotal.jsx-2444037071{background-color:#f4f4f4;}", ".total.jsx-2444037071{background-color:#d8d8d8;}", ".column-header-label.jsx-2444037071{overflow:hidden;text-overflow:ellipsis;}"];
 exports.cell = cell;
-cell.__hash = "3234356038";
+cell.__hash = "2444037071";
 const sortIcon = [`.fontsize-SMALL.jsx-2877616992{height:${_pivotTableConstants.FONT_SIZE_SMALL}px;margin-bottom:1px;margin-left:5px;}`, `.fontsize-NORMAL.jsx-2877616992{height:${_pivotTableConstants.FONT_SIZE_NORMAL}px;max-height:11px;margin-bottom:2px;margin-left:6px;}`, `.fontsize-LARGE.jsx-2877616992{height:${_pivotTableConstants.FONT_SIZE_LARGE}px;margin-bottom:2px;margin-left:7px;}`];
 exports.sortIcon = sortIcon;
 sortIcon.__hash = "2877616992";

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

@@ -267,6 +267,7 @@
     "Six-months": "Six-months",
     "Financial Years": "Financial Years",
     "Years": "Years",
+    "Value: {{value}}": "Value: {{value}}",
     "Bold text": "Bold text",
     "Italic text": "Italic text",
     "Link to a URL": "Link to a URL",
@@ -357,6 +358,7 @@
     "{{thresholdFactor}} × Modified Z-score high": "{{thresholdFactor}} × Modified Z-score high",
     "{{thresholdFactor}} × Z-score low": "{{thresholdFactor}} × Z-score low",
     "{{thresholdFactor}} × Z-score high": "{{thresholdFactor}} × Z-score high",
+    "Not applicable": "Not applicable",
     "Data": "Data",
     "Organisation unit": "Organisation unit",
     "Assigned Categories": "Assigned Categories",

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

@@ -9,7 +9,7 @@
     "Last updated {{time}}": "最后更新 {{time}}",
     "Created {{time}} by {{author}}": "由 {{author}} 在 {{time}} 创建",
     "Created {{time}}": "已创建 {{time}}",
-    "Viewed {{count}} times": "查看了 {{count}} 次",
+    "Viewed {{count}} times": "查看了 {{count}} 条",
     "Notifications": "通知",
     "You're subscribed and getting updates about new interpretations.": "您已订阅并获取有关新解释的更新。",
     "Unsubscribe": "退订",
@@ -18,6 +18,8 @@
     "About this map": "关于该地图",
     "About this line list": "关于此行列表",
     "About this visualization": "关于此可视化",
+    "About this event chart": "关于该事件图表",
+    "About this event report": "关于本事件报表",
     "This app could not retrieve required data.": "此应用无法检索所需数据。",
     "Network error": "网络错误",
     "Data / Edit calculation": "数据/编辑计算",
@@ -33,7 +35,7 @@
     "Save calculation": "保存计算",
     "Are you sure you want to delete this calculation? It may be used by other visualizations.": "您确定要删除此计算吗？它可以被其他可视化使用。",
     "Yes, delete": "是的，删除",
-    "Totals only": "总计",
+    "Totals only": "仅总数",
     "Details only": "仅详细信息",
     "Loading": "载入",
     "Data elements": "数据元",
@@ -132,17 +134,6 @@
     "Manage sharing": "管理共享",
     "Could not update interpretation": "无法更新解释",
     "Enter interpretation text": "输入解释文本",
-    "Bold text": "粗体文字",
-    "Italic text": "斜体文字",
-    "Link to a URL": "链接到 URL",
-    "Mention a user": "提及用户",
-    "Add emoji": "添加表情符号",
-    "Preview": "预览",
-    "Back to write mode": "返回写入模式",
-    "Too many results. Try refining the search.": "结果太多。尝试优化搜索。",
-    "Search for a user": "搜索用户",
-    "Searching for \"{{- searchText}}\"": "搜索“{{- searchText}}”",
-    "No results found": "没有结果",
     "Not available offline": "离线不可用",
     "Created by": "创建人",
     "Anyone": "任何人",
@@ -217,9 +208,9 @@
     "Six-monthly April": "半年四月",
     "Yearly": "每年",
     "Financial year (Start November)": "财政年（11月始）",
-    "Financial year (Start October)": "财务十月",
-    "Financial year (Start July)": "财务七月",
-    "Financial year (Start April)": "财务四月",
+    "Financial year (Start October)": "财政年度（10 月开始）",
+    "Financial year (Start July)": "财政年度（7 月开始）",
+    "Financial year (Start April)": "财政年度（4 月开始）",
     "Today": "今天",
     "Yesterday": "昨天",
     "Last 3 days": "Last 3 days",
@@ -231,33 +222,33 @@
     "Last 180 days": "最近180天",
     "This week": "本年",
     "Last week": "上周",
-    "Last 4 weeks": "最近四周",
-    "Last 12 weeks": "最近12周",
-    "Last 52 weeks": "Last 52 weeks",
-    "Weeks this year": "Weeks this year",
+    "Last 4 weeks": "最近 4 周",
+    "Last 12 weeks": "最近 12 周",
+    "Last 52 weeks": "最近52 周",
+    "Weeks this year": "今年的周",
     "This bi-week": "本双周",
     "Last bi-week": "最近两周",
     "Last 4 bi-weeks": "最近4个两周",
     "This month": "本月",
     "Last month": "上月",
     "Last 3 months": "最近3个月",
-    "Last 6 months": "Last 6 months",
+    "Last 6 months": "最近 6 个月",
     "Last 12 months": "最近12月",
     "Months this year": "今年的月份",
     "This bi-month": "本双月",
-    "Last bi-month": "Last bi-month",
-    "Last 6 bi-months": "Last 6 bi-months",
-    "Bi-months this year": "Bi-months this year",
+    "Last bi-month": "上两个月",
+    "Last 6 bi-months": "最近 6 个双月",
+    "Bi-months this year": "今年的双月",
     "This quarter": "本季度",
     "Last quarter": "最近一季",
-    "Last 4 quarters": "最近四个季度",
+    "Last 4 quarters": "最近 4 个季度",
     "Quarters this year": "今年的季度",
     "This six-month": "本六个月",
     "Last six-month": "最近六个月",
     "Last 2 six-month": "最近2个六个月",
     "This financial year": "本财年",
     "Last financial year": "上一财政年",
-    "Last 5 financial years": "最近五个财政年",
+    "Last 5 financial years": "最近 5 个财政年度",
     "This year": "今年",
     "Last year": "去年",
     "Last 5 years": "最近5年",
@@ -266,11 +257,18 @@
     "Weeks": "星期",
     "Bi-weeks": "双周",
     "Months": "月",
-    "Bi-months": "Bi-months",
+    "Bi-months": "双月",
     "Quarters": "四分之一",
-    "Six-months": "Six-months",
-    "Financial Years": "Financial Years",
+    "Six-months": "六个月",
+    "Financial Years": "财政年度",
     "Years": "年",
+    "Bold text": "粗体文字",
+    "Italic text": "斜体文字",
+    "Link to a URL": "链接到 URL",
+    "Mention a user": "提及用户",
+    "Add emoji": "添加表情符号",
+    "Preview": "预览",
+    "Back to write mode": "返回写入模式",
     "Interpretations and details": "解释和细节",
     "Translating to": "翻译成",
     "Choose a locale": "选择语言环境",
@@ -281,6 +279,10 @@
     "Cannot save while offline": "离线时无法保存",
     "Could not load translations": "无法加载翻译",
     "Retry": "重试",
+    "Too many results. Try refining the search.": "结果太多。尝试优化搜索。",
+    "Search for a user": "搜索用户",
+    "Searching for \"{{- searchText}}\"": "搜索“{{- searchText}}”",
+    "No results found": "没有结果",
     "Series": "系列",
     "Category": "分类",
     "Filter": "过滤器",
@@ -367,7 +369,7 @@
     "Year over year (line)": "逐年（折线图）",
     "Pie": "饼图",
     "Radar": "雷达图",
-    "Scatter": "分散",
+    "Scatter": "散点图",
     "Single value": "单个值",
     "Outlier table": "异常值表",
     "All charts": "所有图表",

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

@@ -160,7 +160,7 @@ const applyTotalAggregationType = (_ref2, overrideTotalAggregationType) => {
   } = _ref2;
   switch (overrideTotalAggregationType || totalAggregationType) {
     case _pivotTableConstants.AGGREGATE_TYPE_NA:
-      return 'N/A';
+      return _pivotTableConstants.VALUE_NA;
     case _pivotTableConstants.AGGREGATE_TYPE_AVERAGE:
       return (numerator || value) * multiplier / (denominator * divisor || 1);
     case _pivotTableConstants.AGGREGATE_TYPE_SUM:
@@ -265,15 +265,29 @@ class PivotTableEngine {
       rawCell.rawValue = rawValue;
       rawCell.renderedValue = renderedValue;
     }
+    if ([_pivotTableConstants.CELL_TYPE_TOTAL, _pivotTableConstants.CELL_TYPE_SUBTOTAL].includes(rawCell.cellType) && rawCell.rawValue === _pivotTableConstants.AGGREGATE_TYPE_NA) {
+      rawCell.titleValue = _d2I18n.default.t('Not applicable');
+    }
     if (this.options.cumulativeValues) {
+      let titleValue;
+      if (this.data[row] && this.data[row][column]) {
+        const dataRow = this.data[row][column];
+        const rawValue = cellType === _pivotTableConstants.CELL_TYPE_VALUE ? dataRow[this.dimensionLookup.dataHeaders.value] : dataRow.value;
+        titleValue = _d2I18n.default.t('Value: {{value}}', {
+          value: (0, _renderValue.renderValue)(rawValue, valueType, this.visualization),
+          nsSeparator: '^^'
+        });
+      }
       const cumulativeValue = this.getCumulative({
         row,
         column
       });
       if (cumulativeValue !== undefined && cumulativeValue !== null) {
-        // force to NUMBER for accumulated values
-        rawCell.valueType = valueType === undefined || valueType === null ? _valueTypes.VALUE_TYPE_NUMBER : valueType;
+        // force to TEXT for N/A (accumulated) values
+        // force to NUMBER for accumulated values if no valueType present
+        rawCell.valueType = cumulativeValue === _pivotTableConstants.VALUE_NA ? _pivotTableConstants.VALUE_TYPE_NA : valueType === undefined || valueType === null ? _valueTypes.VALUE_TYPE_NUMBER : valueType;
         rawCell.empty = false;
+        rawCell.titleValue = titleValue;
         rawCell.rawValue = cumulativeValue;
         rawCell.renderedValue = (0, _renderValue.renderValue)(cumulativeValue, valueType, this.visualization);
       }
@@ -372,15 +386,12 @@ class PivotTableEngine {
       return undefined;
     }
     const cellValue = this.data[row][column];
+
+    // empty cell
     if (!cellValue) {
-      // Empty cell
-      // The cell still needs to get the valueType to render correctly 0 and cumulative values
-      return {
-        valueType: _valueTypes.VALUE_TYPE_NUMBER,
-        totalAggregationType: _pivotTableConstants.AGGREGATE_TYPE_SUM
-      };
+      return undefined;
     }
-    if (!Array.isArray(cellValue)) {
+    if (cellValue && !Array.isArray(cellValue)) {
       // This is a total cell
       return {
         valueType: cellValue.valueType,
@@ -543,19 +554,26 @@ class PivotTableEngine {
       } else {
         totalCell.totalAggregationType = currentAggType;
       }
-      const currentValueType = dxDimension === null || dxDimension === void 0 ? void 0 : dxDimension.valueType;
+
+      // Force value type of total cells to NUMBER for value cells with numeric or boolean types.
+      // This is to simplify the code below where we compare the previous value type.
+      // All numeric/boolean value types use the same style for rendering the total cell (right aligned content)
+      // and using NUMBER for the total cell is enough for that.
+      // (see DHIS2-9155)
+      const currentValueType = (0, _valueTypes.isNumericValueType)(dxDimension === null || dxDimension === void 0 ? void 0 : dxDimension.valueType) || (0, _valueTypes.isBooleanValueType)(dxDimension === null || dxDimension === void 0 ? void 0 : dxDimension.valueType) ? _valueTypes.VALUE_TYPE_NUMBER : dxDimension === null || dxDimension === void 0 ? void 0 : dxDimension.valueType;
       const previousValueType = totalCell.valueType;
       if (previousValueType && currentValueType !== previousValueType) {
-        totalCell.valueType = _pivotTableConstants.AGGREGATE_TYPE_NA;
+        totalCell.valueType = _pivotTableConstants.VALUE_TYPE_NA;
       } else {
         totalCell.valueType = currentValueType;
       }
 
-      // 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
+      // Compute totals for all numeric and boolean value types only.
+      // In practice valueType here is NUMBER (see the comment above).
+      // When is not, it means there is some value cell with a valueType other than numeric/boolean,
+      // the total should not be computed then.
       // (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;
+      if ((0, _valueTypes.isNumericValueType)(totalCell.valueType)) {
         dataFields.forEach(field => {
           const headerIndex = this.dimensionLookup.dataHeaders[field];
           const value = (0, _parseValue.parseValue)(dataRow[headerIndex]);
@@ -649,6 +667,17 @@ class PivotTableEngine {
       }
     }
   }
+  computeOverrideTotalAggregationType(totalCell, visualization) {
+    // Avoid undefined on total cells with valueTypes that cannot be totalized.
+    // This happens for example when a column/row has all value cells of type TEXT.
+    if (!((0, _valueTypes.isNumericValueType)(totalCell.valueType) || (0, _valueTypes.isBooleanValueType)(totalCell.valueType))) {
+      return _pivotTableConstants.AGGREGATE_TYPE_NA;
+    }
+
+    // DHIS2-15698: do not override total aggregation type when numberType option is not present
+    // (numberType option default is VALUE)
+    return visualization.numberType && visualization.numberType !== _pivotTableConstants.NUMBER_TYPE_VALUE && _pivotTableConstants.AGGREGATE_TYPE_SUM;
+  }
   finalizeTotal(_ref11) {
     let {
       row,
@@ -659,10 +688,12 @@ class PivotTableEngine {
     }
     const totalCell = this.data[row][column];
     if (totalCell && totalCell.count) {
-      totalCell.value = applyTotalAggregationType(totalCell,
-      // 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 !== _pivotTableConstants.NUMBER_TYPE_VALUE && _pivotTableConstants.AGGREGATE_TYPE_SUM);
+      totalCell.value = applyTotalAggregationType(totalCell, this.computeOverrideTotalAggregationType(totalCell, this.visualization));
+
+      // override valueType for styling cells with N/A value
+      if (totalCell.value === _pivotTableConstants.AGGREGATE_TYPE_NA) {
+        totalCell.valueType = _pivotTableConstants.VALUE_TYPE_NA;
+      }
       this.adaptiveClippingController.add({
         row,
         column
@@ -763,10 +794,14 @@ class PivotTableEngine {
             column
           });
           const valueType = (dxDimension === null || dxDimension === void 0 ? void 0 : dxDimension.valueType) || _valueTypes.VALUE_TYPE_TEXT;
+          const totalAggregationType = dxDimension === null || dxDimension === void 0 ? void 0 : dxDimension.totalAggregationType;
 
-          // only accumulate numeric values
-          // accumulating text values does not make sense
-          if (valueType === _valueTypes.VALUE_TYPE_NUMBER) {
+          // only accumulate numeric (except for PERCENTAGE and UNIT_INTERVAL) and boolean values
+          // accumulating other value types like text values does not make sense
+          if ((0, _valueTypes.isCumulativeValueType)(valueType) && totalAggregationType === _pivotTableConstants.AGGREGATE_TYPE_SUM) {
+            // initialise to 0 for cumulative types
+            // (||= is not transformed correctly in Babel with the current setup)
+            acc || (acc = 0);
             if (this.data[row] && this.data[row][column]) {
               const dataRow = this.data[row][column];
               const rawValue = cellType === _pivotTableConstants.CELL_TYPE_VALUE ? dataRow[this.dimensionLookup.dataHeaders.value] : dataRow.value;
@@ -775,7 +810,7 @@ class PivotTableEngine {
             this.accumulators.rows[row][column] = acc;
           }
           return acc;
-        }, 0);
+        }, '');
       });
     } else {
       this.accumulators = {

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.WRAPPED_TEXT_LINE_HEIGHT = exports.WRAPPED_TEXT_JUSTIFY_BUFFER = exports.SORT_ORDER_DESCENDING = exports.SORT_ORDER_ASCENDING = exports.NUMBER_TYPE_VALUE = exports.NUMBER_TYPE_ROW_PERCENTAGE = exports.NUMBER_TYPE_COLUMN_PERCENTAGE = exports.FONT_SIZE_SMALL = exports.FONT_SIZE_OPTION_SMALL = exports.FONT_SIZE_OPTION_NORMAL = exports.FONT_SIZE_OPTION_LARGE = exports.FONT_SIZE_NORMAL = exports.FONT_SIZE_LARGE = exports.DISPLAY_DENSITY_PADDING_NORMAL = exports.DISPLAY_DENSITY_PADDING_COMPACT = exports.DISPLAY_DENSITY_PADDING_COMFORTABLE = exports.DISPLAY_DENSITY_OPTION_NORMAL = exports.DISPLAY_DENSITY_OPTION_COMPACT = exports.DISPLAY_DENSITY_OPTION_COMFORTABLE = exports.CLIPPED_CELL_MIN_SIZE = exports.CLIPPED_CELL_MAX_SIZE = exports.CLIPPED_AXIS_PARTITION_SIZE_PX = exports.CELL_TYPE_VALUE = exports.CELL_TYPE_TOTAL = exports.CELL_TYPE_SUBTOTAL = exports.BORDER_COLOR = exports.AGGREGATE_TYPE_SUM = exports.AGGREGATE_TYPE_NA = exports.AGGREGATE_TYPE_AVERAGE = void 0;
+exports.WRAPPED_TEXT_LINE_HEIGHT = exports.WRAPPED_TEXT_JUSTIFY_BUFFER = exports.VALUE_TYPE_NA = exports.VALUE_NA = exports.SORT_ORDER_DESCENDING = exports.SORT_ORDER_ASCENDING = exports.NUMBER_TYPE_VALUE = exports.NUMBER_TYPE_ROW_PERCENTAGE = exports.NUMBER_TYPE_COLUMN_PERCENTAGE = exports.FONT_SIZE_SMALL = exports.FONT_SIZE_OPTION_SMALL = exports.FONT_SIZE_OPTION_NORMAL = exports.FONT_SIZE_OPTION_LARGE = exports.FONT_SIZE_NORMAL = exports.FONT_SIZE_LARGE = exports.DISPLAY_DENSITY_PADDING_NORMAL = exports.DISPLAY_DENSITY_PADDING_COMPACT = exports.DISPLAY_DENSITY_PADDING_COMFORTABLE = exports.DISPLAY_DENSITY_OPTION_NORMAL = exports.DISPLAY_DENSITY_OPTION_COMPACT = exports.DISPLAY_DENSITY_OPTION_COMFORTABLE = exports.CLIPPED_CELL_MIN_SIZE = exports.CLIPPED_CELL_MAX_SIZE = exports.CLIPPED_AXIS_PARTITION_SIZE_PX = exports.CELL_TYPE_VALUE = exports.CELL_TYPE_TOTAL = exports.CELL_TYPE_SUBTOTAL = exports.BORDER_COLOR = exports.AGGREGATE_TYPE_SUM = exports.AGGREGATE_TYPE_NA = exports.AGGREGATE_TYPE_AVERAGE = void 0;
 const SORT_ORDER_ASCENDING = 1;
 exports.SORT_ORDER_ASCENDING = SORT_ORDER_ASCENDING;
 const SORT_ORDER_DESCENDING = -1;
@@ -20,6 +20,8 @@ const AGGREGATE_TYPE_AVERAGE = 'AVERAGE';
 exports.AGGREGATE_TYPE_AVERAGE = AGGREGATE_TYPE_AVERAGE;
 const AGGREGATE_TYPE_NA = 'N/A';
 exports.AGGREGATE_TYPE_NA = AGGREGATE_TYPE_NA;
+const VALUE_TYPE_NA = 'N_A'; // this ends up as CSS class and / is problematic
+exports.VALUE_TYPE_NA = VALUE_TYPE_NA;
 const NUMBER_TYPE_VALUE = 'VALUE';
 exports.NUMBER_TYPE_VALUE = NUMBER_TYPE_VALUE;
 const NUMBER_TYPE_ROW_PERCENTAGE = 'ROW_PERCENTAGE';
@@ -61,4 +63,6 @@ exports.WRAPPED_TEXT_JUSTIFY_BUFFER = WRAPPED_TEXT_JUSTIFY_BUFFER;
 const WRAPPED_TEXT_LINE_HEIGHT = 1.0;
 exports.WRAPPED_TEXT_LINE_HEIGHT = WRAPPED_TEXT_LINE_HEIGHT;
 const CLIPPED_AXIS_PARTITION_SIZE_PX = 1000;
-exports.CLIPPED_AXIS_PARTITION_SIZE_PX = CLIPPED_AXIS_PARTITION_SIZE_PX;
+exports.CLIPPED_AXIS_PARTITION_SIZE_PX = CLIPPED_AXIS_PARTITION_SIZE_PX;
+const VALUE_NA = 'N/A';
+exports.VALUE_NA = VALUE_NA;

package/build/cjs/modules/valueTypes.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isNumericValueType = exports.isBooleanValueType = exports.VALUE_TYPE_USERNAME = exports.VALUE_TYPE_URL = exports.VALUE_TYPE_UNIT_INTERVAL = exports.VALUE_TYPE_TRUE_ONLY = exports.VALUE_TYPE_TIME = exports.VALUE_TYPE_TEXT = exports.VALUE_TYPE_PHONE_NUMBER = exports.VALUE_TYPE_PERCENTAGE = exports.VALUE_TYPE_ORGANISATION_UNIT = exports.VALUE_TYPE_NUMBER = exports.VALUE_TYPE_LONG_TEXT = exports.VALUE_TYPE_LETTER = exports.VALUE_TYPE_INTEGER_ZERO_OR_POSITIVE = exports.VALUE_TYPE_INTEGER_POSITIVE = exports.VALUE_TYPE_INTEGER_NEGATIVE = exports.VALUE_TYPE_INTEGER = exports.VALUE_TYPE_EMAIL = exports.VALUE_TYPE_DATETIME = exports.VALUE_TYPE_DATE = exports.VALUE_TYPE_BOOLEAN = exports.VALUE_TYPE_AGE = void 0;
+exports.isNumericValueType = exports.isCumulativeValueType = exports.isBooleanValueType = exports.VALUE_TYPE_USERNAME = exports.VALUE_TYPE_URL = exports.VALUE_TYPE_UNIT_INTERVAL = exports.VALUE_TYPE_TRUE_ONLY = exports.VALUE_TYPE_TIME = exports.VALUE_TYPE_TEXT = exports.VALUE_TYPE_PHONE_NUMBER = exports.VALUE_TYPE_PERCENTAGE = exports.VALUE_TYPE_ORGANISATION_UNIT = exports.VALUE_TYPE_NUMBER = exports.VALUE_TYPE_LONG_TEXT = exports.VALUE_TYPE_LETTER = exports.VALUE_TYPE_INTEGER_ZERO_OR_POSITIVE = exports.VALUE_TYPE_INTEGER_POSITIVE = exports.VALUE_TYPE_INTEGER_NEGATIVE = exports.VALUE_TYPE_INTEGER = exports.VALUE_TYPE_EMAIL = exports.VALUE_TYPE_DATETIME = exports.VALUE_TYPE_DATE = exports.VALUE_TYPE_BOOLEAN = exports.VALUE_TYPE_AGE = void 0;
 /* These types match the types in the backend
   https://github.com/dhis2/dhis2-core/blob/master/dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/ValueType.java
 */
@@ -52,6 +52,9 @@ const VALUE_TYPE_AGE = 'AGE';
 exports.VALUE_TYPE_AGE = VALUE_TYPE_AGE;
 const NUMERIC_VALUE_TYPES = [VALUE_TYPE_NUMBER, VALUE_TYPE_UNIT_INTERVAL, VALUE_TYPE_PERCENTAGE, VALUE_TYPE_INTEGER, VALUE_TYPE_INTEGER_POSITIVE, VALUE_TYPE_INTEGER_NEGATIVE, VALUE_TYPE_INTEGER_ZERO_OR_POSITIVE];
 const BOOLEAN_VALUE_TYPES = [VALUE_TYPE_BOOLEAN, VALUE_TYPE_TRUE_ONLY];
+const CUMULATIVE_VALUE_TYPES = [VALUE_TYPE_NUMBER, VALUE_TYPE_INTEGER, VALUE_TYPE_INTEGER_POSITIVE, VALUE_TYPE_INTEGER_NEGATIVE, VALUE_TYPE_INTEGER_ZERO_OR_POSITIVE, ...BOOLEAN_VALUE_TYPES];
+const isCumulativeValueType = type => CUMULATIVE_VALUE_TYPES.includes(type);
+exports.isCumulativeValueType = isCumulativeValueType;
 const isNumericValueType = type => NUMERIC_VALUE_TYPES.includes(type);
 exports.isNumericValueType = isNumericValueType;
 const isBooleanValueType = type => BOOLEAN_VALUE_TYPES.includes(type);

package/build/es/components/PivotTable/PivotTableValueCell.js

@@ -1,3 +1,4 @@
+import i18n from '@dhis2/d2-i18n';
 import PropTypes from 'prop-types';
 import React, { useRef } from 'react';
 import { applyLegendSet } from '../../modules/pivotTable/applyLegendSet.js';
@@ -7,7 +8,7 @@ import { PivotTableCell } from './PivotTableCell.js';
 import { PivotTableEmptyCell } from './PivotTableEmptyCell.js';
 import { usePivotTableEngine } from './PivotTableEngineContext.js';
 export const PivotTableValueCell = _ref => {
-  var _cellContent$rendered;
+  var _cellContent$titleVal, _cellContent$rendered;
   let {
     row,
     column,
@@ -45,7 +46,10 @@ export const PivotTableValueCell = _ref => {
   return /*#__PURE__*/React.createElement(PivotTableCell, {
     key: column,
     classes: classes,
-    title: cellContent.renderedValue,
+    title: (_cellContent$titleVal = cellContent.titleValue) !== null && _cellContent$titleVal !== void 0 ? _cellContent$titleVal : i18n.t('Value: {{value}}', {
+      value: cellContent.renderedValue,
+      nsSeparator: '^^'
+    }),
     style: style,
     onClick: isClickable ? onClick : undefined,
     ref: cellRef,

package/build/es/components/PivotTable/styles/PivotTable.style.js

@@ -2,7 +2,7 @@ import { colors } from '@dhis2/ui';
 import { BORDER_COLOR, DISPLAY_DENSITY_PADDING_COMPACT, DISPLAY_DENSITY_PADDING_NORMAL, DISPLAY_DENSITY_PADDING_COMFORTABLE, FONT_SIZE_SMALL, FONT_SIZE_NORMAL, FONT_SIZE_LARGE } from '../../../modules/pivotTable/pivotTableConstants.js';
 export const table = [`div.pivot-table-container.jsx-3572446209{font-family:'Roboto',Arial,sans-serif;overflow:auto;color:${colors.grey900};}`, `div.pivot-table-container.jsx-3572446209 table{border-spacing:0;white-space:nowrap;box-sizing:border-box;text-align:center;border:1px solid ${BORDER_COLOR};border-width:1px 1px 0 0;}`, "div.pivot-table-container.jsx-3572446209 table.fixed-headers{border-width:0 0 0 1px;}", "div.pivot-table-container.jsx-3572446209 table.fixed-headers tr th,div.pivot-table-container.jsx-3572446209 table.fixed-headers tr td{border-width:0 1px 1px 0;}", "div.pivot-table-container.jsx-3572446209 table.fixed-column-headers{border-width:0 1px 0 0;}", "div.pivot-table-container.jsx-3572446209 table.fixed-column-headers tr th,div.pivot-table-container.jsx-3572446209 table.fixed-column-headers tr td{border-width:0 0 1px 1px;}", `div.pivot-table-container.jsx-3572446209 table.fixed-headers thead tr:first-of-type th,div.pivot-table-container.jsx-3572446209 table.fixed-column-headers thead tr:first-of-type th{border-top:1px solid ${BORDER_COLOR};}`, "div.pivot-table-container.jsx-3572446209 table.fixed-row-headers{border-width:0 0 1px 1px;}", "div.pivot-table-container.jsx-3572446209 table.fixed-row-headers tr th,div.pivot-table-container.jsx-3572446209 table.fixed-row-headers tr td{border-width:1px 1px 0 0;}"];
 table.__hash = "3572446209";
-export const cell = [`td.jsx-3234356038,th.jsx-3234356038{box-sizing:border-box;font-weight:normal;overflow:hidden;text-overflow:ellipsis;border:1px solid ${BORDER_COLOR};border-width:0 0 1px 1px;cursor:default;}`, "th.fixed-header.jsx-3234356038{position:-webkit-sticky;position:sticky;z-index:1;top:0;left:0;}", `.fontsize-SMALL.jsx-3234356038{font-size:${FONT_SIZE_SMALL}px;line-height:${FONT_SIZE_SMALL}px;}`, `.fontsize-NORMAL.jsx-3234356038{font-size:${FONT_SIZE_NORMAL}px;line-height:${FONT_SIZE_NORMAL}px;}`, `.fontsize-LARGE.jsx-3234356038{font-size:${FONT_SIZE_LARGE}px;line-height:${FONT_SIZE_LARGE}px;}`, `.displaydensity-COMPACT.jsx-3234356038{padding:${DISPLAY_DENSITY_PADDING_COMPACT}px;}`, `.displaydensity-NORMAL.jsx-3234356038{padding:${DISPLAY_DENSITY_PADDING_NORMAL}px;}`, `.displaydensity-COMFORTABLE.jsx-3234356038{padding:${DISPLAY_DENSITY_PADDING_COMFORTABLE}px;}`, ".column-header.jsx-3234356038{background-color:#dae6f8;}", "div.column-header-inner.jsx-3234356038{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:row;-ms-flex-direction:row;flex-direction:row;-webkit-align-items:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;}", ".title-cell.jsx-3234356038{font-weight:bold;background-color:#cddaed;padding:0;}", ".title-cell-content.jsx-3234356038{text-align:center;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;}", `.title-cell.displaydensity-COMPACT.jsx-3234356038>.title-cell-content.jsx-3234356038{padding:${DISPLAY_DENSITY_PADDING_COMPACT}px;}`, `.title-cell.displaydensity-NORMAL.jsx-3234356038>.title-cell-content.jsx-3234356038{padding:${DISPLAY_DENSITY_PADDING_NORMAL}px;}`, `.title-cell.displaydensity-COMFORTABLE.jsx-3234356038>.title-cell-content.jsx-3234356038{padding:${DISPLAY_DENSITY_PADDING_COMFORTABLE}px;}`, ".row-header.jsx-3234356038{background-color:#dae6f8;}", ".row-header-hierarchy.jsx-3234356038{text-align:left;}", ".empty-header.jsx-3234356038{background-color:#cddaed;}", ".total-header.jsx-3234356038{background-color:#bac6d8;}", ".value.jsx-3234356038{background-color:#ffffff;text-align:left;}", ".NUMBER.jsx-3234356038,.INTEGER.jsx-3234356038,.INTEGER_POSITIVE.jsx-3234356038,.INTEGER_NEGATIVE.jsx-3234356038,.INTEGER_ZERO_OR_POSITIVE.jsx-3234356038,.UNIT_INTERVAL.jsx-3234356038,.PERCENTAGE.jsx-3234356038,.BOOLEAN.jsx-3234356038,.TRUE_ONLY.jsx-3234356038{text-align:right;}", ".clickable.jsx-3234356038{cursor:pointer;}", ".value.jsx-3234356038:hover{background-color:#f3f3f3;}", ".subtotal.jsx-3234356038{background-color:#f4f4f4;}", ".total.jsx-3234356038{background-color:#d8d8d8;}", ".column-header-label.jsx-3234356038{overflow:hidden;text-overflow:ellipsis;}"];
-cell.__hash = "3234356038";
+export const cell = [`td.jsx-2444037071,th.jsx-2444037071{box-sizing:border-box;font-weight:normal;overflow:hidden;text-overflow:ellipsis;border:1px solid ${BORDER_COLOR};border-width:0 0 1px 1px;cursor:default;}`, "th.fixed-header.jsx-2444037071{position:-webkit-sticky;position:sticky;z-index:1;top:0;left:0;}", `.fontsize-SMALL.jsx-2444037071{font-size:${FONT_SIZE_SMALL}px;line-height:${FONT_SIZE_SMALL}px;}`, `.fontsize-NORMAL.jsx-2444037071{font-size:${FONT_SIZE_NORMAL}px;line-height:${FONT_SIZE_NORMAL}px;}`, `.fontsize-LARGE.jsx-2444037071{font-size:${FONT_SIZE_LARGE}px;line-height:${FONT_SIZE_LARGE}px;}`, `.displaydensity-COMPACT.jsx-2444037071{padding:${DISPLAY_DENSITY_PADDING_COMPACT}px;}`, `.displaydensity-NORMAL.jsx-2444037071{padding:${DISPLAY_DENSITY_PADDING_NORMAL}px;}`, `.displaydensity-COMFORTABLE.jsx-2444037071{padding:${DISPLAY_DENSITY_PADDING_COMFORTABLE}px;}`, ".column-header.jsx-2444037071{background-color:#dae6f8;}", "div.column-header-inner.jsx-2444037071{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:row;-ms-flex-direction:row;flex-direction:row;-webkit-align-items:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;}", ".title-cell.jsx-2444037071{font-weight:bold;background-color:#cddaed;padding:0;}", ".title-cell-content.jsx-2444037071{text-align:center;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;}", `.title-cell.displaydensity-COMPACT.jsx-2444037071>.title-cell-content.jsx-2444037071{padding:${DISPLAY_DENSITY_PADDING_COMPACT}px;}`, `.title-cell.displaydensity-NORMAL.jsx-2444037071>.title-cell-content.jsx-2444037071{padding:${DISPLAY_DENSITY_PADDING_NORMAL}px;}`, `.title-cell.displaydensity-COMFORTABLE.jsx-2444037071>.title-cell-content.jsx-2444037071{padding:${DISPLAY_DENSITY_PADDING_COMFORTABLE}px;}`, ".row-header.jsx-2444037071{background-color:#dae6f8;}", ".row-header-hierarchy.jsx-2444037071{text-align:left;}", ".empty-header.jsx-2444037071{background-color:#cddaed;}", ".total-header.jsx-2444037071{background-color:#bac6d8;}", ".value.jsx-2444037071{background-color:#ffffff;text-align:left;}", ".NUMBER.jsx-2444037071,.INTEGER.jsx-2444037071,.INTEGER_POSITIVE.jsx-2444037071,.INTEGER_NEGATIVE.jsx-2444037071,.INTEGER_ZERO_OR_POSITIVE.jsx-2444037071,.UNIT_INTERVAL.jsx-2444037071,.PERCENTAGE.jsx-2444037071,.BOOLEAN.jsx-2444037071,.TRUE_ONLY.jsx-2444037071{text-align:right;}", `.N_A.jsx-2444037071{text-align:center;color:${colors.grey600};}`, ".clickable.jsx-2444037071{cursor:pointer;}", ".value.jsx-2444037071:hover{background-color:#f3f3f3;}", ".subtotal.jsx-2444037071{background-color:#f4f4f4;}", ".total.jsx-2444037071{background-color:#d8d8d8;}", ".column-header-label.jsx-2444037071{overflow:hidden;text-overflow:ellipsis;}"];
+cell.__hash = "2444037071";
 export const sortIcon = [`.fontsize-SMALL.jsx-2877616992{height:${FONT_SIZE_SMALL}px;margin-bottom:1px;margin-left:5px;}`, `.fontsize-NORMAL.jsx-2877616992{height:${FONT_SIZE_NORMAL}px;max-height:11px;margin-bottom:2px;margin-left:6px;}`, `.fontsize-LARGE.jsx-2877616992{height:${FONT_SIZE_LARGE}px;margin-bottom:2px;margin-left:7px;}`];
 sortIcon.__hash = "2877616992";

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

@@ -267,6 +267,7 @@
     "Six-months": "Six-months",
     "Financial Years": "Financial Years",
     "Years": "Years",
+    "Value: {{value}}": "Value: {{value}}",
     "Bold text": "Bold text",
     "Italic text": "Italic text",
     "Link to a URL": "Link to a URL",
@@ -357,6 +358,7 @@
     "{{thresholdFactor}} × Modified Z-score high": "{{thresholdFactor}} × Modified Z-score high",
     "{{thresholdFactor}} × Z-score low": "{{thresholdFactor}} × Z-score low",
     "{{thresholdFactor}} × Z-score high": "{{thresholdFactor}} × Z-score high",
+    "Not applicable": "Not applicable",
     "Data": "Data",
     "Organisation unit": "Organisation unit",
     "Assigned Categories": "Assigned Categories",

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

@@ -9,7 +9,7 @@
     "Last updated {{time}}": "最后更新 {{time}}",
     "Created {{time}} by {{author}}": "由 {{author}} 在 {{time}} 创建",
     "Created {{time}}": "已创建 {{time}}",
-    "Viewed {{count}} times": "查看了 {{count}} 次",
+    "Viewed {{count}} times": "查看了 {{count}} 条",
     "Notifications": "通知",
     "You're subscribed and getting updates about new interpretations.": "您已订阅并获取有关新解释的更新。",
     "Unsubscribe": "退订",
@@ -18,6 +18,8 @@
     "About this map": "关于该地图",
     "About this line list": "关于此行列表",
     "About this visualization": "关于此可视化",
+    "About this event chart": "关于该事件图表",
+    "About this event report": "关于本事件报表",
     "This app could not retrieve required data.": "此应用无法检索所需数据。",
     "Network error": "网络错误",
     "Data / Edit calculation": "数据/编辑计算",
@@ -33,7 +35,7 @@
     "Save calculation": "保存计算",
     "Are you sure you want to delete this calculation? It may be used by other visualizations.": "您确定要删除此计算吗？它可以被其他可视化使用。",
     "Yes, delete": "是的，删除",
-    "Totals only": "总计",
+    "Totals only": "仅总数",
     "Details only": "仅详细信息",
     "Loading": "载入",
     "Data elements": "数据元",
@@ -132,17 +134,6 @@
     "Manage sharing": "管理共享",
     "Could not update interpretation": "无法更新解释",
     "Enter interpretation text": "输入解释文本",
-    "Bold text": "粗体文字",
-    "Italic text": "斜体文字",
-    "Link to a URL": "链接到 URL",
-    "Mention a user": "提及用户",
-    "Add emoji": "添加表情符号",
-    "Preview": "预览",
-    "Back to write mode": "返回写入模式",
-    "Too many results. Try refining the search.": "结果太多。尝试优化搜索。",
-    "Search for a user": "搜索用户",
-    "Searching for \"{{- searchText}}\"": "搜索“{{- searchText}}”",
-    "No results found": "没有结果",
     "Not available offline": "离线不可用",
     "Created by": "创建人",
     "Anyone": "任何人",
@@ -217,9 +208,9 @@
     "Six-monthly April": "半年四月",
     "Yearly": "每年",
     "Financial year (Start November)": "财政年（11月始）",
-    "Financial year (Start October)": "财务十月",
-    "Financial year (Start July)": "财务七月",
-    "Financial year (Start April)": "财务四月",
+    "Financial year (Start October)": "财政年度（10 月开始）",
+    "Financial year (Start July)": "财政年度（7 月开始）",
+    "Financial year (Start April)": "财政年度（4 月开始）",
     "Today": "今天",
     "Yesterday": "昨天",
     "Last 3 days": "Last 3 days",
@@ -231,33 +222,33 @@
     "Last 180 days": "最近180天",
     "This week": "本年",
     "Last week": "上周",
-    "Last 4 weeks": "最近四周",
-    "Last 12 weeks": "最近12周",
-    "Last 52 weeks": "Last 52 weeks",
-    "Weeks this year": "Weeks this year",
+    "Last 4 weeks": "最近 4 周",
+    "Last 12 weeks": "最近 12 周",
+    "Last 52 weeks": "最近52 周",
+    "Weeks this year": "今年的周",
     "This bi-week": "本双周",
     "Last bi-week": "最近两周",
     "Last 4 bi-weeks": "最近4个两周",
     "This month": "本月",
     "Last month": "上月",
     "Last 3 months": "最近3个月",
-    "Last 6 months": "Last 6 months",
+    "Last 6 months": "最近 6 个月",
     "Last 12 months": "最近12月",
     "Months this year": "今年的月份",
     "This bi-month": "本双月",
-    "Last bi-month": "Last bi-month",
-    "Last 6 bi-months": "Last 6 bi-months",
-    "Bi-months this year": "Bi-months this year",
+    "Last bi-month": "上两个月",
+    "Last 6 bi-months": "最近 6 个双月",
+    "Bi-months this year": "今年的双月",
     "This quarter": "本季度",
     "Last quarter": "最近一季",
-    "Last 4 quarters": "最近四个季度",
+    "Last 4 quarters": "最近 4 个季度",
     "Quarters this year": "今年的季度",
     "This six-month": "本六个月",
     "Last six-month": "最近六个月",
     "Last 2 six-month": "最近2个六个月",
     "This financial year": "本财年",
     "Last financial year": "上一财政年",
-    "Last 5 financial years": "最近五个财政年",
+    "Last 5 financial years": "最近 5 个财政年度",
     "This year": "今年",
     "Last year": "去年",
     "Last 5 years": "最近5年",
@@ -266,11 +257,18 @@
     "Weeks": "星期",
     "Bi-weeks": "双周",
     "Months": "月",
-    "Bi-months": "Bi-months",
+    "Bi-months": "双月",
     "Quarters": "四分之一",
-    "Six-months": "Six-months",
-    "Financial Years": "Financial Years",
+    "Six-months": "六个月",
+    "Financial Years": "财政年度",
     "Years": "年",
+    "Bold text": "粗体文字",
+    "Italic text": "斜体文字",
+    "Link to a URL": "链接到 URL",
+    "Mention a user": "提及用户",
+    "Add emoji": "添加表情符号",
+    "Preview": "预览",
+    "Back to write mode": "返回写入模式",
     "Interpretations and details": "解释和细节",
     "Translating to": "翻译成",
     "Choose a locale": "选择语言环境",
@@ -281,6 +279,10 @@
     "Cannot save while offline": "离线时无法保存",
     "Could not load translations": "无法加载翻译",
     "Retry": "重试",
+    "Too many results. Try refining the search.": "结果太多。尝试优化搜索。",
+    "Search for a user": "搜索用户",
+    "Searching for \"{{- searchText}}\"": "搜索“{{- searchText}}”",
+    "No results found": "没有结果",
     "Series": "系列",
     "Category": "分类",
     "Filter": "过滤器",
@@ -367,7 +369,7 @@
     "Year over year (line)": "逐年（折线图）",
     "Pie": "饼图",
     "Radar": "雷达图",
-    "Scatter": "分散",
+    "Scatter": "散点图",
     "Single value": "单个值",
     "Outlier table": "异常值表",
     "All charts": "所有图表",

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

@@ -6,11 +6,11 @@ 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, isBooleanValueType, isNumericValueType } from '../valueTypes.js';
+import { VALUE_TYPE_NUMBER, VALUE_TYPE_TEXT, isBooleanValueType, isCumulativeValueType, isNumericValueType } 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';
+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, VALUE_TYPE_NA, VALUE_NA } from './pivotTableConstants.js';
 const dataFields = ['value', 'numerator', 'denominator', 'factor', 'multiplier', 'divisor'];
 const defaultOptions = {
   hideEmptyColumns: false,
@@ -153,7 +153,7 @@ const applyTotalAggregationType = (_ref2, overrideTotalAggregationType) => {
   } = _ref2;
   switch (overrideTotalAggregationType || totalAggregationType) {
     case AGGREGATE_TYPE_NA:
-      return 'N/A';
+      return VALUE_NA;
     case AGGREGATE_TYPE_AVERAGE:
       return (numerator || value) * multiplier / (denominator * divisor || 1);
     case AGGREGATE_TYPE_SUM:
@@ -258,15 +258,29 @@ export class PivotTableEngine {
       rawCell.rawValue = rawValue;
       rawCell.renderedValue = renderedValue;
     }
+    if ([CELL_TYPE_TOTAL, CELL_TYPE_SUBTOTAL].includes(rawCell.cellType) && rawCell.rawValue === AGGREGATE_TYPE_NA) {
+      rawCell.titleValue = i18n.t('Not applicable');
+    }
     if (this.options.cumulativeValues) {
+      let titleValue;
+      if (this.data[row] && this.data[row][column]) {
+        const dataRow = this.data[row][column];
+        const rawValue = cellType === CELL_TYPE_VALUE ? dataRow[this.dimensionLookup.dataHeaders.value] : dataRow.value;
+        titleValue = i18n.t('Value: {{value}}', {
+          value: renderValue(rawValue, valueType, this.visualization),
+          nsSeparator: '^^'
+        });
+      }
       const cumulativeValue = this.getCumulative({
         row,
         column
       });
       if (cumulativeValue !== undefined && cumulativeValue !== null) {
-        // force to NUMBER for accumulated values
-        rawCell.valueType = valueType === undefined || valueType === null ? VALUE_TYPE_NUMBER : valueType;
+        // force to TEXT for N/A (accumulated) values
+        // force to NUMBER for accumulated values if no valueType present
+        rawCell.valueType = cumulativeValue === VALUE_NA ? VALUE_TYPE_NA : valueType === undefined || valueType === null ? VALUE_TYPE_NUMBER : valueType;
         rawCell.empty = false;
+        rawCell.titleValue = titleValue;
         rawCell.rawValue = cumulativeValue;
         rawCell.renderedValue = renderValue(cumulativeValue, valueType, this.visualization);
       }
@@ -365,15 +379,12 @@ export class PivotTableEngine {
       return undefined;
     }
     const cellValue = this.data[row][column];
+
+    // empty cell
     if (!cellValue) {
-      // Empty cell
-      // The cell still needs to get the valueType to render correctly 0 and cumulative values
-      return {
-        valueType: VALUE_TYPE_NUMBER,
-        totalAggregationType: AGGREGATE_TYPE_SUM
-      };
+      return undefined;
     }
-    if (!Array.isArray(cellValue)) {
+    if (cellValue && !Array.isArray(cellValue)) {
       // This is a total cell
       return {
         valueType: cellValue.valueType,
@@ -536,19 +547,26 @@ export class PivotTableEngine {
       } else {
         totalCell.totalAggregationType = currentAggType;
       }
-      const currentValueType = dxDimension === null || dxDimension === void 0 ? void 0 : dxDimension.valueType;
+
+      // Force value type of total cells to NUMBER for value cells with numeric or boolean types.
+      // This is to simplify the code below where we compare the previous value type.
+      // All numeric/boolean value types use the same style for rendering the total cell (right aligned content)
+      // and using NUMBER for the total cell is enough for that.
+      // (see DHIS2-9155)
+      const currentValueType = isNumericValueType(dxDimension === null || dxDimension === void 0 ? void 0 : dxDimension.valueType) || isBooleanValueType(dxDimension === null || dxDimension === void 0 ? void 0 : dxDimension.valueType) ? VALUE_TYPE_NUMBER : dxDimension === null || dxDimension === void 0 ? void 0 : dxDimension.valueType;
       const previousValueType = totalCell.valueType;
       if (previousValueType && currentValueType !== previousValueType) {
-        totalCell.valueType = AGGREGATE_TYPE_NA;
+        totalCell.valueType = VALUE_TYPE_NA;
       } else {
         totalCell.valueType = currentValueType;
       }
 
-      // 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
+      // Compute totals for all numeric and boolean value types only.
+      // In practice valueType here is NUMBER (see the comment above).
+      // When is not, it means there is some value cell with a valueType other than numeric/boolean,
+      // the total should not be computed then.
       // (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;
+      if (isNumericValueType(totalCell.valueType)) {
         dataFields.forEach(field => {
           const headerIndex = this.dimensionLookup.dataHeaders[field];
           const value = parseValue(dataRow[headerIndex]);
@@ -642,6 +660,17 @@ export class PivotTableEngine {
       }
     }
   }
+  computeOverrideTotalAggregationType(totalCell, visualization) {
+    // Avoid undefined on total cells with valueTypes that cannot be totalized.
+    // This happens for example when a column/row has all value cells of type TEXT.
+    if (!(isNumericValueType(totalCell.valueType) || isBooleanValueType(totalCell.valueType))) {
+      return AGGREGATE_TYPE_NA;
+    }
+
+    // DHIS2-15698: do not override total aggregation type when numberType option is not present
+    // (numberType option default is VALUE)
+    return visualization.numberType && visualization.numberType !== NUMBER_TYPE_VALUE && AGGREGATE_TYPE_SUM;
+  }
   finalizeTotal(_ref11) {
     let {
       row,
@@ -652,10 +681,12 @@ export class PivotTableEngine {
     }
     const totalCell = this.data[row][column];
     if (totalCell && totalCell.count) {
-      totalCell.value = applyTotalAggregationType(totalCell,
-      // 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);
+      totalCell.value = applyTotalAggregationType(totalCell, this.computeOverrideTotalAggregationType(totalCell, this.visualization));
+
+      // override valueType for styling cells with N/A value
+      if (totalCell.value === AGGREGATE_TYPE_NA) {
+        totalCell.valueType = VALUE_TYPE_NA;
+      }
       this.adaptiveClippingController.add({
         row,
         column
@@ -756,10 +787,14 @@ export class PivotTableEngine {
             column
           });
           const valueType = (dxDimension === null || dxDimension === void 0 ? void 0 : dxDimension.valueType) || VALUE_TYPE_TEXT;
+          const totalAggregationType = dxDimension === null || dxDimension === void 0 ? void 0 : dxDimension.totalAggregationType;
 
-          // only accumulate numeric values
-          // accumulating text values does not make sense
-          if (valueType === VALUE_TYPE_NUMBER) {
+          // only accumulate numeric (except for PERCENTAGE and UNIT_INTERVAL) and boolean values
+          // accumulating other value types like text values does not make sense
+          if (isCumulativeValueType(valueType) && totalAggregationType === AGGREGATE_TYPE_SUM) {
+            // initialise to 0 for cumulative types
+            // (||= is not transformed correctly in Babel with the current setup)
+            acc || (acc = 0);
             if (this.data[row] && this.data[row][column]) {
               const dataRow = this.data[row][column];
               const rawValue = cellType === CELL_TYPE_VALUE ? dataRow[this.dimensionLookup.dataHeaders.value] : dataRow.value;
@@ -768,7 +803,7 @@ export class PivotTableEngine {
             this.accumulators.rows[row][column] = acc;
           }
           return acc;
-        }, 0);
+        }, '');
       });
     } else {
       this.accumulators = {

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

@@ -6,6 +6,8 @@ export const CELL_TYPE_TOTAL = 'total';
 export const AGGREGATE_TYPE_SUM = 'SUM';
 export const AGGREGATE_TYPE_AVERAGE = 'AVERAGE';
 export const AGGREGATE_TYPE_NA = 'N/A';
+export const VALUE_TYPE_NA = 'N_A'; // this ends up as CSS class and / is problematic
+
 export const NUMBER_TYPE_VALUE = 'VALUE';
 export const NUMBER_TYPE_ROW_PERCENTAGE = 'ROW_PERCENTAGE';
 export const NUMBER_TYPE_COLUMN_PERCENTAGE = 'COLUMN_PERCENTAGE';
@@ -26,4 +28,5 @@ export const CLIPPED_CELL_MAX_SIZE = 360;
 export const CLIPPED_CELL_MIN_SIZE = 36;
 export const WRAPPED_TEXT_JUSTIFY_BUFFER = 25;
 export const WRAPPED_TEXT_LINE_HEIGHT = 1.0;
-export const CLIPPED_AXIS_PARTITION_SIZE_PX = 1000;
+export const CLIPPED_AXIS_PARTITION_SIZE_PX = 1000;
+export const VALUE_NA = 'N/A';

package/build/es/modules/valueTypes.js

@@ -25,5 +25,7 @@ export const VALUE_TYPE_ORGANISATION_UNIT = 'ORGANISATION_UNIT';
 export const VALUE_TYPE_AGE = 'AGE';
 const NUMERIC_VALUE_TYPES = [VALUE_TYPE_NUMBER, VALUE_TYPE_UNIT_INTERVAL, VALUE_TYPE_PERCENTAGE, VALUE_TYPE_INTEGER, VALUE_TYPE_INTEGER_POSITIVE, VALUE_TYPE_INTEGER_NEGATIVE, VALUE_TYPE_INTEGER_ZERO_OR_POSITIVE];
 const BOOLEAN_VALUE_TYPES = [VALUE_TYPE_BOOLEAN, VALUE_TYPE_TRUE_ONLY];
+const CUMULATIVE_VALUE_TYPES = [VALUE_TYPE_NUMBER, VALUE_TYPE_INTEGER, VALUE_TYPE_INTEGER_POSITIVE, VALUE_TYPE_INTEGER_NEGATIVE, VALUE_TYPE_INTEGER_ZERO_OR_POSITIVE, ...BOOLEAN_VALUE_TYPES];
+export const isCumulativeValueType = type => CUMULATIVE_VALUE_TYPES.includes(type);
 export const isNumericValueType = type => NUMERIC_VALUE_TYPES.includes(type);
 export const isBooleanValueType = type => BOOLEAN_VALUE_TYPES.includes(type);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/analytics",
-    "version": "26.8.5",
+    "version": "26.8.7",
     "main": "./build/cjs/index.js",
     "module": "./build/es/index.js",
     "exports": {
@@ -20,7 +20,6 @@
     },
     "scripts": {
         "build": "d2-app-scripts build",
-        "postbuild": "yarn build-storybook",
         "build-storybook": "build-storybook",
         "start-storybook": "start-storybook --port 5000",
         "start": "yarn start-storybook",