Merge branch 'master' into dimension-list-design

dhis2 · Dec 15, 2023 · 7cca1f6 · 7cca1f6
2 parents 01ef812 + 913eb40
commit 7cca1f6
Show file tree

Hide file tree

Showing 7 changed files with 206 additions and 60 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,24 @@
+# [26.2.0](https://github.com/dhis2/analytics/compare/v26.1.8...v26.2.0) (2023-12-14)
+
+
+### Features
+
+* implement cumulative values in PT engine (DHIS2-5497) ([#1567](https://github.com/dhis2/analytics/issues/1567)) ([2b404b4](https://github.com/dhis2/analytics/commit/2b404b423cfb49347bdf57125870bb7b55338322))
+
+## [26.1.8](https://github.com/dhis2/analytics/compare/v26.1.7...v26.1.8) (2023-11-26)
+
+
+### Bug Fixes
+
+* **translations:** sync translations from transifex (master) ([43a607b](https://github.com/dhis2/analytics/commit/43a607ba0310b19edd07d866f15337e736567b2f))
+
+## [26.1.7](https://github.com/dhis2/analytics/compare/v26.1.6...v26.1.7) (2023-11-19)
+
+
+### Bug Fixes
+
+* **translations:** sync translations from transifex (master) ([cb4a052](https://github.com/dhis2/analytics/commit/cb4a052a19ebdced3ea7b6ffb7d1c40064abac38))
+
 ## [26.1.6](https://github.com/dhis2/analytics/compare/v26.1.5...v26.1.6) (2023-11-07)
 
 

diff --git a/i18n/uz_UZ_Cyrl.po b/i18n/uz_UZ_Cyrl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2023-07-06T08:30:33.216Z\n"
+"POT-Creation-Date: 2023-09-27T14:15:13.876Z\n"
 "PO-Revision-Date: 2020-04-28 22:05+0000\n"
 "Last-Translator: Ibatov <[email protected]>, 2023\n"
 "Language-Team: Uzbek (Cyrillic) (https://app.transifex.com/hisp-uio/teams/100509/uz@Cyrl/)\n"
@@ -77,7 +77,7 @@ msgid "This app could not retrieve required data."
 msgstr ""
 
 msgid "Network error"
-msgstr ""
+msgstr "Тармоқда хатолик"
 
 msgid "Data / Edit calculation"
 msgstr ""
@@ -237,7 +237,7 @@ msgid "Dimension recommended with selected data"
 msgstr "Танланган маълумотлар учун созламалар тавсия этилади"
 
 msgid "All items"
-msgstr ""
+msgstr "Барча элементлар"
 
 msgid "Automatically include all items"
 msgstr ""
@@ -333,7 +333,7 @@ msgid "map"
 msgstr "харита"
 
 msgid "visualization"
-msgstr ""
+msgstr "Визуализация"
 
 msgid "Edit"
 msgstr "Таҳрирлаш"
@@ -373,6 +373,10 @@ msgstr ""
 msgid "Write an interpretation"
 msgstr "Талқин ёзиш"
 
+msgid ""
+"Other people viewing this interpretation in the future may see more data."
+msgstr ""
+
 msgid "Post interpretation"
 msgstr ""
 
@@ -595,10 +599,10 @@ msgid_plural "{{count}} groups"
 msgstr[0] ""
 
 msgid "Selected: {{commaSeparatedListOfOrganisationUnits}}"
-msgstr ""
+msgstr "Танланган: {{commaSeparatedListOfOrganisationUnits}}"
 
 msgid "Nothing selected"
-msgstr ""
+msgstr "Ҳеч нима танланмаган"
 
 msgid "User organisation unit"
 msgstr "Ташкилий бўлим фойдаланувчиси"
@@ -922,7 +926,7 @@ msgid "Indicator group"
 msgstr "Индикатор гуруҳи"
 
 msgid "All groups"
-msgstr ""
+msgstr "Барча гуруҳлар"
 
 msgid "Indicator"
 msgstr "Индикатор"

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/analytics",
-    "version": "26.1.6",
+    "version": "26.2.0",
     "main": "./build/cjs/index.js",
     "module": "./build/es/index.js",
     "exports": {

diff --git a/src/__demo__/PivotTable.stories.js b/src/__demo__/PivotTable.stories.js
@@ -784,6 +784,26 @@ storiesOf('PivotTable', module).add(
     }
 )
 
+storiesOf('PivotTable', module).add(
+    'cumulative + empty columns (weekly) - shown',
+    (_, { pivotTableOptions }) => {
+        const visualization = {
+            ...weeklyColumnsVisualization,
+            ...pivotTableOptions,
+            hideEmptyColumns: false,
+            cumulativeValues: true,
+        }
+        return (
+            <div style={{ width: 800, height: 600 }}>
+                <PivotTable
+                    data={weeklyColumnsData}
+                    visualization={visualization}
+                />
+            </div>
+        )
+    }
+)
+
 storiesOf('PivotTable', module).add(
     'empty columns (weekly) - hidden',
     (_, { pivotTableOptions }) => {
@@ -803,6 +823,26 @@ storiesOf('PivotTable', module).add(
     }
 )
 
+storiesOf('PivotTable', module).add(
+    'cumulative + empty columns (weekly) - hidden',
+    (_, { pivotTableOptions }) => {
+        const visualization = {
+            ...weeklyColumnsVisualization,
+            ...pivotTableOptions,
+            hideEmptyColumns: true,
+            cumulativeValues: true,
+        }
+        return (
+            <div style={{ width: 800, height: 600 }}>
+                <PivotTable
+                    data={weeklyColumnsData}
+                    visualization={visualization}
+                />
+            </div>
+        )
+    }
+)
+
 storiesOf('PivotTable', module).add(
     'empty columns + assigned cats (shown)',
     (_, { pivotTableOptions }) => {

diff --git a/src/components/Options/VisualizationOptions.js b/src/components/Options/VisualizationOptions.js
@@ -18,6 +18,7 @@ import {
     modalContent,
     tabSection,
     tabSectionTitle,
+    tabSectionTitleDisabled,
     tabSectionTitleMargin,
     tabSectionOption,
     tabSectionOptionItem,
@@ -95,6 +96,7 @@ const VisualizationOptions = ({
                     {tabContent.styles}
                     {tabSection.styles}
                     {tabSectionTitle.styles}
+                    {tabSectionTitleDisabled.styles}
                     {tabSectionTitleMargin.styles}
                     {tabSectionOption.styles}
                     {tabSectionOptionItem.styles}

diff --git a/src/components/Options/styles/VisualizationOptions.style.js b/src/components/Options/styles/VisualizationOptions.style.js
@@ -51,6 +51,12 @@ export const tabSectionTitle = css.resolve`
     }
 `
 
+export const tabSectionTitleDisabled = css.resolve`
+    span {
+        color: ${colors.grey600};
+    }
+`
+
 export const tabSectionTitleMargin = css.resolve`
     span {
         margin-top: ${spacers.dp8};