Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into fix/boolean-type-to…
Browse files Browse the repository at this point in the history
…tals-DHIS2-9155
  • Loading branch information
edoardo committed Aug 27, 2024
2 parents 484ffed + e347564 commit 60b890b
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 3 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## [26.8.2](https://github.com/dhis2/analytics/compare/v26.8.1...v26.8.2) (2024-08-27)


### Bug Fixes

* add AO TYPE for event chart and event report ([#1697](https://github.com/dhis2/analytics/issues/1697)) ([efff1c8](https://github.com/dhis2/analytics/commit/efff1c81845a974fe8c60b593e6bbe42c19682d7))

## [26.8.1](https://github.com/dhis2/analytics/compare/v26.8.0...v26.8.1) (2024-08-08)


Expand Down
10 changes: 8 additions & 2 deletions i18n/en.pot
Original file line number Diff line number Diff line change
Expand Up @@ -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-06-26T14:09:30.876Z\n"
"PO-Revision-Date: 2024-06-26T14:09:30.876Z\n"
"POT-Creation-Date: 2024-08-27T11:29:09.031Z\n"
"PO-Revision-Date: 2024-08-27T11:29:09.033Z\n"

msgid "view only"
msgstr "view only"
Expand Down Expand Up @@ -67,6 +67,12 @@ msgstr "About this line list"
msgid "About this visualization"
msgstr "About this visualization"

msgid "About this event chart"
msgstr "About this event chart"

msgid "About this event report"
msgstr "About this event report"

msgid "This app could not retrieve required data."
msgstr "This app could not retrieve required data."

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@dhis2/analytics",
"version": "26.8.1",
"version": "26.8.2",
"main": "./build/cjs/index.js",
"module": "./build/es/index.js",
"exports": {
Expand Down
14 changes: 14 additions & 0 deletions src/components/AboutAOUnit/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ import i18n from '@dhis2/d2-i18n'
export const AO_TYPE_VISUALIZATION = 'visualization'
export const AO_TYPE_MAP = 'map'
export const AO_TYPE_EVENT_VISUALIZATION = 'eventVisualization'
export const AO_TYPE_EVENT_CHART = 'eventChart'
export const AO_TYPE_EVENT_REPORT = 'eventReport'

export const AOTypeMap = {
[AO_TYPE_VISUALIZATION]: {
Expand All @@ -14,6 +16,12 @@ export const AOTypeMap = {
[AO_TYPE_EVENT_VISUALIZATION]: {
apiEndpoint: 'eventVisualizations',
},
[AO_TYPE_EVENT_CHART]: {
apiEndpoint: 'eventCharts',
},
[AO_TYPE_EVENT_REPORT]: {
apiEndpoint: 'eventReports',
},
}

const NO_TYPE = 'NO_TYPE'
Expand All @@ -28,6 +36,12 @@ const texts = {
[AO_TYPE_VISUALIZATION]: {
unitTitle: i18n.t('About this visualization'),
},
[AO_TYPE_EVENT_CHART]: {
unitTitle: i18n.t('About this event chart'),
},
[AO_TYPE_EVENT_REPORT]: {
unitTitle: i18n.t('About this event report'),
},
[NO_TYPE]: {
unitTitle: i18n.t('About this visualization'),
},
Expand Down

0 comments on commit 60b890b

Please sign in to comment.