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

…_CreateNewTrackedEntity # Conflicts: # i18n/en.pot # package.json # src/core_modules/capture-core/components/DataEntries/EnrollmentRegistrationEntry/EnrollmentRegistrationEntry.container.js
dhis2 · Oct 3, 2023 · a93bef9 · a93bef9
2 parents f880324 + 302eb2a
commit a93bef9
Show file tree

Hide file tree

Showing 104 changed files with 3,887 additions and 1,214 deletions.
diff --git a/.tx/config b/.tx/config
@@ -1,6 +1,6 @@
 [main]
 host     = https://www.transifex.com
-lang_map = fa_AF: prs, uz@Cyrl: uz, uz@Latn: uz_Latn
+lang_map = fa_AF: prs, uz@Cyrl: uz_UZ_Cyrl, uz@Latn: uz_UZ_Latn
 
 [o:hisp-uio:p:app-capture-app:r:en-pot]
 file_filter  = i18n/<lang>.po

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,52 @@
+# [100.41.0](https://github.com/dhis2/capture-app/compare/v100.40.1...v100.41.0) (2023-10-03)
+
+
+### Features
+
+* [DHIS2-9661][DHIS2-14830] first stage on registration page  ([#3267](https://github.com/dhis2/capture-app/issues/3267)) ([6e5f6fe](https://github.com/dhis2/capture-app/commit/6e5f6fea7b6ab043800e806c7459210f10ef608a))
+
+## [100.40.1](https://github.com/dhis2/capture-app/compare/v100.40.0...v100.40.1) (2023-09-30)
+
+
+### Bug Fixes
+
+* **translations:** sync translations from transifex (master) ([b58bc66](https://github.com/dhis2/capture-app/commit/b58bc66db4136ad558c02f38ac54a2319b3af3f1))
+
+# [100.40.0](https://github.com/dhis2/capture-app/compare/v100.39.4...v100.40.0) (2023-09-20)
+
+
+### Features
+
+* [DHIS2-15830] Add orgUnitId to plugin context ([b9ec237](https://github.com/dhis2/capture-app/commit/b9ec237af595a1112dc6db01206e8332c9bb6647))
+
+## [100.39.4](https://github.com/dhis2/capture-app/compare/v100.39.3...v100.39.4) (2023-09-19)
+
+
+### Bug Fixes
+
+* **translations:** sync translations from transifex (master) ([712b56e](https://github.com/dhis2/capture-app/commit/712b56e749d08432ac18d854cf06cc45dabeda55))
+
+## [100.39.3](https://github.com/dhis2/capture-app/compare/v100.39.2...v100.39.3) (2023-09-14)
+
+
+### Bug Fixes
+
+* [DHIS2-15356] change tei search parameter from `ou` to `orgUnit` ([#3362](https://github.com/dhis2/capture-app/issues/3362)) ([c7ab828](https://github.com/dhis2/capture-app/commit/c7ab82826254be24959ff25d643b68c1e525c893))
+
+## [100.39.2](https://github.com/dhis2/capture-app/compare/v100.39.1...v100.39.2) (2023-09-14)
+
+
+### Bug Fixes
+
+* **translations:** sync translations from transifex (master) ([c17c663](https://github.com/dhis2/capture-app/commit/c17c6637f0e6ce93bdd5f5ef3d534d3ac9206c86))
+
+## [100.39.1](https://github.com/dhis2/capture-app/compare/v100.39.0...v100.39.1) (2023-09-13)
+
+
+### Bug Fixes
+
+* **translations:** sync translations from transifex (master) ([0fab0eb](https://github.com/dhis2/capture-app/commit/0fab0eba7b63cbfd080990913313fc6b6ff2d38f))
+
 # [100.39.0](https://github.com/dhis2/capture-app/compare/v100.38.0...v100.39.0) (2023-09-07)
 
 

diff --git a/cypress/integration/EnrollmentPage/BreakingTheGlass/index.js b/cypress/integration/EnrollmentPage/BreakingTheGlass/index.js
@@ -31,6 +31,10 @@ And('you create a new tei in Child programme from Ngelehun CHC', () => {
         .eq(1)
         .type('TheGlass')
         .blur();
+    cy.get('[data-test="capture-ui-input"]')
+        .eq(7)
+        .type('2023-09-01')
+        .blur();
 
     clickSave();
 });

diff --git a/cypress/integration/NewPage.feature b/cypress/integration/NewPage.feature
@@ -178,6 +178,7 @@ Feature: User creates a new entries from the registration page
   Scenario: New person in Tracker Program > Submitting the form shows a list with duplicates
     Given you are in Child programme registration page
     When you fill the Child programme registration form with a first name with value that has duplicates
+    And you fill in the birth report date
     And you click the save person submit button
     And you see the possible duplicates modal
     When you click the next page button
@@ -197,7 +198,7 @@ Feature: User creates a new entries from the registration page
     When you are in the Malaria case diagnosis, treatment and investigation program registration page
     And you fill the Malaria case diagnosis registration form with values
     And you click the save malaria entity submit button
-    Then you see the enrollment event New page
+    Then you see the enrollment event Edit page
     When you open the main page with Ngelehun and Malaria case diagnosis, treatment and investigation context
     And you opt out to use the new enrollment Dashboard for Malaria case diagnosis, treatment and investigation
     Then you see the opt in component for Malaria case diagnosis, treatment and investigation
@@ -208,3 +209,7 @@ Feature: User creates a new entries from the registration page
     Given you are in Child programme reenrollment page
     Then you see the form prefield with existing TEI attributes values
     And the scope selector has the TEI context
+
+  Scenario: First stage appears on registration page
+    Given you are in Child programme registration page
+    Then the first stage appears on registration page
diff --git a/cypress/integration/NewPage/index.js b/cypress/integration/NewPage/index.js
@@ -502,6 +502,13 @@ And('you fill the Child programme registration form with a first name with value
         .blur();
 });
 
+And('you fill in the birth report date', () => {
+    cy.get('[data-test="capture-ui-input"]')
+        .eq(7)
+        .type('2023-01-01')
+        .blur();
+});
+
 And('you are in the WNCH PNC program registration page', () => {
     cy.visit('/#/new?programId=uy2gU8kT1jF&orgUnitId=DiszpKrYNg8');
 });
@@ -561,12 +568,10 @@ And('you fill the Malaria case diagnosis registration form with values', () => {
         .blur();
 });
 
-Then('you see the enrollment event New page', () => {
-    cy.url().should('include', '/#/enrollmentEventNew?');
-    cy.url().should('include', 'stageId=hYyB7FUS5eR');
+Then('you see the enrollment event Edit page', () => {
+    cy.url().should('include', '/#/enrollmentEventEdit?');
 });
 
-
 And('you fill in multiple Allergies options', () => {
     cy.get('[data-test="registration-page-content"]').within(() => {
         cy.contains('Allergies').should('exist');
@@ -585,3 +590,13 @@ Then('you can see the multiple selections in the form', () => {
         cy.contains('Other').should('exist');
     });
 });
+
+Then('the first stage appears on registration page', () => {
+    cy.get('[data-test="registration-page-content"]').within(() => {
+        cy.contains('Birth - Basic info').should('exist');
+        cy.contains('Birth - Details').should('exist');
+        cy.contains('Birth - Status').should('exist');
+        cy.contains('Report date').should('exist');
+        cy.contains('Apgar Score').should('exist');
+    });
+});
diff --git a/cypress/integration/WorkingLists/TeiWorkingLists/TeiWorkingListsUser.feature b/cypress/integration/WorkingLists/TeiWorkingLists/TeiWorkingListsUser.feature
@@ -159,9 +159,9 @@ And you apply the current filter
 When you click the last name column header
 Then the sort arrow should indicate ascending order
 And the list should display data ordered ascendingly by last name
-When you click the WHOMCH Smoking column header
+When you click the WHOMCH Hemoglobin value column header
 Then the sort arrow should indicate descending order
-And the list should display data ordered ascendingly by WHOMCH Smoking
+And the list should display data ordered descending by WHOMCH Hemoglobin
 
 @v>=39
 Scenario: The user can remove the program stage filter
@@ -233,7 +233,7 @@ And the Custom Program stage list is deleted
 
 @v>=40
 Scenario: The user can save a program stage working list, based on a TEI working list configuration
-Given you open the main page with Ngelehun and Malaria focus investigation context
+Given you open a clean main page with Ngelehun and Malaria focus investigation context
 Then you see the custom TEI working lists
 And you can load the view with the name Ongoing foci responses
 And you open the program stage filters from the more filters dropdown menu

diff --git a/cypress/integration/WorkingLists/TeiWorkingLists/TeiWorkingListsUser/index.js b/cypress/integration/WorkingLists/TeiWorkingLists/TeiWorkingListsUser/index.js
@@ -2,6 +2,19 @@ import { v4 as uuid } from 'uuid';
 import '../../sharedSteps';
 import '../../../sharedSteps';
 
+const cleanUpIfApplicable = (programId) => {
+    cy.buildApiUrl(`programStageWorkingLists?filter=program.id:eq:${programId}&fields=id,displayName`)
+        .then(url => cy.request(url))
+        .then(({ body }) => {
+            const workingList = body.programStageWorkingLists?.find(e => e.displayName === 'Custom Program stage list');
+            if (!workingList) {
+                return null;
+            }
+            return cy
+                .buildApiUrl('programStageWorkingLists', workingList.id)
+                .then(workingListUrl => cy.request('DELETE', workingListUrl));
+        });
+};
 Given('you open the main page with Ngelehun and child programme context', () => {
     cy.visit('#/?programId=IpHINAT79UW&orgUnitId=DiszpKrYNg8');
 });
@@ -42,6 +55,7 @@ Given('you open the main page with Ngelehun and Malaria case diagnosis context',
 });
 
 Given('you open the main page with Ngelehun and Malaria case diagnosis and Household investigation context', () => {
+    cleanUpIfApplicable('qDkgAbB5Jlk');
     cy.visit('#/?programId=qDkgAbB5Jlk&orgUnitId=DiszpKrYNg8');
 
     cy.get('[data-test="tei-working-lists"]')
@@ -60,6 +74,11 @@ Given('you open the main page with Ngelehun and Malaria case diagnosis and House
         .click();
 });
 
+Given('you open a clean main page with Ngelehun and Malaria focus investigation context', () => {
+    cleanUpIfApplicable('M3xtLkYBlKI');
+    cy.visit('#/?programId=M3xtLkYBlKI&orgUnitId=DiszpKrYNg8');
+});
+
 Then('the default working list should be displayed', () => {
     const names = [
         'Filona',
@@ -343,9 +362,9 @@ When('you click the last name column header', () => {
         .click();
 });
 
-When('you click the WHOMCH Smoking column header', () => {
+When('you click the WHOMCH Hemoglobin value column header', () => {
     cy.get('[data-test="dhis2-uicore-tableheadercellaction"]')
-        .eq(6)
+        .last()
         .click()
         .click();
 });
@@ -400,10 +419,10 @@ Then('the list should display data ordered ascendingly by last name', () => {
         });
 });
 
-Then('the list should display data ordered ascendingly by WHOMCH Smoking', () => {
+Then('the list should display data ordered descending by WHOMCH Hemoglobin', () => {
     const names = [
-        'Siren',
         'Hertz',
+        'Siren',
     ];
 
     cy.get('[data-test="tei-working-lists"]')
@@ -740,3 +759,4 @@ Then('the program stage custom working list filters are loaded', () => {
         .find('[data-test="more-filters"]')
         .should('have.length', 2);
 });
+
diff --git a/i18n/ar.po b/i18n/ar.po
@@ -1,14 +1,14 @@
 # 
 # Translators:
 # KRG HIS <[email protected]>, 2020
-# phil_dhis2, 2022
+# Philip Larsen Donnelly, 2022
 # Viktor Varland <[email protected]>, 2023
 # Hamza Assada <[email protected]>, 2023
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2023-06-27T06:20:33.460Z\n"
+"POT-Creation-Date: 2023-09-04T07:07:59.195Z\n"
 "PO-Revision-Date: 2019-06-27 07:31+0000\n"
 "Last-Translator: Hamza Assada <[email protected]>, 2023\n"
 "Language-Team: Arabic (https://app.transifex.com/hisp-uio/teams/100509/ar/)\n"
@@ -75,6 +75,16 @@ msgstr "تاريخ التسجيل"
 msgid "Last updated"
 msgstr "آخر تحديث"
 
+msgid "error encountered during field validation"
+msgstr "حدث خطأ أثناء التحقق من صحة الحقل"
+
+msgid "error"
+msgstr "خطأ"
+
+msgid ""
+"Plugins are not yet available - Please contact your system administrator"
+msgstr ""
+
 msgid "This value is validating"
 msgstr "يتم التحقق من القيمة"
 
@@ -368,9 +378,6 @@ msgstr "لا تزال بعض العمليات قيد التشغيل. يرجى ا
 msgid "Operations running"
 msgstr "العمليات الجارية"
 
-msgid "Sort"
-msgstr "فرز"
-
 msgid ""
 "This event has unsaved changes. Leaving this page without saving will lose "
 "these changes. Are you sure you want to discard unsaved changes?"
@@ -755,7 +762,7 @@ msgstr "المجدولة زمنياً"
 msgid "Refer"
 msgstr ""
 
-msgid "You can’t add any more {{ programStageName }} events"
+msgid "You can't add any more {{ programStageName }} events"
 msgstr ""
 
 msgid "Cancel without saving"
@@ -819,6 +826,9 @@ msgstr ""
 msgid "New Enrollment in program{{escape}} {{programName}}"
 msgstr ""
 
+msgid "Save {{trackedEntityTypeName}}"
+msgstr ""
+
 msgid "Save {{trackedEntityName}}"
 msgstr ""
 
@@ -972,15 +982,6 @@ msgstr "يمكنك أيضًا اختيار برنامج من الشريط الع
 msgid "Choose a type to start searching"
 msgstr "اختر نوعًا لبدء البحث"
 
-msgid "Fill in at least {{count}} attribute to search"
-msgid_plural "Fill in at least {{count}} attribute to search"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
-
 msgid "Search {{name}}"
 msgstr "البحث عن {{name}}"
 
@@ -1135,6 +1136,9 @@ msgstr ""
 msgid "Mark for follow-up"
 msgstr "اشر من أجل الملحق"
 
+msgid "Existing dates for auto-generated events will not be updated."
+msgstr ""
+
 msgid "Enrollment date"
 msgstr "تاريخ التسجيل"
 
@@ -1223,32 +1227,12 @@ msgid ""
 "The scheduled date matches the suggested date, but can be changed if needed."
 msgstr ""
 
-msgid "The scheduled date is {{count}} days {{position}} the suggested date."
-msgid_plural ""
-"The scheduled date is {{count}} days {{position}} the suggested date."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
-
 msgid "after"
 msgstr "بعد"
 
 msgid "before"
 msgstr "قبل"
 
-msgid "There are {{count}} scheduled event in {{orgUnitName}} on this day."
-msgid_plural ""
-"There are {{count}} scheduled event in {{orgUnitName}} on this day."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
-
 msgid ""
 "Scheduling an event in {{stageName}} for {{programName}} in {{orgUnitName}}"
 msgstr ""
@@ -1496,9 +1480,6 @@ msgstr ""
 msgid "Set coordinate"
 msgstr "ضبط الإحداثية"
 
-msgid "Page {{currentPage}}"
-msgstr "صفحة {{currentPage}}"
-
 msgid "Date"
 msgstr "التاريخ"
 
@@ -1517,11 +1498,8 @@ msgstr "حتى تاريخ"
 msgid "To time"
 msgstr "إلى وقت"
 
-msgid "error encountered during field validation"
-msgstr "حدث خطأ أثناء التحقق من صحة الحقل"
-
-msgid "error"
-msgstr "خطأ"
+msgid "Page {{currentPage}}"
+msgstr "صفحة {{currentPage}}"
 
 msgid "Delete polygon"
 msgstr "حذف المضلع"