Merge remote-tracking branch 'origin/master' into eh/feat/DHIS2-16372…

…_DeleteTEIRelationships

# Conflicts:
#	i18n/en.pot

CHANGELOG.md

@@ -1,3 +1,52 @@
+## [100.57.5](https://github.com/dhis2/capture-app/compare/v100.57.4...v100.57.5) (2024-02-28)
+
+
+### Bug Fixes
+
+* **translations:** sync translations from transifex (master) ([f3cb465](https://github.com/dhis2/capture-app/commit/f3cb465aa8d3d99275e995eda05075070ed6c393))
+
+## [100.57.4](https://github.com/dhis2/capture-app/compare/v100.57.3...v100.57.4) (2024-02-27)
+
+
+### Bug Fixes
+
+* [DHIS2-16016] handle multi-text in v40 ([#3491](https://github.com/dhis2/capture-app/issues/3491)) ([25d79cc](https://github.com/dhis2/capture-app/commit/25d79ccb9a8a880815d93659821348d1ebea253f))
+
+## [100.57.3](https://github.com/dhis2/capture-app/compare/v100.57.2...v100.57.3) (2024-02-27)
+
+
+### Bug Fixes
+
+* [DHIS2-16318] enrollment page url management ([#3522](https://github.com/dhis2/capture-app/issues/3522)) ([0abec43](https://github.com/dhis2/capture-app/commit/0abec430ac4e74907c01b46fcd264194b542539e))
+
+## [100.57.2](https://github.com/dhis2/capture-app/compare/v100.57.1...v100.57.2) (2024-02-26)
+
+
+### Bug Fixes
+
+* [DHIS2-15621] row view broken up in section ([#3457](https://github.com/dhis2/capture-app/issues/3457)) ([ce7282c](https://github.com/dhis2/capture-app/commit/ce7282ca440c1bddae3f02b938d505a9412d9ea6))
+
+## [100.57.1](https://github.com/dhis2/capture-app/compare/v100.57.0...v100.57.1) (2024-02-23)
+
+
+### Bug Fixes
+
+* [DHIS2-16205] Sticky Locked Selector ([#3516](https://github.com/dhis2/capture-app/issues/3516)) ([61158b1](https://github.com/dhis2/capture-app/commit/61158b1097843309ac51187fe41e1af842220f71))
+
+# [100.57.0](https://github.com/dhis2/capture-app/compare/v100.56.0...v100.57.0) (2024-02-19)
+
+
+### Features
+
+* [DHIS2-16527] assign user on first stage registration ([#3530](https://github.com/dhis2/capture-app/issues/3530)) ([54eef90](https://github.com/dhis2/capture-app/commit/54eef906e5c86ab6d65813c337242ff738882c5b))
+
+# [100.56.0](https://github.com/dhis2/capture-app/compare/v100.55.0...v100.56.0) (2024-02-16)
+
+
+### Features
+
+* [DHIS2-12007] Text String Improvements ([#3498](https://github.com/dhis2/capture-app/issues/3498)) ([836368a](https://github.com/dhis2/capture-app/commit/836368ae33d191abf209a2813a6a8cbd26107581))
+
 # [100.55.0](https://github.com/dhis2/capture-app/compare/v100.54.0...v100.55.0) (2024-02-05)
 
 

cypress/e2e/EnrollmentEditEventPage/EnrollmentEditEventPageForm/index.js

@@ -54,11 +54,12 @@ When(/^the user changes the gender to (.*)/, gender =>
 When(/^the user sets Plurality assessed to (.*)/, text =>
     cy
         .get('[data-test="widget-enrollment-event"]')
+        .get('[data-test="scope-selector"]')
         .get('[data-test="virtualized-select"]')
         .eq(4)
         .click()
         .contains(text)
-        .click(),
+        .click({ force: true }),
 );
 
 When('the user clicks switch tab to Schedule', () => {

cypress/e2e/EnrollmentPage/BreakingTheGlass.feature

@@ -1,7 +1,5 @@
 Feature: Breaking the glass page
 
-  # TODO - Flaky tests should be fixed by TECH-1662
-  @skip
   Scenario: User with search scope access tries to access an enrollment in a protected program
     Given the tei created by this test is cleared from the database
     And the data store is clean

cypress/e2e/EnrollmentPage/BreakingTheGlass/index.js

@@ -21,12 +21,12 @@ And('you create a new tei in Child programme from Ngelehun CHC', () => {
         .eq(1)
         .type('1999-09-01')
         .blur();
-    cy.get('[data-test="d2-form-component"]')
+    cy.get('[data-test="d2-section"]')
         .find('[data-test="capture-ui-input"]')
         .eq(0)
         .type('Breaking')
         .blur();
-    cy.get('[data-test="d2-form-component"]')
+    cy.get('[data-test="d2-section"]')
         .find('[data-test="capture-ui-input"]')
         .eq(1)
         .type('TheGlass')
@@ -68,7 +68,7 @@ And('you enroll the tei from Njandama MCHP', () => {
         .contains('Enroll Breaking TheGlass in this program')
         .click();
 
-    cy.get('[data-test="d2-form-component"]')
+    cy.get('[data-test="d2-section"]')
         .find('[data-test="capture-ui-input"]')
         .eq(8)
         .type('1999-09-01')

cypress/e2e/EnrollmentPage/EnrollmentPageNavigation.feature

@@ -33,6 +33,10 @@ Feature: User interacts with Enrollment page
     Given you enter enrollment page by typing: #/enrollment?programId=IpHINAT79UW&orgUnitId=DiszpKrYNg8&teiId=pybd813kIWx&enrollmentId=AUTO
     Then you should be redirect to #/enrollment?enrollmentId=FS085BEkJo2&orgUnitId=DiszpKrYNg8&programId=IpHINAT79UW&teiId=pybd813kIWx
 
+  Scenario: Auto select orgunit when opening enrollment dashboard
+    Given you enter enrollment page by typing: #/enrollment?enrollmentId=avqvQMtX8DG&orgUnitId=DiszpKrYNg8&programId=IpHINAT79UW&teiId=btoHJM9byeF
+    Then you should be redirect to #/enrollment?enrollmentId=avqvQMtX8DG&orgUnitId=NnGUNkc5Zq8&programId=IpHINAT79UW&teiId=btoHJM9byeF
+
   Scenario: Reset tei
     Given you land on the enrollment page by having typed only the enrollmentId in the url
     When you reset the tei selection

cypress/e2e/SearchForDuplicatesThroughAddRelationship/index.js

@@ -2,7 +2,7 @@ import { When, defineStep as And } from '@badeball/cypress-cucumber-preprocessor
 import '../sharedSteps';
 
 And('you fill in the first name with values that have duplicates', () => {
-    cy.get('[data-test="d2-form-component"]')
+    cy.get('[data-test="d2-section"]')
         .find('[data-test="capture-ui-input"]')
         .eq(1)
         .wait(500)
@@ -11,26 +11,26 @@ And('you fill in the first name with values that have duplicates', () => {
 });
 
 And('you fill in the first name with values that have less than 5 duplicates', () => {
-    cy.get('[data-test="d2-form-component"]')
+    cy.get('[data-test="d2-section"]')
         .find('[data-test="capture-ui-input"]')
         .eq(1)
         .type('Sarah')
         .blur();
-    cy.get('[data-test="d2-form-component"]')
+    cy.get('[data-test="d2-section"]')
         .find('[data-test="capture-ui-input"]')
         .eq(2)
         .type('Fis')
         .blur();
 });
 
 And('you fill in the first name with values that have exactly 5 duplicates', () => {
-    cy.get('[data-test="d2-form-component"]')
+    cy.get('[data-test="d2-section"]')
         .find('[data-test="capture-ui-input"]')
         .eq(1)
         .wait(500)
         .type('Tesmi')
         .blur();
-    cy.get('[data-test="d2-form-component"]')
+    cy.get('[data-test="d2-section"]')
         .find('[data-test="capture-ui-input"]')
         .eq(2)
         .type('Abel')

cypress/e2e/sharedSteps.js

@@ -121,7 +121,7 @@ Then('all pagination is disabled', () => {
 
 And('you click search', () => {
     // click outside of the input for the values to be updated
-    cy.get('[data-test="d2-form-component"]')
+    cy.get('[data-test="d2-section"]')
         .click();
 
     cy.get('button')

i18n/ar.po

@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2023-09-12T06:24:49.265Z\n"
+"POT-Creation-Date: 2024-02-14T10:01:26.732Z\n"
 "PO-Revision-Date: 2019-06-27 07:31+0000\n"
 "Last-Translator: Viktor Varland <viktor@dhis2.org>, 2023\n"
 "Language-Team: Arabic (https://app.transifex.com/hisp-uio/teams/100509/ar/)\n"
@@ -81,10 +81,6 @@ msgstr "حدث خطأ أثناء التحقق من صحة الحقل"
 msgid "error"
 msgstr "خطأ"
 
-msgid ""
-"Plugins are not yet available - Please contact your system administrator"
-msgstr ""
-
 msgid "This value is validating"
 msgstr "يتم التحقق من القيمة"
 
@@ -166,6 +162,9 @@ msgstr "إكمال الحدث"
 msgid "{{ stageName }} - Basic info"
 msgstr ""
 
+msgid "{{ stageName }} - Assignee"
+msgstr ""
+
 msgid "{{ stageName }} - Status"
 msgstr ""
 
@@ -653,26 +652,19 @@ msgstr ""
 msgid "Opt out for {{programName}}"
 msgstr ""
 
+msgid "Enrollment with id \"{{enrollmentId}}\" does not exist"
+msgstr ""
+
 msgid "Tracked entity instance with id \"{{teiId}}\" does not exist"
 msgstr ""
 
-msgid ""
-"There is an error while opening this enrollment. Please enter a valid url."
+msgid "Program with id \"{{programId}}\" does not exist"
 msgstr ""
 
 msgid ""
 "An error occurred while fetching enrollments. Please enter a valid url."
 msgstr ""
 
-msgid "Enrollment Dashboard"
-msgstr ""
-
-msgid "No indicator output for this enrollment yet"
-msgstr ""
-
-msgid "No feedback for this enrollment yet"
-msgstr ""
-
 msgid "Quick actions"
 msgstr ""
 
@@ -750,21 +742,12 @@ msgstr ""
 msgid "There was an error opening the Page"
 msgstr ""
 
-msgid "Enrollment{{escape}} New Event"
-msgstr ""
-
 msgid "There was an error loading the page"
 msgstr ""
 
 msgid "Choose a registering unit to start reporting"
 msgstr "اختر وحدة تسجيل لبدء الإبلاغ"
 
-msgid "There are no feedbacks for this event"
-msgstr ""
-
-msgid "There are no indicators for this event"
-msgstr ""
-
 msgid "Program stage is invalid"
 msgstr ""
 
@@ -792,18 +775,6 @@ msgstr ""
 msgid "Stage"
 msgstr "المرحلة"
 
-msgid "Enrollment{{escape}} View Event"
-msgstr ""
-
-msgid "Enrollment{{escape}} Edit Event"
-msgstr ""
-
-msgid "The enrollment event data could not be found"
-msgstr ""
-
-msgid "There are no feedback for this event"
-msgstr ""
-
 msgid "Registered events"
 msgstr "الأحداث المسجلة"
 
@@ -915,18 +886,6 @@ msgid ""
 "relationship"
 msgstr "ستؤدي مغادرة هذه الصفحة إلى تجاهل التحديدات التي أجريتها لعلاقة جديدة"
 
-msgid "No one is assigned to this event"
-msgstr "لم يتم تعيين أي شخص لهذا الحدث"
-
-msgid "Assign"
-msgstr "إسناد"
-
-msgid "Event assigned to {{name}}"
-msgstr "تم تعيين الحدث إلى {{name}}"
-
-msgid "Feedbacks"
-msgstr "تغذيات راجعة"
-
 msgid "Show all events"
 msgstr "عرض جميع الأحداث"
 
@@ -939,6 +898,21 @@ msgstr "تعذر تحميل الحدث"
 msgid "Organisation unit could not be loaded"
 msgstr "تعذر تحميل الوحدة التنظيمية"
 
+msgid "Dashboard"
+msgstr ""
+
+msgid "Edit Event"
+msgstr ""
+
+msgid "View Event"
+msgstr ""
+
+msgid "No feedback for this enrollment yet"
+msgstr ""
+
+msgid "No indicator output for this enrollment yet"
+msgstr ""
+
 msgid "Selected program"
 msgstr "البرنامج المحدد"
 
@@ -951,6 +925,9 @@ msgstr "البحث حسب السمة"
 msgid "Could not retrieve metadata. Please try again later."
 msgstr ""
 
+msgid "The enrollment event data could not be found"
+msgstr ""
+
 msgid "Possible duplicates found"
 msgstr "إحتمال وجود تكرار"
 
@@ -1085,11 +1062,23 @@ msgstr ""
 msgid "Search for a {{trackedEntityName}} in {{programName}}"
 msgstr ""
 
-msgid "To work with the selected program,"
-msgstr "للعمل مع البرنامج المحدد"
+msgid "Assigned to"
+msgstr "مسندة إلى"
+
+msgid "You don't have access to edit this assignee"
+msgstr ""
+
+msgid "Edit"
+msgstr "تعديل"
+
+msgid "No one is assigned to this event"
+msgstr "لم يتم تعيين أي شخص لهذا الحدث"
 
-msgid "open the Tracker Capture app"
-msgstr "فتح برنامج التتبع والإلتقاط"
+msgid "You don't have access to assign an assignee"
+msgstr ""
+
+msgid "Assign"
+msgstr "إسناد"
 
 msgid "This program is protected"
 msgstr "هذا البرنامج محمي"
@@ -1160,9 +1149,6 @@ msgstr "خط العرض"
 msgid "Longitude"
 msgstr "خط الطول"
 
-msgid "Edit"
-msgstr "تعديل"
-
 msgid "Set coordinates"
 msgstr ""
 
@@ -1369,7 +1355,7 @@ msgstr ""
 msgid "Stages and Events"
 msgstr ""
 
-msgid "New TEI Relationship"
+msgid "New {{trackedEntityTypeName}} relationship"
 msgstr ""
 
 msgid "Missing implementation step"
@@ -1424,9 +1410,6 @@ msgstr "تنزيل البيانات"
 msgid "an error occurred loading working lists"
 msgstr "حدث خطأ اثناء تحميل قوائم العمل"
 
-msgid "Assigned to"
-msgstr "مسندة إلى"
-
 msgid "Registration Date"
 msgstr "تاريخ التسجيل"
 
@@ -1556,6 +1539,9 @@ msgstr ""
 msgid "Error editing the event, the changes made were not saved"
 msgstr ""
 
+msgid "Error updating the Assignee"
+msgstr ""
+
 msgid "Set coordinate"
 msgstr "ضبط الإحداثية"