feat: merge conflict

dhis2 · Oct 2, 2024 · cc0d9d8 · cc0d9d8
2 parents 2e8a1d7 + b8245ea
commit cc0d9d8
Show file tree

Hide file tree

Showing 44 changed files with 311 additions and 254 deletions.
diff --git a/.github/workflows/rebuild-docs.yml b/.github/workflows/rebuild-docs.yml
@@ -0,0 +1,19 @@
+name: 'dhis2: rebuild developer docs'
+
+on:
+    push:
+        branches:
+            - master
+        paths:
+            - 'docs/developer/**'
+            - 'CHANGELOG.md'
+
+concurrency:
+    group: ${{ github.workflow }}-${{ github.ref }}
+    cancel-in-progress: true
+
+jobs:
+    rebuild-docs:
+        runs-on: ubuntu-latest
+        steps:
+            - run: curl -X POST -d {} https://api.netlify.com/build_hooks/${{ secrets.NETLIFY_DEVELOPER_DOCS_TOKEN }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,31 @@
+## [101.6.2](https://github.com/dhis2/capture-app/compare/v101.6.1...v101.6.2) (2024-10-01)
+
+
+### Bug Fixes
+
+* [DHIS2-18004] sort events in rules engine by occurredAt and createdAt ([#3788](https://github.com/dhis2/capture-app/issues/3788)) ([2bb485e](https://github.com/dhis2/capture-app/commit/2bb485e0927e9137874131a982fe690b9f6c5361))
+
+## [101.6.1](https://github.com/dhis2/capture-app/compare/v101.6.0...v101.6.1) (2024-09-29)
+
+
+### Bug Fixes
+
+* **translations:** sync translations from transifex (master) ([cbeb102](https://github.com/dhis2/capture-app/commit/cbeb1022bf45b241a91dcfb8c3e49956b28b1c44))
+
+# [101.6.0](https://github.com/dhis2/capture-app/compare/v101.5.0...v101.6.0) (2024-09-27)
+
+
+### Features
+
+* support custom background color ([#3814](https://github.com/dhis2/capture-app/issues/3814)) ([22cfe58](https://github.com/dhis2/capture-app/commit/22cfe585b6b044c7d6b146c1449ccddb85d8abb4))
+
+# [101.5.0](https://github.com/dhis2/capture-app/compare/v101.4.1...v101.5.0) (2024-09-24)
+
+
+### Features
+
+* [DHIS2-17770] Org unit contextualization in self contained widgets ([#3720](https://github.com/dhis2/capture-app/issues/3720)) ([562b03a](https://github.com/dhis2/capture-app/commit/562b03a1cf2cb5cff5382bd433943f289c860095))
+
 ## [101.4.1](https://github.com/dhis2/capture-app/compare/v101.4.0...v101.4.1) (2024-09-19)
 
 

diff --git a/cypress/e2e/WidgetsForEnrollmentPages/WidgetEnrollment/index.js b/cypress/e2e/WidgetsForEnrollmentPages/WidgetEnrollment/index.js
@@ -66,7 +66,7 @@ Then('the user sees the enrollment organisation unit', () => {
     cy.get('[data-test="widget-enrollment"]').within(() => {
         cy.get('[data-test="widget-enrollment-icon-orgunit"]').should('exist');
         cy.get('[data-test="widget-enrollment-orgunit"]')
-            .contains('Started at Ngelehun CHC')
+            .contains('Started at: Ngelehun CHC')
             .should('exist');
     });
 });
@@ -77,7 +77,7 @@ Then('the user sees the owner organisation unit', () => {
             'exist',
         );
         cy.get('[data-test="widget-enrollment-owner-orgunit"]')
-            .contains('Owned by Ngelehun CHC')
+            .contains('Owned by: Ngelehun CHC')
             .should('exist');
     });
 });
@@ -232,7 +232,7 @@ Then(/^the user successfully transfers the enrollment/, () => {
 
     cy.get('[data-test="widget-enrollment"]').within(() => {
         cy.get('[data-test="widget-enrollment-owner-orgunit"]')
-            .contains('Owned by Njandama MCHP')
+            .contains('Owned by: Njandama MCHP')
             .should('exist');
     });
 });
@@ -246,7 +246,7 @@ Then(/^the user types in (.*)/, (orgunit) => {
 Given(/^the enrollment owner organisation unit is (.*)/, (orgunit) => {
     cy.get('[data-test="widget-enrollment"]').within(() => {
         cy.get('[data-test="widget-enrollment-owner-orgunit"]')
-            .contains(`Owned by ${orgunit}`)
+            .contains(`Owned by: ${orgunit}`)
             .should('exist');
     });
 });

diff --git a/docs/developer/enrollment-plugins/manual-setup.mdx b/docs/developer/enrollment-plugins/manual-setup.mdx
@@ -76,7 +76,7 @@ You can also have different layouts for the three different enrollment pages.
             },
             {
                 "type": "component",
-                "name": "EnrollmentComment"
+                "name": "EnrollmentNote"
             },
             {
                 "type": "component",
@@ -188,7 +188,7 @@ You can also have different layouts for the three different enrollment pages.
             },
             {
                 "type": "component",
-                "name": "EventComment"
+                "name": "EventNote"
             },
             {
                 "type": "component",
@@ -229,8 +229,8 @@ type DefaultComponents = 'QuickActions'
     | 'AssigneeWidget'
     | 'NewEventWorkspace'
     | 'EditEventWorkspace'
-    | 'EnrollmentComment'
-    | 'EventComment'
+    | 'EnrollmentNote'
+    | 'EventNote'
     | 'TrackedEntityRelationship'
     | 'ErrorWidget'
     | 'WarningWidget'

diff --git a/i18n/cs.po b/i18n/cs.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2024-08-10T10:42:21.141Z\n"
+"POT-Creation-Date: 2024-09-02T11:08:16.281Z\n"
 "PO-Revision-Date: 2019-06-27 07:31+0000\n"
 "Last-Translator: Jiří Podhorecký <[email protected]>, 2024\n"
 "Language-Team: Czech (https://app.transifex.com/hisp-uio/teams/100509/cs/)\n"
@@ -1294,12 +1294,6 @@ msgstr "Widget pro zápis nelze načíst. Prosím zkuste to znovu později"
 msgid "Follow-up"
 msgstr "Následovat"
 
-msgid "Started at {{orgUnitName}}"
-msgstr "Zahájeno v {{orgUnitName}}"
-
-msgid "Owned by {{ownerOrgUnit}}"
-msgstr "Vlastník: {{ownerOrgUnit}}"
-
 msgid "Cancelled"
 msgstr "Zrušeno"
 

diff --git a/i18n/en.pot b/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-09-08T20:48:49.045Z\n"
-"PO-Revision-Date: 2024-09-08T20:48:49.045Z\n"
+"POT-Creation-Date: 2024-09-02T11:08:16.281Z\n"
+"PO-Revision-Date: 2024-09-02T11:08:16.281Z\n"
 
 msgid "Choose one or more dates..."
 msgstr "Choose one or more dates..."
@@ -1272,12 +1272,6 @@ msgstr "Enrollment widget could not be loaded. Please try again later"
 msgid "Follow-up"
 msgstr "Follow-up"
 
-msgid "Started at {{orgUnitName}}"
-msgstr "Started at {{orgUnitName}}"
-
-msgid "Owned by {{ownerOrgUnit}}"
-msgstr "Owned by {{ownerOrgUnit}}"
-
 msgid "Cancelled"
 msgstr "Cancelled"
 

diff --git a/i18n/es.po b/i18n/es.po
@@ -18,7 +18,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2024-08-10T10:42:21.141Z\n"
+"POT-Creation-Date: 2024-09-02T11:08:16.281Z\n"
 "PO-Revision-Date: 2019-06-27 07:31+0000\n"
 "Last-Translator: Juan M Alcantara Acosta <[email protected]>, 2024\n"
 "Language-Team: Spanish (https://app.transifex.com/hisp-uio/teams/100509/es/)\n"
@@ -1333,12 +1333,6 @@ msgstr ""
 msgid "Follow-up"
 msgstr "Seguimiento"
 
-msgid "Started at {{orgUnitName}}"
-msgstr "Comenzó en {{orgUnitName}}"
-
-msgid "Owned by {{ownerOrgUnit}}"
-msgstr "Propiedad de {{ownerOrgUnit}}"
-
 msgid "Cancelled"
 msgstr "Cancelar"
 

diff --git a/i18n/fr.po b/i18n/fr.po
@@ -14,7 +14,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2024-08-10T10:42:21.141Z\n"
+"POT-Creation-Date: 2024-09-02T11:08:16.281Z\n"
 "PO-Revision-Date: 2019-06-27 07:31+0000\n"
 "Last-Translator: Bram Piot <[email protected]>, 2024\n"
 "Language-Team: French (https://app.transifex.com/hisp-uio/teams/100509/fr/)\n"
@@ -1304,12 +1304,6 @@ msgstr ""
 msgid "Follow-up"
 msgstr "Suivi"
 
-msgid "Started at {{orgUnitName}}"
-msgstr "Commencé à {{orgUnitName}}"
-
-msgid "Owned by {{ownerOrgUnit}}"
-msgstr "Propriété de {{ownerOrgUnit}}"
-
 msgid "Cancelled"
 msgstr "Annulé"
 

diff --git a/i18n/id.po b/i18n/id.po
@@ -14,7 +14,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2024-08-10T10:42:21.141Z\n"
+"POT-Creation-Date: 2024-09-02T11:08:16.281Z\n"
 "PO-Revision-Date: 2019-06-27 07:31+0000\n"
 "Last-Translator: Aprisa Chrysantina <[email protected]>, 2024\n"
 "Language-Team: Indonesian (https://app.transifex.com/hisp-uio/teams/100509/id/)\n"
@@ -1272,12 +1272,6 @@ msgstr "Widget pendaftaran tidak dapat dimuat. Silakan coba lagi nanti"
 msgid "Follow-up"
 msgstr "Mengikuti"
 
-msgid "Started at {{orgUnitName}}"
-msgstr "Dimulai di {{orgUnitName}}"
-
-msgid "Owned by {{ownerOrgUnit}}"
-msgstr "Dimiliki oleh {{ownerOrgUnit}}"
-
 msgid "Cancelled"
 msgstr "Dibatalkan"
 

diff --git a/i18n/lo.po b/i18n/lo.po
@@ -4,15 +4,15 @@
 # Saysamone Sibounma, 2023
 # Somkhit Bouavong <[email protected]>, 2024
 # Thuy Nguyen <[email protected]>, 2024
-# Namwan Chanthavisouk, 2024
 # Viktor Varland <[email protected]>, 2024
+# Namwan Chanthavisouk, 2024
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2024-08-10T10:42:21.141Z\n"
+"POT-Creation-Date: 2024-09-02T11:08:16.281Z\n"
 "PO-Revision-Date: 2019-06-27 07:31+0000\n"
-"Last-Translator: Viktor Varland <[email protected]>, 2024\n"
+"Last-Translator: Namwan Chanthavisouk, 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"
@@ -1275,12 +1275,6 @@ msgstr "ບໍ່ສາມາດໂຫຼດລາຍການການລົງ
 msgid "Follow-up"
 msgstr "ຕິດຕາມ"
 
-msgid "Started at {{orgUnitName}}"
-msgstr "ເລີ່ມຈາກ {{orgUnitName}}"
-
-msgid "Owned by {{ownerOrgUnit}}"
-msgstr "ເປັນເຈົ້າຂອງໂດຍ {{ownerOrgUnit}}"
-
 msgid "Cancelled"
 msgstr "ຍົກເລີກແລ້ວ"
 
@@ -1506,18 +1500,20 @@ msgid "New {{ eventName }} event"
 msgstr "ເຫດການໃໝ່ {{ eventName }}"
 
 msgid "An error occurred while deleting the event"
-msgstr ""
+msgstr "ພົບຂໍ້ຜິດພາດໃນລະຫວ່າງລົບເຫດການ"
 
 msgid ""
 "Deleting an event is permanent and cannot be undone. Are you sure you want "
 "to delete this event?"
 msgstr ""
+"ການລົບເຫດການແມ່ນຖາວອນ ແລະ ບໍ່ສາມາດຍົກເລີກໄດ້. "
+"ທ່ານແນ່ໃຈບໍ່ວ່າຕ້ອງການລົບເຫດການນີ້?"
 
 msgid "An error occurred when updating event status"
-msgstr ""
+msgstr "ພົບຂໍ້ຜິດພາດໃນລະຫວ່າງອັບເດດສະຖານະເຫດການ"
 
 msgid "Unskip"
-msgstr ""
+msgstr "ຍົກເລີກ"
 
 msgid "Skip"
 msgstr "ຂ້າມ"

diff --git a/i18n/nb.po b/i18n/nb.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2024-08-10T10:42:21.141Z\n"
+"POT-Creation-Date: 2024-09-02T11:08:16.281Z\n"
 "PO-Revision-Date: 2019-06-27 07:31+0000\n"
 "Last-Translator: Merethe Wollan Blisten, 2024\n"
 "Language-Team: Norwegian Bokmål (https://app.transifex.com/hisp-uio/teams/100509/nb/)\n"
@@ -1299,12 +1299,6 @@ msgstr "Registreringsmodulen kunne ikke lastes inn. Prøv igjen senere"
 msgid "Follow-up"
 msgstr "Oppfølging"
 
-msgid "Started at {{orgUnitName}}"
-msgstr "Begynt på {{orgUnitName}}"
-
-msgid "Owned by {{ownerOrgUnit}}"
-msgstr "Eid av {{ownerOrgUnit}}"
-
 msgid "Cancelled"
 msgstr "Kansellert"
 

diff --git a/i18n/nl.po b/i18n/nl.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2024-08-10T10:42:21.141Z\n"
+"POT-Creation-Date: 2024-09-02T11:08:16.281Z\n"
 "PO-Revision-Date: 2019-06-27 07:31+0000\n"
 "Last-Translator: Charel van den Elsen, 2024\n"
 "Language-Team: Dutch (https://app.transifex.com/hisp-uio/teams/100509/nl/)\n"
@@ -1310,12 +1310,6 @@ msgstr ""
 msgid "Follow-up"
 msgstr "Opvolgen"
 
-msgid "Started at {{orgUnitName}}"
-msgstr "Gestart bij {{orgUnitName}}"
-
-msgid "Owned by {{ownerOrgUnit}}"
-msgstr "Eigendom van {{ownerOrgUnit}}"
-
 msgid "Cancelled"
 msgstr "Geannuleerd"
 

diff --git a/i18n/pt.po b/i18n/pt.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2024-08-10T10:42:21.141Z\n"
+"POT-Creation-Date: 2024-09-02T11:08:16.281Z\n"
 "PO-Revision-Date: 2019-06-27 07:31+0000\n"
 "Last-Translator: Viktor Varland <[email protected]>, 2024\n"
 "Language-Team: Portuguese (https://app.transifex.com/hisp-uio/teams/100509/pt/)\n"
@@ -1306,12 +1306,6 @@ msgstr ""
 msgid "Follow-up"
 msgstr "Acompanhamento"
 
-msgid "Started at {{orgUnitName}}"
-msgstr "Iniciado em {{orgUnitName}}"
-
-msgid "Owned by {{ownerOrgUnit}}"
-msgstr "Propriedade de {{ownerOrgUnit}}"
-
 msgid "Cancelled"
 msgstr "Cancelado"
 

diff --git a/i18n/ro.po b/i18n/ro.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2024-08-10T10:42:21.141Z\n"
+"POT-Creation-Date: 2024-09-02T11:08:16.281Z\n"
 "PO-Revision-Date: 2019-06-27 07:31+0000\n"
 "Last-Translator: Valeriu Plesca <[email protected]>, 2024\n"
 "Language-Team: Romanian (https://app.transifex.com/hisp-uio/teams/100509/ro/)\n"
@@ -1255,12 +1255,6 @@ msgstr ""
 msgid "Follow-up"
 msgstr ""
 
-msgid "Started at {{orgUnitName}}"
-msgstr ""
-
-msgid "Owned by {{ownerOrgUnit}}"
-msgstr "Deținut de {{ownerOrgUnit}}"
-
 msgid "Cancelled"
 msgstr "Anulat"
 
@@ -1481,6 +1475,23 @@ msgstr "Această etapă poate avea un singur eveniment"
 msgid "New {{ eventName }} event"
 msgstr "Eveniment nou {{ eventName }}"
 
+msgid "An error occurred while deleting the event"
+msgstr ""
+
+msgid ""
+"Deleting an event is permanent and cannot be undone. Are you sure you want "
+"to delete this event?"
+msgstr ""
+
+msgid "An error occurred when updating event status"
+msgstr ""
+
+msgid "Unskip"
+msgstr ""
+
+msgid "Skip"
+msgstr ""
+
 msgid "To open this event, please wait until saving is complete"
 msgstr ""