Merge branch 'master' of https://github.com/dhis2/capture-app into hv…

…/feat/DHIS2-18017_AbilityToUnlinkEvent
dhis2 · Nov 6, 2024 · 7a7678b · 7a7678b
2 parents 4c596fc + bc2b962
commit 7a7678b
Show file tree

Hide file tree

Showing 44 changed files with 513 additions and 988 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,32 @@
+## [101.14.8](https://github.com/dhis2/capture-app/compare/v101.14.7...v101.14.8) (2024-11-05)
+
+
+### Bug Fixes
+
+* [DHIS2-18278] remove completedAt and completedBy from the payload send to the API ([#3873](https://github.com/dhis2/capture-app/issues/3873)) ([156369a](https://github.com/dhis2/capture-app/commit/156369abe3dced63c773900acbc3f11f82d57723))
+
+## [101.14.7](https://github.com/dhis2/capture-app/compare/v101.14.6...v101.14.7) (2024-11-04)
+
+
+### Bug Fixes
+
+* [DHIS2-17135][DHIS2-17018] Adjust strings for error messages ([#3858](https://github.com/dhis2/capture-app/issues/3858)) ([1d9ae57](https://github.com/dhis2/capture-app/commit/1d9ae5731331d3f19a0980cf09ebdd9cc46e4583))
+
+## [101.14.6](https://github.com/dhis2/capture-app/compare/v101.14.5...v101.14.6) (2024-11-03)
+
+
+### Bug Fixes
+
+* **translations:** sync translations from transifex (master) ([facbee1](https://github.com/dhis2/capture-app/commit/facbee13d009d11e955a1a9b277e27ba41b63867))
+
+## [101.14.5](https://github.com/dhis2/capture-app/compare/v101.14.4...v101.14.5) (2024-11-01)
+
+
+### Bug Fixes
+
+* [DHIS2-18238] incorrect criteria when saving list with follow up false ([#3868](https://github.com/dhis2/capture-app/issues/3868)) ([53c21f0](https://github.com/dhis2/capture-app/commit/53c21f0a4942d09ae4bf88253b576de8ca94b9b6))
+* [DHIS2-18248] pass on createdAt to rules engine when editing ([#3848](https://github.com/dhis2/capture-app/issues/3848)) ([31cb56c](https://github.com/dhis2/capture-app/commit/31cb56c4f05727eb84fcc36e39f897cccc5627b3))
+
 ## [101.14.4](https://github.com/dhis2/capture-app/compare/v101.14.3...v101.14.4) (2024-10-29)
 
 

diff --git a/cypress/e2e/EnrollmentAddEventPage/EnrollmentAddEventPageForm/EnrollmentAddEventPageForm.js b/cypress/e2e/EnrollmentAddEventPage/EnrollmentAddEventPageForm/EnrollmentAddEventPageForm.js
@@ -11,7 +11,7 @@ const changeEnrollmentAndEventsStatus = () => (
             const enrollment = body.enrollments && body.enrollments.find(e => e.enrollment === 'FZAa7j0muDj');
             const eventToDelete = enrollment.events.find(e => e.programStage === 'eHvTba5ijAh');
             const { events, ...rest } = enrollment;
-            const enrollmentToUpdate = { ...rest, status: 'ACTIVE' };
+            const enrollmentToUpdate = { ...rest, status: 'ACTIVE', completedAt: null, completedBy: null };
 
             return cy
                 .buildApiUrl('tracker?async=false&importStrategy=UPDATE')

diff --git a/...ss/e2e/EnrollmentEditEventPage/EnrollmentEditEventPageForm/EnrollmentEditEventPageForm.js b/...ss/e2e/EnrollmentEditEventPage/EnrollmentEditEventPageForm/EnrollmentEditEventPageForm.js
@@ -13,7 +13,9 @@ const changeEnrollmentAndEventsStatus = () => (
             const enrollmentToUpdate = {
                 ...enrollment,
                 status: 'ACTIVE',
-                events: [{ ...eventToUpdate, status: 'ACTIVE' }],
+                completedAt: null,
+                completedBy: null,
+                events: [{ ...eventToUpdate, status: 'ACTIVE', completedAt: null, completedBy: null }],
             };
 
             return cy

diff --git a/cypress/e2e/WidgetsForEnrollmentPages/WidgetEnrollment/index.js b/cypress/e2e/WidgetsForEnrollmentPages/WidgetEnrollment/index.js
@@ -13,8 +13,19 @@ const changeEnrollmentAndEventsStatus = () => (
         .then(url => cy.request(url))
         .then(({ body }) => {
             const enrollment = body.enrollments && body.enrollments.find(e => e.enrollment === 'qyx7tscVpVB');
-            const eventsToUpdate = enrollment.events.map(e => ({ ...e, status: 'ACTIVE' }));
-            const enrollmentToUpdate = { ...enrollment, status: 'ACTIVE', events: eventsToUpdate };
+            const eventsToUpdate = enrollment.events.map(e => ({
+                ...e,
+                status: 'ACTIVE',
+                completedAt: null,
+                completedBy: null,
+            }));
+            const enrollmentToUpdate = {
+                ...enrollment,
+                status: 'ACTIVE',
+                completedAt: null,
+                completedBy: null,
+                events: eventsToUpdate,
+            };
 
             return cy
                 .buildApiUrl('tracker?async=false&importStrategy=UPDATE')

diff --git a/i18n/ar.po b/i18n/ar.po
@@ -2,15 +2,15 @@
 # Translators:
 # KRG HIS <[email protected]>, 2020
 # Philip Larsen Donnelly, 2023
-# Hamza Assada <[email protected]>, 2024
 # Viktor Varland <[email protected]>, 2024
+# Hamza Assada <[email protected]>, 2024
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2024-09-02T11:08:16.281Z\n"
+"POT-Creation-Date: 2024-10-25T18:18:11.518Z\n"
 "PO-Revision-Date: 2019-06-27 07:31+0000\n"
-"Last-Translator: Viktor Varland <[email protected]>, 2024\n"
+"Last-Translator: Hamza Assada <[email protected]>, 2024\n"
 "Language-Team: Arabic (https://app.transifex.com/hisp-uio/teams/100509/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -623,42 +623,6 @@ msgstr ""
 msgid "Close the notice"
 msgstr ""
 
-msgid "Use new Enrollment dashboard for {{programName}}"
-msgstr ""
-
-msgid "Opt in for {{programName}}"
-msgstr ""
-
-msgid ""
-"By clicking opt-in below, you will start using the new enrollment dashboard "
-"in the Capture app for this Tracker program. At the moment, there is certain"
-" functionality from Tracker Capture that has not yet been added, including "
-"relationship and referral functionality. The work on including this Tracker "
-"functionality in Capture is ongoing and will be added in upcoming app "
-"releases."
-msgstr ""
-
-msgid ""
-"The core team appreciates any feedback on this new functionality which is "
-"currently being beta tested, please report any issues and feedback in the "
-"DHIS2 JIRA project."
-msgstr ""
-
-msgid ""
-"Click the button below to opt-in to the new enrollment dashboard "
-"functionality in the Capture app (beta) for this Tracker program for all "
-"users."
-msgstr ""
-
-msgid "Yes, opt in"
-msgstr ""
-
-msgid "Stop using new Enrollment dashboard for {{programName}}"
-msgstr ""
-
-msgid "Opt out for {{programName}}"
-msgstr ""
-
 msgid "Enrollment with id \"{{enrollmentId}}\" does not exist"
 msgstr ""
 
@@ -746,9 +710,6 @@ msgstr ""
 msgid "Page is missing required values from URL"
 msgstr ""
 
-msgid "Program is not valid"
-msgstr ""
-
 msgid "Org unit is not valid with current program"
 msgstr ""
 
@@ -1167,6 +1128,9 @@ msgstr ""
 msgid "Mark incomplete"
 msgstr "تعيين كـ غير مكتمل"
 
+msgid "You do not have access to delete this enrollment"
+msgstr ""
+
 msgid "Delete enrollment"
 msgstr "الغِ التسجيل"
 
@@ -1247,6 +1211,12 @@ msgstr ""
 msgid "Follow-up"
 msgstr "متابعة"
 
+msgid "Started at{{escape}}"
+msgstr ""
+
+msgid "Owned by{{escape}}"
+msgstr ""
+
 msgid "Cancelled"
 msgstr "الملغية"
 
@@ -1443,11 +1413,6 @@ msgstr ""
 msgid "Ambiguous relationships, contact system administrator"
 msgstr ""
 
-msgid ""
-"Enter {{linkableStageLabel}} details in the next step after completing this "
-"{{currentStageLabel}}."
-msgstr ""
-
 msgid "Enter details now"
 msgstr ""
 
@@ -1534,6 +1499,9 @@ msgstr ""
 msgid "No changes to display"
 msgstr ""
 
+msgid "Updated"
+msgstr "تم تحديثه"
+
 msgid "Created"
 msgstr "تم الإنشاء"
 
@@ -1552,6 +1520,9 @@ msgstr "عنصر بيانات"
 msgid "Change"
 msgstr ""
 
+msgid "Value"
+msgstr "القيمة"
+
 msgid "New {{trackedEntityTypeName}} relationship"
 msgstr ""
 

diff --git a/i18n/ar_IQ.po b/i18n/ar_IQ.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2024-09-02T11:08:16.281Z\n"
+"POT-Creation-Date: 2024-10-25T18:18:11.518Z\n"
 "PO-Revision-Date: 2019-06-27 07:31+0000\n"
 "Last-Translator: KRG HIS <[email protected]>, 2024\n"
 "Language-Team: Arabic (Iraq) (https://app.transifex.com/hisp-uio/teams/100509/ar_IQ/)\n"
@@ -620,42 +620,6 @@ msgstr ""
 msgid "Close the notice"
 msgstr ""
 
-msgid "Use new Enrollment dashboard for {{programName}}"
-msgstr ""
-
-msgid "Opt in for {{programName}}"
-msgstr ""
-
-msgid ""
-"By clicking opt-in below, you will start using the new enrollment dashboard "
-"in the Capture app for this Tracker program. At the moment, there is certain"
-" functionality from Tracker Capture that has not yet been added, including "
-"relationship and referral functionality. The work on including this Tracker "
-"functionality in Capture is ongoing and will be added in upcoming app "
-"releases."
-msgstr ""
-
-msgid ""
-"The core team appreciates any feedback on this new functionality which is "
-"currently being beta tested, please report any issues and feedback in the "
-"DHIS2 JIRA project."
-msgstr ""
-
-msgid ""
-"Click the button below to opt-in to the new enrollment dashboard "
-"functionality in the Capture app (beta) for this Tracker program for all "
-"users."
-msgstr ""
-
-msgid "Yes, opt in"
-msgstr ""
-
-msgid "Stop using new Enrollment dashboard for {{programName}}"
-msgstr ""
-
-msgid "Opt out for {{programName}}"
-msgstr ""
-
 msgid "Enrollment with id \"{{enrollmentId}}\" does not exist"
 msgstr ""
 
@@ -743,9 +707,6 @@ msgstr ""
 msgid "Page is missing required values from URL"
 msgstr ""
 
-msgid "Program is not valid"
-msgstr ""
-
 msgid "Org unit is not valid with current program"
 msgstr ""
 
@@ -1162,6 +1123,9 @@ msgstr ""
 msgid "Mark incomplete"
 msgstr ""
 
+msgid "You do not have access to delete this enrollment"
+msgstr ""
+
 msgid "Delete enrollment"
 msgstr ""
 
@@ -1242,6 +1206,12 @@ msgstr ""
 msgid "Follow-up"
 msgstr ""
 
+msgid "Started at{{escape}}"
+msgstr ""
+
+msgid "Owned by{{escape}}"
+msgstr ""
+
 msgid "Cancelled"
 msgstr "تم الإلغاء"
 
@@ -1438,11 +1408,6 @@ msgstr ""
 msgid "Ambiguous relationships, contact system administrator"
 msgstr ""
 
-msgid ""
-"Enter {{linkableStageLabel}} details in the next step after completing this "
-"{{currentStageLabel}}."
-msgstr ""
-
 msgid "Enter details now"
 msgstr ""
 
@@ -1529,6 +1494,9 @@ msgstr ""
 msgid "No changes to display"
 msgstr ""
 
+msgid "Updated"
+msgstr ""
+
 msgid "Created"
 msgstr "تم الإنشاء"
 
@@ -1547,6 +1515,9 @@ msgstr ""
 msgid "Change"
 msgstr ""
 
+msgid "Value"
+msgstr "القيمة"
+
 msgid "New {{trackedEntityTypeName}} relationship"
 msgstr ""