Merge branch 'master' into feat/single-value-as-highcharts-chart-DHIS…

…2-17928

CHANGELOG.md

@@ -1,3 +1,17 @@
+## [26.8.8](https://github.com/dhis2/analytics/compare/v26.8.7...v26.8.8) (2024-10-20)
+
+
+### Bug Fixes
+
+* **translations:** sync translations from transifex (master) ([f187092](https://github.com/dhis2/analytics/commit/f1870928b37733395d7f911f48ea7268fed97be1))
+
+## [26.8.7](https://github.com/dhis2/analytics/compare/v26.8.6...v26.8.7) (2024-10-18)
+
+
+### Bug Fixes
+
+* compute totals and cumulative values for numeric/boolean types respecting totalAggregationType (DHIS2-9155) ([#1700](https://github.com/dhis2/analytics/issues/1700)) ([a2bfd20](https://github.com/dhis2/analytics/commit/a2bfd203cb53f174106d8b570cea52cbfc6136f7))
+
 ## [26.8.6](https://github.com/dhis2/analytics/compare/v26.8.5...v26.8.6) (2024-10-06)
 
 

i18n/en.pot

@@ -5,8 +5,8 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"POT-Creation-Date: 2024-08-27T11:29:09.031Z\n"
-"PO-Revision-Date: 2024-08-27T11:29:09.033Z\n"
+"POT-Creation-Date: 2024-10-11T12:49:26.846Z\n"
+"PO-Revision-Date: 2024-10-11T12:49:26.847Z\n"
 
 msgid "view only"
 msgstr "view only"
@@ -855,6 +855,9 @@ msgstr "Financial Years"
 msgid "Years"
 msgstr "Years"
 
+msgid "Value: {{value}}"
+msgstr "Value: {{value}}"
+
 msgid "Bold text"
 msgstr "Bold text"
 
@@ -1125,6 +1128,9 @@ msgstr "{{thresholdFactor}} × Z-score low"
 msgid "{{thresholdFactor}} × Z-score high"
 msgstr "{{thresholdFactor}} × Z-score high"
 
+msgid "Not applicable"
+msgstr "Not applicable"
+
 msgid "Data"
 msgstr "Data"
 

i18n/lo.po

@@ -4,15 +4,15 @@
 # Somkhit Bouavong <[email protected]>, 2022
 # Philip Larsen Donnelly, 2023
 # Phouthasinh PHEUAYSITHIPHONE, 2023
-# Saysamone Sibounma, 2023
 # Namwan Chanthavisouk, 2024
+# Saysamone Sibounma, 2024
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2024-01-25T12:05:03.360Z\n"
+"POT-Creation-Date: 2024-10-11T12:49:26.846Z\n"
 "PO-Revision-Date: 2020-04-28 22:05+0000\n"
-"Last-Translator: Namwan Chanthavisouk, 2024\n"
+"Last-Translator: Saysamone Sibounma, 2024\n"
 "Language-Team: Lao (https://app.transifex.com/hisp-uio/teams/100509/lo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -78,6 +78,12 @@ msgstr "ກ່ຽວກັບບັນຊີລາຍຊື່"
 msgid "About this visualization"
 msgstr "ກ່ຽວກັບການສ້າງພາບຂໍ້ມູນ"
 
+msgid "About this event chart"
+msgstr "ກ່ຽວກັບເຫດການແຜນຜັງ"
+
+msgid "About this event report"
+msgstr "ກ່ຽວກັບບົດລາຍງານເຫດການຕ່າງໆ"
+
 msgid "This app could not retrieve required data."
 msgstr "ແອັບນີ້ບໍ່ສາມາດດຶງຂໍ້ມູນທີ່ຕ້ອງການໄດ້"
 
@@ -91,7 +97,7 @@ msgid "Data / New calculation"
 msgstr "ຂໍ້ມູນ / ຄິດໄລ່ໃໝ່"
 
 msgid "Remove item"
-msgstr "ລົບລາຍການ"
+msgstr "ເອົາລາຍການອອກ"
 
 msgid "Check formula"
 msgstr "ກວດເບິ່ງສູດ"
@@ -435,39 +441,6 @@ msgstr "ບໍ່ສາມາດອັບເດດຂໍ້ຄວາມ"
 msgid "Enter interpretation text"
 msgstr "ປ້ອນຂໍ້ຄວາມ"
 
-msgid "Bold text"
-msgstr "ຕົວອັກສອນເຂັ້ມ"
-
-msgid "Italic text"
-msgstr "ຕົວອັກສອນສະຫຼ່ຽງ"
-
-msgid "Link to a URL"
-msgstr "ເຊື່ອມຕໍ່ກັບ URL"
-
-msgid "Mention a user"
-msgstr "ກ່າວເຖິງຜູ້ໃຊ້"
-
-msgid "Add emoji"
-msgstr "ເພີ່ມ emoji"
-
-msgid "Preview"
-msgstr "ເບິ່ງຕົວຢ່າງ"
-
-msgid "Back to write mode"
-msgstr "ກັບໄປທີ່ໂໝດຂຽນ"
-
-msgid "Too many results. Try refining the search."
-msgstr "ຜົນໄດ້ຮັບຫຼາຍເກີນໄປ. ປັບປຸງການຄົ້ນຫາ."
-
-msgid "Search for a user"
-msgstr "ຄົ້ນຫາຜູ້ໃຊ້"
-
-msgid "Searching for \"{{- searchText}}\""
-msgstr "ຄົ້ນຫາ \"{{- searchText}}\""
-
-msgid "No results found"
-msgstr "ບໍ່ພົບຜົນການຊອກຫາ"
-
 msgid "Not available offline"
 msgstr "ບໍ່ສາມາດໃຊ້ໄດ້ອອບລາຍ"
 
@@ -880,6 +853,30 @@ msgstr "ສົກປີງົບປະມານ"
 msgid "Years"
 msgstr "ປີ"
 
+msgid "Value: {{value}}"
+msgstr ""
+
+msgid "Bold text"
+msgstr "ຕົວອັກສອນເຂັ້ມ"
+
+msgid "Italic text"
+msgstr "ຕົວອັກສອນສະຫຼ່ຽງ"
+
+msgid "Link to a URL"
+msgstr "ເຊື່ອມຕໍ່ກັບ URL"
+
+msgid "Mention a user"
+msgstr "ກ່າວເຖິງຜູ້ໃຊ້"
+
+msgid "Add emoji"
+msgstr "ເພີ່ມ emoji"
+
+msgid "Preview"
+msgstr "ເບິ່ງຕົວຢ່າງ"
+
+msgid "Back to write mode"
+msgstr "ກັບໄປທີ່ໂໝດຂຽນ"
+
 msgid "Interpretations and details"
 msgstr "ຂໍ້ມູນ ແລະ ລາຍລະອຽດ"
 
@@ -910,6 +907,18 @@ msgstr "ບໍ່ສາມາດໂຫຼດການແປ"
 msgid "Retry"
 msgstr "ລອງໃໝ່"
 
+msgid "Too many results. Try refining the search."
+msgstr "ຜົນໄດ້ຮັບຫຼາຍເກີນໄປ. ປັບປຸງການຄົ້ນຫາ."
+
+msgid "Search for a user"
+msgstr "ຄົ້ນຫາຜູ້ໃຊ້"
+
+msgid "Searching for \"{{- searchText}}\""
+msgstr "ຄົ້ນຫາ \"{{- searchText}}\""
+
+msgid "No results found"
+msgstr "ບໍ່ພົບຜົນການຊອກຫາ"
+
 msgid "Series"
 msgstr "ແທ່ງ"
 
@@ -1117,6 +1126,9 @@ msgstr "{{thresholdFactor}} x ຄະແນນ z ຕ່ຳ"
 msgid "{{thresholdFactor}} × Z-score high"
 msgstr "{{thresholdFactor}} x ຄະແນນ z ສູງ"
 
+msgid "Not applicable"
+msgstr ""
+
 msgid "Data"
 msgstr "ຂໍ້ມູນ"
 

package.json

@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/analytics",
-    "version": "26.8.6",
+    "version": "26.8.8",
     "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",

src/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'
@@ -74,7 +75,13 @@ export const PivotTableValueCell = ({
         <PivotTableCell
             key={column}
             classes={classes}
-            title={cellContent.renderedValue}
+            title={
+                cellContent.titleValue ??
+                i18n.t('Value: {{value}}', {
+                    value: cellContent.renderedValue,
+                    nsSeparator: '^^',
+                })
+            }
             style={style}
             onClick={isClickable ? onClick : undefined}
             ref={cellRef}

src/components/PivotTable/styles/PivotTable.style.js

@@ -158,6 +158,11 @@ export const cell = css`
     .TRUE_ONLY {
         text-align: right;
     }
+    .N_A {
+        text-align: center;
+        color: ${colors.grey600};
+    }
+
     .clickable {
         cursor: pointer;
     }