feat: [DHIS2-9661][DHIS2-14830] first stage registration

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('McQuack')
         .blur();
+    cy.get('[data-test="capture-ui-input"]')
+        .eq(7)
+        .type('2023-09-01')
+        .blur();
 
     clickSave();
 });

cypress/integration/NewPage.feature

@@ -169,6 +169,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
@@ -199,3 +200,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');
 });
@@ -565,3 +572,12 @@ Then('you see the enrollment event New page', () => {
     cy.url().should('include', '/#/enrollmentEventNew?');
     cy.url().should('include', 'stageId=hYyB7FUS5eR');
 });
+
+
+Then('the first stage appears on registration page', () => {
+    cy.get('[data-test="registration-page-content"]').within(() => {
+        cy.contains('Data Entry (Birth)').should('exist');
+        cy.contains('Report date').should('exist');
+        cy.contains('Apgar Score').should('exist');
+    });
+});

i18n/en.pot

@@ -377,6 +377,12 @@ msgstr "Some operations are still runnning. Please wait.."
 msgid "Operations running"
 msgstr "Operations running"
 
+msgid "Data Entry ({{ stageName }})"
+msgstr "Data Entry ({{ stageName }})"
+
+msgid "Data Entry ({{ stageName }} - {{ sectionName }})"
+msgstr "Data Entry ({{ stageName }} - {{ sectionName }})"
+
 msgid "Sort"
 msgstr "Sort"
 

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

@@ -31,6 +31,7 @@ type Props = {
     formBuilderId: string,
     formId: string,
     onFieldsValidated: ?(any, formBuilderId: string) => void,
+    onGetCustomSectionName: ?(name?: string) => string,
 };
 
 class D2SectionPlain extends React.PureComponent<Props> {
@@ -49,6 +50,14 @@ class D2SectionPlain extends React.PureComponent<Props> {
     renderSectionHeader() {
         const title = this.props.sectionMetaData.name;
 
+        if (this.props.onGetCustomSectionName) {
+            return (
+                <SectionHeaderSimple
+                    title={this.props.onGetCustomSectionName(title)}
+                />
+            );
+        }
+
         if (!title) {
             return null;
         }

src/core_modules/capture-core/components/DataEntries/Enrollment/EnrollmentDataEntry.component.js

@@ -5,7 +5,6 @@ import i18n from '@dhis2/d2-i18n';
 import moment from 'moment';
 import { type OrgUnit } from '@dhis2/rules-engine-javascript';
 import {
-    DataEntry,
     placements,
     withDataEntryField,
     withDataEntryFieldIfApplicable,
@@ -33,7 +32,8 @@ import {
     getIncidentDateValidatorContainer,
 } from './fieldValidators';
 import { sectionKeysForEnrollmentDataEntry } from './constants/sectionKeys.const';
-import { type Enrollment, getProgramThrowIfNotFound } from '../../../metaData';
+import { type Enrollment, ProgramStage, getProgramThrowIfNotFound } from '../../../metaData';
+import { FirstStageRegistrationContainer } from '../../DataEntryDhis2Helpers/FirstStageRegistration/FirstStageRegistration.container';
 import {
     getCategoryOptionsValidatorContainers,
     attributeOptionsKey,
@@ -333,7 +333,10 @@ type FinalTeiDataEntryProps = {
     orgUnitId: string,
     onUpdateDataEntryField: Function,
     onUpdateFormFieldAsync: Function,
-    onUpdateFormField: Function
+    onUpdateFormField: Function,
+    firstStageMetaData?: {
+        stage: ProgramStage,
+    },
 };
 // final step before the generic dataEntry is inserted
 class FinalEnrollmentDataEntry extends React.Component<FinalTeiDataEntryProps> {
@@ -353,9 +356,10 @@ class FinalEnrollmentDataEntry extends React.Component<FinalTeiDataEntryProps> {
 
     render() {
         const { enrollmentMetadata, ...passOnProps } = this.props;
+
         return (
         // $FlowFixMe[cannot-spread-inexact] automated comment
-            <DataEntry
+            <FirstStageRegistrationContainer
                 {...passOnProps}
                 dataEntrySections={FinalEnrollmentDataEntry.dataEntrySectionDefinitions}
                 formFoundation={enrollmentMetadata.enrollmentForm}
@@ -382,6 +386,9 @@ type PreEnrollmentDataEntryProps = {
     onStartAsyncUpdateField: Function,
     onGetUnsavedAttributeValues?: ?Function,
     teiId?: ?string,
+    firstStageMetaData?: {
+        stage: ProgramStage,
+    }
 };
 
 class PreEnrollmentDataEntryPure extends React.PureComponent<Object> {
@@ -406,18 +413,18 @@ export class EnrollmentDataEntryComponent extends React.Component<PreEnrollmentD
     }
 
     handleUpdateField = (...args: Array<any>) => {
-        const { programId, orgUnit } = this.props;
-        this.props.onUpdateField(...args, programId, orgUnit);
+        const { programId, orgUnit, firstStageMetaData } = this.props;
+        this.props.onUpdateField(...args, programId, orgUnit, firstStageMetaData?.stage);
     }
 
     handleUpdateDataEntryField = (...args: Array<any>) => {
-        const { programId, orgUnit } = this.props;
-        this.props.onUpdateDataEntryField(...args, programId, orgUnit);
+        const { programId, orgUnit, firstStageMetaData } = this.props;
+        this.props.onUpdateDataEntryField(...args, programId, orgUnit, firstStageMetaData?.stage);
     }
 
     handleStartAsyncUpdateField = (...args: Array<any>) => {
-        const { programId, orgUnit } = this.props;
-        this.props.onStartAsyncUpdateField(...args, programId, orgUnit);
+        const { programId, orgUnit, firstStageMetaData } = this.props;
+        this.props.onStartAsyncUpdateField(...args, programId, orgUnit, firstStageMetaData?.stage);
     }
 
     render() {
@@ -429,6 +436,7 @@ export class EnrollmentDataEntryComponent extends React.Component<PreEnrollmentD
             onGetUnsavedAttributeValues,
             ...passOnProps
         } = this.props;
+
         return (
             // $FlowFixMe[cannot-spread-inexact] automated comment
             <PreEnrollmentDataEntryPure

src/core_modules/capture-core/components/DataEntries/Enrollment/EnrollmentDataEntry.container.js

@@ -1,6 +1,7 @@
 // @flow
 import type { OrgUnit } from '@dhis2/rules-engine-javascript';
 import { connect } from 'react-redux';
+import { ProgramStage } from '../../../metaData';
 import { updateFieldBatch, asyncUpdateSuccessBatch, updateDataEntryFieldBatch } from './actions/enrollment.actionBatchs';
 import { startAsyncUpdateFieldForNewEnrollment } from './actions/enrollment.actions';
 import { EnrollmentDataEntryComponent } from './EnrollmentDataEntry.component';
@@ -15,25 +16,28 @@ const mapDispatchToProps = (dispatch: ReduxDispatch) => ({
         data: any,
         programId: string,
         orgUnit: OrgUnit,
+        stage?: ProgramStage,
     ) => {
-        dispatch(updateDataEntryFieldBatch(innerAction, programId, orgUnit));
+        dispatch(updateDataEntryFieldBatch(innerAction, programId, orgUnit, stage));
     },
     onUpdateField: (
         innerAction: ReduxAction<any, any>,
         programId: string,
         orgUnit: OrgUnit,
+        stage?: ProgramStage,
     ) => {
-        dispatch(updateFieldBatch(innerAction, programId, orgUnit));
+        dispatch(updateFieldBatch(innerAction, programId, orgUnit, stage));
     },
     onStartAsyncUpdateField: (
         innerAction: ReduxAction<any, any>,
         dataEntryId: string,
         itemId: string,
         programId: string,
         orgUnit: OrgUnit,
+        stage?: ProgramStage,
     ) => {
         const onAsyncUpdateSuccess = (successInnerAction: ReduxAction<any, any>) =>
-            asyncUpdateSuccessBatch(successInnerAction, dataEntryId, itemId, programId, orgUnit);
+            asyncUpdateSuccessBatch(successInnerAction, dataEntryId, itemId, programId, orgUnit, stage);
         const onAsyncUpdateError = (errorInnerAction: ReduxAction<any, any>) => errorInnerAction;
 
         dispatch(startAsyncUpdateFieldForNewEnrollment(innerAction, onAsyncUpdateSuccess, onAsyncUpdateError));

src/core_modules/capture-core/components/DataEntries/Enrollment/actions/enrollment.actionBatchs.js

@@ -8,16 +8,38 @@ import type {
 } from '@dhis2/rules-engine-javascript';
 import { getApplicableRuleEffectsForTrackerProgram, updateRulesEffects } from '../../../../rules';
 import { rulesExecutedPostUpdateField } from '../../../DataEntry/actions/dataEntry.actions';
-import type { TrackerProgram, RenderFoundation } from '../../../../metaData';
+import { TrackerProgram, RenderFoundation, ProgramStage } from '../../../../metaData';
 import { startRunRulesPostUpdateField } from '../../../DataEntry';
 import { startRunRulesOnUpdateForNewEnrollment } from './enrollment.actions';
+import { convertValue } from '../../../../converters/formToClient';
 
 export const batchActionTypes = {
     RULES_EXECUTED_POST_UPDATE_FIELD_FOR_ENROLLMENT: 'RulesExecutedPostUpdateFieldForEnrollment',
     UPDATE_FIELD_NEW_ENROLLMENT_ACTION_BATCH: 'UpdateFieldNewEnrollmentActionBatch',
     UPDATE_DATA_ENTRY_FIELD_NEW_ENROLLMENT_ACTION_BATCH: 'UpdateDataEntryFieldNewEnrollmentActionBatch',
 };
 
+export const getCurrentEventValuesFromStage = (attributeValues?: TEIValues, stage?: ProgramStage) => {
+    const currentEventValues = {};
+    if (!stage) {
+        return { currentEventValues, attributeValues };
+    }
+
+    const dataElements = [...stage.stageForm.getElements().values()].map(({ id, type }) => ({ id, type }));
+
+    if (attributeValues) {
+        Object.keys(attributeValues).forEach((attributeId) => {
+            const found = dataElements.find(element => element.id === attributeId);
+            if (found) {
+                currentEventValues[attributeId] = convertValue(attributeValues[attributeId], found.type);
+                delete attributeValues[attributeId];
+            }
+        });
+    }
+
+    return { currentEventValues, attributeValues };
+};
+
 export const runRulesOnUpdateFieldBatch = (
     program: TrackerProgram,
     foundation: RenderFoundation,
@@ -26,17 +48,33 @@ export const runRulesOnUpdateFieldBatch = (
     itemId: string,
     orgUnit: OrgUnit,
     enrollmentData?: Enrollment,
-    attributeValues?: TEIValues,
+    teiAttributeValues?: TEIValues,
     extraActions: Array<ReduxAction<any, any>> = [],
     uid: string,
+    stage?: ProgramStage,
 ) => {
-    const effects = getApplicableRuleEffectsForTrackerProgram({
-        program,
-        orgUnit,
-        enrollmentData,
-        attributeValues,
-    });
+    let effects;
 
+    if (stage) {
+        const { attributeValues, currentEventValues } = getCurrentEventValuesFromStage(teiAttributeValues, stage);
+        const currentEvent = { ...currentEventValues, programStageId: stage.id };
+        effects = getApplicableRuleEffectsForTrackerProgram({
+            program,
+            stage,
+            orgUnit,
+            currentEvent,
+            enrollmentData,
+            attributeValues,
+        });
+    } else {
+        effects = getApplicableRuleEffectsForTrackerProgram({
+            program,
+            stage,
+            orgUnit,
+            enrollmentData,
+            attributeValues: teiAttributeValues,
+        });
+    }
     return batchActions([
         updateRulesEffects(effects, formId),
         rulesExecutedPostUpdateField(dataEntryId, itemId, uid),
@@ -48,29 +86,31 @@ export const updateDataEntryFieldBatch = (
     innerAction: ReduxAction<any, any>,
     programId: string,
     orgUnit: OrgUnit,
+    stage?: ProgramStage,
 ) => {
     const { dataEntryId, itemId } = innerAction.payload;
     const uid = uuid();
 
     return batchActions([
         innerAction,
-        startRunRulesPostUpdateField(dataEntryId, itemId, uid),
-        startRunRulesOnUpdateForNewEnrollment(innerAction.payload, uid, programId, orgUnit),
+        startRunRulesPostUpdateField(dataEntryId, itemId, uid, stage),
+        startRunRulesOnUpdateForNewEnrollment(innerAction.payload, uid, programId, orgUnit, stage),
     ], batchActionTypes.UPDATE_DATA_ENTRY_FIELD_NEW_ENROLLMENT_ACTION_BATCH);
 };
 
 export const updateFieldBatch = (
     innerAction: ReduxAction<any, any>,
     programId: string,
     orgUnit: OrgUnit,
+    stage?: ProgramStage,
 ) => {
     const { dataEntryId, itemId } = innerAction.payload;
     const uid = uuid();
 
     return batchActions([
         innerAction,
-        startRunRulesPostUpdateField(dataEntryId, itemId, uid),
-        startRunRulesOnUpdateForNewEnrollment(innerAction.payload, uid, programId, orgUnit),
+        startRunRulesPostUpdateField(dataEntryId, itemId, uid, stage),
+        startRunRulesOnUpdateForNewEnrollment(innerAction.payload, uid, programId, orgUnit, stage),
     ], batchActionTypes.UPDATE_FIELD_NEW_ENROLLMENT_ACTION_BATCH);
 };
 
@@ -80,12 +120,13 @@ export const asyncUpdateSuccessBatch = (
     itemId: string,
     programId: string,
     orgUnit: OrgUnit,
+    stage?: ProgramStage,
 ) => {
     const uid = uuid();
 
     return batchActions([
         innerAction,
-        startRunRulesPostUpdateField(dataEntryId, itemId, uid),
-        startRunRulesOnUpdateForNewEnrollment({ ...innerAction.payload, dataEntryId, itemId }, uid, programId, orgUnit),
+        startRunRulesPostUpdateField(dataEntryId, itemId, uid, stage),
+        startRunRulesOnUpdateForNewEnrollment({ ...innerAction.payload, dataEntryId, itemId }, uid, programId, orgUnit, stage),
     ], batchActionTypes.UPDATE_FIELD_NEW_ENROLLMENT_ACTION_BATCH);
 };

src/core_modules/capture-core/components/DataEntries/Enrollment/actions/enrollment.actions.js

@@ -1,6 +1,7 @@
 // @flow
 import type { OrgUnit } from '@dhis2/rules-engine-javascript';
 import { actionCreator, actionPayloadAppender } from '../../../../actions/actions.utils';
+import { ProgramStage } from '../../../../metaData';
 
 export const actionTypes = {
     START_RUN_RULES_ON_UPDATE: 'StartRunRulesOnUpdateForNewEnrollment',
@@ -11,9 +12,10 @@ export const startRunRulesOnUpdateForNewEnrollment = (
     uid: string,
     programId: string,
     orgUnit: OrgUnit,
+    stage?: ProgramStage,
 ) =>
     actionCreator(actionTypes.START_RUN_RULES_ON_UPDATE)(
-        { innerPayload: payload, uid, programId, orgUnit });
+        { innerPayload: payload, uid, programId, orgUnit, stage });
 
 export const startAsyncUpdateFieldForNewEnrollment = (
     innerAction: ReduxAction<any, any>,