dhis2 · jenniferarnesen · Dec 21, 2023 · Nov 5, 2023 · Nov 6, 2023 · Nov 6, 2023
diff --git a/.github/workflows/dhis2-verify-app.yml b/.github/workflows/dhis2-verify-app.yml
@@ -76,13 +76,15 @@ jobs:
                   REPORTPORTAL_API_KEY: ${{ secrets.REPORTPORTAL_API_KEY }}
                   REPORTPORTAL_ENDPOINT: ${{ vars.REPORTPORTAL_ENDPOINT }}
                   REPORTPORTAL_PROJECT: ${{ vars.REPORTPORTAL_PROJECT }}
+                  CI_BUILD_ID: ${{ github.sha }}-${{ github.workflow }}-${{ github.event_name }}
+                  BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
+                  PR_TITLE: ${{ github.event_name == 'pull_request' && github.event.pull_request.title || format('Direct push to {0}', github.ref_name) }}
 
     call-workflow-e2e-prod:
         if: "!contains(github.event.head_commit.message, '[skip ci]')"
         needs: [build, lint, test]
-        uses: dhis2/workflows/.github/workflows/analytics-e2e-tests.yml@master
+        uses: dhis2/workflows/.github/workflows/analytics-e2e-tests-prod.yml@master
         secrets:
-            baseurl: ${{ secrets.CYPRESS_DHIS2_BASE_URL_DEV }}
             username: ${{ secrets.CYPRESS_DHIS2_USERNAME }}
             password: ${{ secrets.CYPRESS_DHIS2_PASSWORD }}
             recordkey: ${{ secrets.CYPRESS_RECORD_KEY }}

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -17,10 +17,8 @@ defaults:
 
 jobs:
     call-workflow-e2e-dev:
-        if: github.ref == 'refs/heads/dev'
-        uses: dhis2/data-visualizer-app/.github/workflows/e2e-dev.yml@dev
+        uses: dhis2/workflows/.github/workflows/analytics-e2e-tests-dev.yml@master
         secrets:
-            baseurl: ${{ secrets.CYPRESS_DHIS2_BASE_URL_DEV }}
             username: ${{ secrets.CYPRESS_DHIS2_USERNAME }}
             password: ${{ secrets.CYPRESS_DHIS2_PASSWORD }}
             recordkey: ${{ secrets.CYPRESS_RECORD_KEY }}

diff --git a/cypress.config.js b/cypress.config.js
@@ -34,7 +34,7 @@ module.exports = defineConfig({
         parallel: true,
         debug: false,
         restClientConfig: {
-            timeout: 360000,
+            timeout: 660000,
         },
         attributes: [
             {
@@ -43,7 +43,7 @@ module.exports = defineConfig({
             },
             {
                 key: 'app_name',
-                value: 'maps_app',
+                value: 'maps-app',
             },
             {
                 key: 'test_level',

diff --git a/cypress/integration/interpretations.cy.js b/cypress/integration/interpretations.cy.js
@@ -31,6 +31,8 @@ context('Interpretations', () => {
         Layer.openDialog('Thematic')
             .selectIndicatorGroup('ANC')
             .selectIndicator('ANC 1 Coverage')
+            .selectTab('Org Units')
+            .selectOu('Sierra Leone')
             .addToMap()
 
         Layer.validateDialogClosed(true)

diff --git a/i18n/ar.po b/i18n/ar.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2023-09-06T13:08:55.205Z\n"
+"POT-Creation-Date: 2023-10-23T12:55:26.288Z\n"
 "PO-Revision-Date: 2019-06-25 18:35+0000\n"
 "Last-Translator: Viktor Varland <[email protected]>, 2023\n"
 "Language-Team: Arabic (https://app.transifex.com/hisp-uio/teams/100509/ar/)\n"
@@ -26,15 +26,6 @@ msgstr ""
 msgid "Failed to save map: {{message}}"
 msgstr ""
 
-msgid "Calculation"
-msgstr ""
-
-msgid "No calculations found"
-msgstr ""
-
-msgid "Calculations can be created in the Data Visualizer app."
-msgstr ""
-
 msgid "Classification"
 msgstr "تصنيف"
 
@@ -438,9 +429,6 @@ msgstr "عنصر بيانات الحدث مطلوب"
 msgid "Program indicator is required"
 msgstr "مؤشر البرنامج مطلوب"
 
-msgid "Calculation is required"
-msgstr ""
-
 msgid "Period is required"
 msgstr "الفترة مطلوبة"
 
@@ -456,9 +444,6 @@ msgstr "عناصر بيانات الحدث"
 msgid "Program indicators"
 msgstr "مؤشرات البرنامج"
 
-msgid "Calculations"
-msgstr ""
-
 msgid "Item type"
 msgstr "نوع العنصر"
 
@@ -914,12 +899,6 @@ msgstr "OSM Light"
 msgid "OSM Detailed"
 msgstr "OSM مفصل"
 
-msgid "Google Streets"
-msgstr "الشوارع بحسب غوغل"
-
-msgid "Google Hybrid"
-msgstr "Google Hybrid"
-
 msgid "Bing Road"
 msgstr "Bing طرقات"
 
@@ -1327,18 +1306,6 @@ msgstr "لم يتم العثور على الكيانات المتعقبة"
 msgid "related"
 msgstr "ذات صلة"
 
-msgid "Thematic"
-msgstr ""
-
-msgid "Events"
-msgstr "الأحداث"
-
-msgid "Tracked entities"
-msgstr "الكيانات المتعقبة"
-
-msgid "Org units"
-msgstr "الوحدات التنظيمية"
-
 msgid "not one of"
 msgstr ""
 
@@ -1364,6 +1331,18 @@ msgstr ""
 "تتطلب هذه الطبقة حساب Google Earth Engine. تحقق من وثائق DHIS2 لمزيد من "
 "المعلومات."
 
+msgid "Thematic"
+msgstr ""
+
+msgid "Events"
+msgstr "الأحداث"
+
+msgid "Tracked entities"
+msgstr "الكيانات المتعقبة"
+
+msgid "Org units"
+msgstr "الوحدات التنظيمية"
+
 msgid "Facility"
 msgstr "المنشأة"
 

diff --git a/i18n/cs.po b/i18n/cs.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2023-09-06T13:08:55.205Z\n"
+"POT-Creation-Date: 2023-10-23T12:55:26.288Z\n"
 "PO-Revision-Date: 2019-06-25 18:35+0000\n"
 "Last-Translator: Jiří Podhorecký, 2023\n"
 "Language-Team: Czech (https://app.transifex.com/hisp-uio/teams/100509/cs/)\n"
@@ -911,12 +911,6 @@ msgstr "OSM Light"
 msgid "OSM Detailed"
 msgstr "OSM Detailed"
 
-msgid "Google Streets"
-msgstr "Google Streets"
-
-msgid "Google Hybrid"
-msgstr "Google Hybrid"
-
 msgid "Bing Road"
 msgstr "Bing Road"
 
@@ -1331,18 +1325,6 @@ msgstr "Nenalezeny žádné trasované entity"
 msgid "related"
 msgstr "příbuzný"
 
-msgid "Thematic"
-msgstr "Tematický"
-
-msgid "Events"
-msgstr "Události"
-
-msgid "Tracked entities"
-msgstr "Trasované entity"
-
-msgid "Org units"
-msgstr "Organizační jednotky"
-
 msgid "not one of"
 msgstr "není jeden z"
 
@@ -1368,6 +1350,18 @@ msgstr ""
 "Tato vrstva vyžaduje účet Google Earth Engine. Další informace najdete v "
 "dokumentaci DHIS2."
 
+msgid "Thematic"
+msgstr "Tematický"
+
+msgid "Events"
+msgstr "Události"
+
+msgid "Tracked entities"
+msgstr "Trasované entity"
+
+msgid "Org units"
+msgstr "Organizační jednotky"
+
 msgid "Facility"
 msgstr "Zařízení"
 

diff --git a/i18n/es.po b/i18n/es.po
@@ -17,7 +17,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2023-09-06T13:08:55.205Z\n"
+"POT-Creation-Date: 2023-10-23T12:55:26.288Z\n"
 "PO-Revision-Date: 2019-06-25 18:35+0000\n"
 "Last-Translator: Janeth Cruz, 2023\n"
 "Language-Team: Spanish (https://app.transifex.com/hisp-uio/teams/100509/es/)\n"
@@ -915,12 +915,6 @@ msgstr "OSM Sencillo"
 msgid "OSM Detailed"
 msgstr "OSM Detallado"
 
-msgid "Google Streets"
-msgstr "Google Streets"
-
-msgid "Google Hybrid"
-msgstr "Google Híbrido"
-
 msgid "Bing Road"
 msgstr "Bing Carretera"
 
@@ -1321,18 +1315,6 @@ msgstr ""
 msgid "related"
 msgstr "relacionado"
 
-msgid "Thematic"
-msgstr "Temática"
-
-msgid "Events"
-msgstr "Eventos"
-
-msgid "Tracked entities"
-msgstr "Entidades monitoreadas"
-
-msgid "Org units"
-msgstr "Unidades organizativas"
-
 msgid "not one of"
 msgstr ""
 
@@ -1357,6 +1339,18 @@ msgid ""
 "documentation for more information."
 msgstr ""
 
+msgid "Thematic"
+msgstr "Temática"
+
+msgid "Events"
+msgstr "Eventos"
+
+msgid "Tracked entities"
+msgstr "Entidades monitoreadas"
+
+msgid "Org units"
+msgstr "Unidades organizativas"
+
 msgid "Facility"
 msgstr "Establecimiento"
 

diff --git a/i18n/fr.po b/i18n/fr.po
@@ -16,7 +16,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2023-09-06T13:08:55.205Z\n"
+"POT-Creation-Date: 2023-10-23T12:55:26.288Z\n"
 "PO-Revision-Date: 2019-06-25 18:35+0000\n"
 "Last-Translator: Viktor Varland <[email protected]>, 2023\n"
 "Language-Team: French (https://app.transifex.com/hisp-uio/teams/100509/fr/)\n"
@@ -35,15 +35,6 @@ msgstr ""
 msgid "Failed to save map: {{message}}"
 msgstr ""
 
-msgid "Calculation"
-msgstr ""
-
-msgid "No calculations found"
-msgstr ""
-
-msgid "Calculations can be created in the Data Visualizer app."
-msgstr ""
-
 msgid "Classification"
 msgstr "Classification"
 
@@ -459,9 +450,6 @@ msgstr "L'élément de données évènement est requis"
 msgid "Program indicator is required"
 msgstr "L'indicateur de programme est requis"
 
-msgid "Calculation is required"
-msgstr ""
-
 msgid "Period is required"
 msgstr "La période est requise"
 
@@ -477,9 +465,6 @@ msgstr "Eléments de données évènement"
 msgid "Program indicators"
 msgstr "Program indicators"
 
-msgid "Calculations"
-msgstr ""
-
 msgid "Item type"
 msgstr "Type d'élément"
 
@@ -951,12 +936,6 @@ msgstr "OSM Light"
 msgid "OSM Detailed"
 msgstr "OSM détaillée"
 
-msgid "Google Streets"
-msgstr "Google Streets"
-
-msgid "Google Hybrid"
-msgstr "Google Hybride"
-
 msgid "Bing Road"
 msgstr "Bing Road"
 
@@ -1375,18 +1354,6 @@ msgstr "Aucune entité suivie trouvée"
 msgid "related"
 msgstr "lié"
 
-msgid "Thematic"
-msgstr "Thématique"
-
-msgid "Events"
-msgstr "Événements"
-
-msgid "Tracked entities"
-msgstr "Entités suiviées "
-
-msgid "Org units"
-msgstr "OrgUnit"
-
 msgid "not one of"
 msgstr "ne fait pas partie de"
 
@@ -1413,6 +1380,18 @@ msgstr ""
 "Cette couche nécessite un compte Google Earth Engine. Consultez la "
 "documentation du DHIS2 pour plus d'informations."
 
+msgid "Thematic"
+msgstr "Thématique"
+
+msgid "Events"
+msgstr "Événements"
+
+msgid "Tracked entities"
+msgstr "Entités suiviées "
+
+msgid "Org units"
+msgstr "OrgUnit"
+
 msgid "Facility"
 msgstr "Etablissement"