fix: [DHIS2-15983] Enrollment date not assigned on form init (#3475)

dhis2 · Dec 5, 2023 · a13a766 · a13a766
1 parent a47e429
commit a13a766
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/core_modules/capture-core/components/DataEntries/Enrollment/actions/open.actionBatchs.js b/src/core_modules/capture-core/components/DataEntries/Enrollment/actions/open.actionBatchs.js
@@ -71,6 +71,7 @@ export const openDataEntryForNewEnrollmentBatchAsync = async ({
     const formId = getDataEntryKey(dataEntryId, itemId);
     const addFormDataActions = addFormData(`${dataEntryId}-${itemId}`, formValues);
     const firstStageDataEntryPropsToInclude = firstStage && getDataEntryPropsToInclude(firstStage.stageForm);
+    const defaultDataEntryValues = { enrolledAt: convertDateObjectToDateFormatString(new Date()) };
     const dataEntryPropsToInclude = [
         ...enrollmentDataEntryPropsToInclude,
         ...extraDataEntryProps,
@@ -88,14 +89,15 @@ export const openDataEntryForNewEnrollmentBatchAsync = async ({
                 dataEntryId,
                 itemId,
                 dataEntryPropsToInclude,
-                { enrolledAt: convertDateObjectToDateFormatString(new Date()) },
+                defaultDataEntryValues,
             );
 
     const effects = getApplicableRuleEffectsForTrackerProgram({
         program,
         orgUnit,
         stage: firstStage,
         attributeValues: clientValues,
+        enrollmentData: defaultDataEntryValues,
         formFoundation,
     });