Merge remote-tracking branch 'origin/master' into eh/TECH/TECH-1539_R…

…eplaceIconButton

CHANGELOG.md

@@ -1,3 +1,31 @@
+# [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)
 
 

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();
 });

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

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');
+    });
+});

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

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);
 });
+

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: 2023-09-04T07:07:59.195Z\n"
-"PO-Revision-Date: 2023-09-04T07:07:59.195Z\n"
+"POT-Creation-Date: 2023-09-29T14:14:34.330Z\n"
+"PO-Revision-Date: 2023-09-29T14:14:34.330Z\n"
 
 msgid "Choose one or more dates..."
 msgstr "Choose one or more dates..."
@@ -149,6 +149,15 @@ msgstr "Coordinate"
 msgid "Enrollment"
 msgstr "Enrollment"
 
+msgid "Complete event"
+msgstr "Complete event"
+
+msgid "{{ stageName }} - Basic info"
+msgstr "{{ stageName }} - Basic info"
+
+msgid "{{ stageName }} - Status"
+msgstr "{{ stageName }} - Status"
+
 msgid "Please select {{categoryName}}"
 msgstr "Please select {{categoryName}}"
 
@@ -167,15 +176,18 @@ msgstr "Cancel"
 msgid "Metadata error. see log for details"
 msgstr "Metadata error. see log for details"
 
+msgid "{{ stageName }} - Details"
+msgstr "{{ stageName }} - Details"
+
+msgid "{{ stageName }} - {{ sectionName }}"
+msgstr "{{ stageName }} - {{ sectionName }}"
+
 msgid "Assigned user"
 msgstr "Assigned user"
 
 msgid "Search for user"
 msgstr "Search for user"
 
-msgid "Complete event"
-msgstr "Complete event"
-
 msgid "Basic info"
 msgstr "Basic info"
 

i18n/zh.po

@@ -320,7 +320,7 @@ msgid ""
 msgstr "一个具有 {{attributeName}} 的 {{trackedEntityTypeName}} 实体已经登记"
 
 msgid "Show registered {{trackedEntityTypeName}}"
-msgstr "显示登记的 {{attributeName}} "
+msgstr "显示已注册的{{trackedEntityTypeName}}"
 
 msgid "Registered person"
 msgstr "登记的人"
@@ -758,7 +758,7 @@ msgid "Refer"
 msgstr "转诊"
 
 msgid "You can't add any more {{ programStageName }} events"
-msgstr ""
+msgstr "您无法添加更多的 {{ programStageName }} 事件"
 
 msgid "Cancel without saving"
 msgstr "取消而不保存"
@@ -1069,7 +1069,7 @@ msgid "To work with the selected program,"
 msgstr "基于选择的项目工作"
 
 msgid "open the Tracker Capture app"
-msgstr "打开跟踪随访采集APP"
+msgstr "打开跟踪记录APP"
 
 msgid "This program is protected"
 msgstr "该项目受保护"
@@ -1132,7 +1132,7 @@ msgid "Mark for follow-up"
 msgstr "后续标记"
 
 msgid "Existing dates for auto-generated events will not be updated."
-msgstr ""
+msgstr "自动生成的事件的现有日期将不会更新。"
 
 msgid "Enrollment date"
 msgstr "报名日期"
@@ -1257,7 +1257,7 @@ msgid "Save changes"
 msgstr "保存修改"
 
 msgid "Profile"
-msgstr "简历"
+msgstr "基本信息"
 
 msgid "There is a problem with this form"
 msgstr "这个表单有问题"
@@ -1278,7 +1278,7 @@ msgid "Profile widget could not be loaded. Please try again later"
 msgstr "无法加载个人资料窗口小部件。请稍后再试"
 
 msgid "{{TETName}} profile"
-msgstr "{{TETName}} 基本资料"
+msgstr "{{TETName}} 基本信息"
 
 msgid "Edit"
 msgstr "编辑"
@@ -1314,7 +1314,7 @@ msgid "{{ overdueEvents }} overdue"
 msgstr "{{ overdueEvents }} 逾期"
 
 msgid "{{ scheduledEvents }} scheduled"
-msgstr "{{scheduledEvents}} 已调度"
+msgstr "{{ ScheduledEvents }} 已安排"
 
 msgid "Stages and Events"
 msgstr "阶段与活动"
@@ -1416,7 +1416,7 @@ msgid "Scheduled"
 msgstr "已经调度"
 
 msgid "Overdue{{ escape }} due {{ time }}"
-msgstr "逾期{{逃脱}}到期{{时间}}"
+msgstr "逾期{{ escape }}到期{{ time }}"
 
 msgid "Overdue"
 msgstr "逾期"

package.json

@@ -1,16 +1,16 @@
 {
     "name": "capture-app",
     "homepage": ".",
-    "version": "100.39.3",
-    "cacheVersion": "5",
+    "version": "100.41.0",
+    "cacheVersion": "6",
     "serverVersion": "38",
     "license": "BSD-3-Clause",
     "private": true,
     "workspaces": [
         "packages/rules-engine"
     ],
     "dependencies": {
-        "@dhis2/rules-engine-javascript": "100.39.3",
+        "@dhis2/rules-engine-javascript": "100.41.0",
         "@dhis2/app-runtime": "^3.9.3",
         "@dhis2/d2-i18n": "^1.1.0",
         "@dhis2/d2-icons": "^1.0.1",

packages/rules-engine/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/rules-engine-javascript",
-    "version": "100.39.3",
+    "version": "100.41.0",
     "license": "BSD-3-Clause",
     "main": "./build/cjs/index.js",
     "scripts": {

src/core_modules/capture-core/components/D2Form/D2Form.component.js

@@ -116,11 +116,21 @@ class D2Form extends React.PureComponent<PropsForPureComponent> {
             id,
             classes,
             isFormInReduxStore,
+            getCustomContent,
             ...passOnProps
         } = this.props;
         const metaDataSectionsAsArray = Array.from(formFoundation.sections.entries()).map(entry => entry[1]);
 
-        const sections = metaDataSectionsAsArray.map(section => (passOnProps.formHorizontal ? this.renderHorizontal(section, passOnProps) : this.renderVertical(section, passOnProps)));
+        const sections = metaDataSectionsAsArray.map(section => (
+            passOnProps.formHorizontal
+                ? this.renderHorizontal(section, passOnProps)
+                : (
+                    <>
+                        {getCustomContent && getCustomContent(section.id) }
+                        {this.renderVertical(section, passOnProps)}
+                    </>
+                )
+        ));
 
         return (
             <>

src/core_modules/capture-core/components/D2Form/D2Form.types.js

@@ -1,5 +1,5 @@
 // @flow
-
+import * as React from 'react';
 import type { RenderFoundation } from '../../metaData';
 
 export type FormRef = $ReadOnly<{|
@@ -10,6 +10,7 @@ export type OwnProps = $ReadOnly<{|
   formFoundation: RenderFoundation,
   id: string,
   formHorizontal?: boolean,
+  getCustomContent?: (beforeSectionId: string) => React.Node,
   ...FormRef
 |}>