Merge branch 'master' into DHIS2-17192

CHANGELOG.md

@@ -1,3 +1,24 @@
+# [101.20.0](https://github.com/dhis2/capture-app/compare/v101.19.4...v101.20.0) (2024-12-17)
+
+
+### Features
+
+* [DHIS2-18017] Ability to unlink event from edit/view event page ([#3846](https://github.com/dhis2/capture-app/issues/3846)) ([ad352f5](https://github.com/dhis2/capture-app/commit/ad352f5845a8780668ecf5659100f650c697d426))
+
+## [101.19.4](https://github.com/dhis2/capture-app/compare/v101.19.3...v101.19.4) (2024-12-15)
+
+
+### Bug Fixes
+
+* **translations:** sync translations from transifex (master) ([ef97375](https://github.com/dhis2/capture-app/commit/ef973753e9014541c22215ea0690fecb819c82e3))
+
+## [101.19.3](https://github.com/dhis2/capture-app/compare/v101.19.2...v101.19.3) (2024-12-13)
+
+
+### Bug Fixes
+
+* [DHIS2-18614] prevent runtime error when only one date range is selected ([#3906](https://github.com/dhis2/capture-app/issues/3906)) ([4699a84](https://github.com/dhis2/capture-app/commit/4699a84b138a17bc42fae5be6685a71b840c1a43))
+
 ## [101.19.2](https://github.com/dhis2/capture-app/compare/v101.19.1...v101.19.2) (2024-12-08)
 
 

cypress/e2e/EnrollmentAddEventPage/EnrollmentAddEventPageForm/EnrollmentAddEventPageForm.feature

@@ -21,9 +21,9 @@ Feature: User interacts with the Enrollment New Event Workspace
     And the user selects Positive
     And you click the Save without completing button
     Then all events should be displayed
-    And the newest event in datatable nr 1 should contain Active
-    And the newest event in datatable nr 1 should contain 13
-    And the newest event in datatable nr 1 should contain Positive
+    And the newest event in datatable nr 2 should contain Active
+    And the newest event in datatable nr 2 should contain 13
+    And the newest event in datatable nr 2 should contain Positive
     And the events in Sputum smear microscopy are deleted
 
   Scenario: Required fields should display an error when saving without data

cypress/e2e/EnrollmentAddEventPage/EnrollmentAddEventPageForm/EnrollmentAddEventPageForm.js

@@ -132,7 +132,7 @@ Then('all events should be displayed', () => {
 });
 
 Then(/^the newest event in datatable nr (.*) should contain (.*)$/, (eq, status) => {
-    cy.get('[data-test="dhis2-uicore-datatable"]')
+    cy.get('[data-test="stage-content"]')
         .eq(eq)
         .within(() => {
             cy.get('[data-test="dhis2-uicore-datatablerow"]')

cypress/e2e/EnrollmentEditEventPage/EnrollmentEditEventPageForm/EnrollmentEditEventPageForm.feature

@@ -77,6 +77,7 @@ And the user see the following text: 11
     When the user clicks on the cancel button
     Then the user is navigated to the enrollment dashboard
 
+@with-restore-event-schedule-date
 Scenario: User can update schedule date for a scheduled event
     Given you land on the enrollment event page with selected Person by having typed /#/enrollmentEventEdit?eventId=RIrfCcEP8Uu&orgUnitId=DiszpKrYNg8
     Then the view enrollment event form is in edit mode

cypress/e2e/EnrollmentEditEventPage/EnrollmentEditEventPageForm/EnrollmentEditEventPageForm.js

@@ -1,6 +1,18 @@
-import { defineStep as And, Given, Then, When } from '@badeball/cypress-cucumber-preprocessor';
+import { defineStep as And, Given, Then, When, Before } from '@badeball/cypress-cucumber-preprocessor';
 import { getCurrentYear } from '../../../support/date';
 
+Before({ tags: '@with-restore-event-schedule-date' }, () => {
+    cy.buildApiUrl('tracker', 'events/RIrfCcEP8Uu')
+        .then(url => cy.request(url))
+        .then((apiResponse) => {
+            const event = apiResponse.body;
+            const eventToUpdate = { ...event, scheduledAt: `${getCurrentYear() - 15}-01-07` };
+            return cy
+                .buildApiUrl('tracker?async=false&importStrategy=UPDATE')
+                .then(eventUrl => cy.request('POST', eventUrl, { events: [eventToUpdate] }));
+        });
+});
+
 const changeEnrollmentAndEventsStatus = () => (
     cy.buildApiUrl(
         'tracker',

i18n/ar_IQ.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2024-11-07T11:57:59.094Z\n"
+"POT-Creation-Date: 2024-12-03T10:58:18.077Z\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"
@@ -120,66 +120,6 @@ msgstr "يتم التحقق من القيمة"
 msgid "Async field update failed"
 msgstr "فشل تحديث حقل متزامن"
 
-msgid "A value is required"
-msgstr "قيمة مطلوبة"
-
-msgid "Please provide a valid number"
-msgstr "نرجوا ادخال صيغة رقمية صحيحة"
-
-msgid "Please provide a valid integer"
-msgstr "من فضلك ادخل رقم صحيح، من غير كسر"
-
-msgid "Please provide a positive integer"
-msgstr "من فضلك ادخل رقم صحيح موجب"
-
-msgid "Please provide zero or a positive integer"
-msgstr "من فضلك ادخل عدد صحيح موجب، أو صفر"
-
-msgid "Please provide a negative integer"
-msgstr "من فضلك ادخل احد الأعداد الصحيحة السالبة"
-
-msgid "Please provide a valid date"
-msgstr "نرجوا ادخال صيغة صحيحة للتاريخ"
-
-msgid "A date in the future is not allowed"
-msgstr ""
-
-msgid "Please provide a valid date and time"
-msgstr "من فضلك ادخل صيغة صحيحة للتاريخ والوقت"
-
-msgid "Please provide a valid time"
-msgstr "من فضلك ادخل صيغة صحيحة للوقت"
-
-msgid "Please provide an integer between 0 and 100"
-msgstr ""
-
-msgid "Please provide a valid url"
-msgstr "يرجى ادخال صيغة ارتباط تشعبي سليمة"
-
-msgid "Please provide a valid email address"
-msgstr "من فضلك ادخل صيغة بريد الكتروني سليمة"
-
-msgid "Please provide a valid age"
-msgstr "من فضلك ادخل صيغة عمرية سليمة"
-
-msgid "Please provide a valid phone number"
-msgstr "من فضلك ادخل صيغة رقم تلفون سليمة"
-
-msgid "Please provide a valid organisation unit"
-msgstr "من فضلك ادخل وحدة تنظيمية صالحة"
-
-msgid "Please provide valid coordinates"
-msgstr "من فضلك ادخل صيغة احداثيات سليمة"
-
-msgid "This value already exists"
-msgstr "هذه القيمة موجودة مسبقاً"
-
-msgid "\"From\" cannot be greater than \"To\""
-msgstr "لا يمكن ان تكون \"من\" اكبر من \"إلى\""
-
-msgid "Checking..."
-msgstr "يتم الفحص"
-
 msgid "Area"
 msgstr "مساحة"
 
@@ -192,6 +132,12 @@ msgstr "التسجيل"
 msgid "Complete event"
 msgstr ""
 
+msgid "A value is required"
+msgstr "قيمة مطلوبة"
+
+msgid "Please provide a valid date"
+msgstr "نرجوا ادخال صيغة صحيحة للتاريخ"
+
 msgid "{{ stageName }} - Basic info"
 msgstr ""
 
@@ -204,8 +150,8 @@ msgstr ""
 msgid "Please select {{categoryName}}"
 msgstr ""
 
-msgid "A future date is not allowed"
-msgstr "غير مسموح تاريخ بالمستقبل"
+msgid "A date in the future is not allowed"
+msgstr ""
 
 msgid "Saving a new enrollment in {{programName}} in {{orgUnitName}}."
 msgstr ""
@@ -1184,6 +1130,9 @@ msgstr ""
 msgid "Coordinates"
 msgstr ""
 
+msgid "Please provide valid coordinates"
+msgstr "من فضلك ادخل صيغة احداثيات سليمة"
+
 msgid "Delete polygon"
 msgstr "حذف المضلع"
 
@@ -1440,6 +1389,12 @@ msgstr ""
 msgid "Report date"
 msgstr ""
 
+msgid "Please enter a date"
+msgstr ""
+
+msgid "Please provide a valid organisation unit"
+msgstr "من فضلك ادخل وحدة تنظيمية صالحة"
+
 msgid "Please select a valid event"
 msgstr ""
 
@@ -1944,6 +1899,60 @@ msgstr ""
 msgid "Error updating the Assignee"
 msgstr ""
 
+msgid "Please provide a valid number"
+msgstr "نرجوا ادخال صيغة رقمية صحيحة"
+
+msgid "Please provide a valid integer"
+msgstr "من فضلك ادخل رقم صحيح، من غير كسر"
+
+msgid "Please provide a positive integer"
+msgstr "من فضلك ادخل رقم صحيح موجب"
+
+msgid "Please provide zero or a positive integer"
+msgstr "من فضلك ادخل عدد صحيح موجب، أو صفر"
+
+msgid "Please provide a negative integer"
+msgstr "من فضلك ادخل احد الأعداد الصحيحة السالبة"
+
+msgid "Please provide a valid date and time"
+msgstr "من فضلك ادخل صيغة صحيحة للتاريخ والوقت"
+
+msgid "Please provide a valid time"
+msgstr "من فضلك ادخل صيغة صحيحة للوقت"
+
+msgid "Please provide an integer between 0 and 100"
+msgstr ""
+
+msgid "Please provide a valid url"
+msgstr "يرجى ادخال صيغة ارتباط تشعبي سليمة"
+
+msgid "Please provide a valid email address"
+msgstr "من فضلك ادخل صيغة بريد الكتروني سليمة"
+
+msgid "Please provide a valid age"
+msgstr "من فضلك ادخل صيغة عمرية سليمة"
+
+msgid "Please provide a valid phone number"
+msgstr "من فضلك ادخل صيغة رقم تلفون سليمة"
+
+msgid "This value already exists"
+msgstr "هذه القيمة موجودة مسبقاً"
+
+msgid "\"From\" cannot be greater than \"To\""
+msgstr "لا يمكن ان تكون \"من\" اكبر من \"إلى\""
+
+msgid "Checking..."
+msgstr "يتم الفحص"
+
+msgid "Please provide a valid positive integer"
+msgstr ""
+
+msgid "Please enter a valid time"
+msgstr ""
+
+msgid "Please enter a time"
+msgstr ""
+
 msgid "Set coordinate"
 msgstr "ضبط الإحداثية"