fix(migration-trackedentity): change programStateDate to enrollmentEn…

…rolledAfter and same for endDate to enrollmentEnrolledBefore
dhis2 · Mar 5, 2024 · ce2235d · ce2235d
1 parent 2b96d79
commit ce2235d
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 18 deletions.
diff --git a/src/components/Inputs/ProgramEndDate.js b/src/components/Inputs/ProgramEndDate.js
@@ -5,7 +5,7 @@ import React from 'react'
 import { OPTIONAL_DATE_VALIDATOR } from '../DatePicker/DatePickerField.js'
 import { DatePickerField } from '../index.js'
 
-const NAME = 'programEndDate'
+const NAME = 'enrollmentEnrolledBefore'
 const DATATEST = 'input-program-end-date'
 const LABEL = i18n.t('End date')
 const VALIDATOR = composeValidators(OPTIONAL_DATE_VALIDATOR)

diff --git a/src/components/Inputs/ProgramStartDate.js b/src/components/Inputs/ProgramStartDate.js
@@ -5,7 +5,7 @@ import React from 'react'
 import { OPTIONAL_DATE_VALIDATOR } from '../DatePicker/DatePickerField.js'
 import { DatePickerField } from '../index.js'
 
-const NAME = 'programStartDate'
+const NAME = 'enrollmentEnrolledAfter'
 const DATATEST = 'input-program-start-date'
 const LABEL = i18n.t('Start date')
 const VALIDATOR = composeValidators(OPTIONAL_DATE_VALIDATOR)

diff --git a/src/pages/TEIExport/TEIExport.js b/src/pages/TEIExport/TEIExport.js
@@ -69,8 +69,8 @@ const initialValues = {
     teiTypeFilter: defaultTEITypeFilterOption,
     programStatus: defaultProgramStatusOption,
     followUpStatus: defaultFollowUpStatusOption,
-    programStartDate: '',
-    programEndDate: '',
+    enrollmentEnrolledAfter: '',
+    enrollmentEnrolledBefore: '',
     compression: '', // disable compression until it is properly implemented in the backend
     lastUpdatedFilter: defaultLastUpdatedFilterOption,
     updatedAfter: '',

diff --git a/src/pages/TEIExport/form-helper.js b/src/pages/TEIExport/form-helper.js
@@ -26,8 +26,8 @@ const valuesToParams = (
         teiTypeFilter,
         programStatus,
         followUpStatus,
-        programStartDate,
-        programEndDate,
+        enrollmentEnrolledAfter,
+        enrollmentEnrolledBefore,
         lastUpdatedFilter,
         updatedAfter,
         updatedBefore,
@@ -72,12 +72,12 @@ const valuesToParams = (
 
         minParams.followUpStatus = followUpStatus
 
-        if (programStartDate) {
-            minParams.programStartDate = programStartDate
+        if (enrollmentEnrolledAfter) {
+            minParams.enrollmentEnrolledAfter = enrollmentEnrolledAfter
         }
 
-        if (programEndDate) {
-            minParams.programEndDate = programEndDate
+        if (enrollmentEnrolledBefore) {
+            minParams.enrollmentEnrolledBefore = enrollmentEnrolledBefore
         }
     }
 
@@ -127,16 +127,16 @@ const validate = (values) => {
 
     if (
         values.teiTypeFilter == 'PROGRAM' &&
-        values.programStartDate &&
-        values.programEndDate
+        values.enrollmentEnrolledAfter &&
+        values.enrollmentEnrolledBefore
     ) {
-        errors.programStartDate = DATE_BEFORE_VALIDATOR(
-            values.programStartDate,
-            values.programEndDate
+        errors.enrollmentEnrolledAfter = DATE_BEFORE_VALIDATOR(
+            values.enrollmentEnrolledAfter,
+            values.enrollmentEnrolledBefore
         )
-        errors.programEndDate = DATE_AFTER_VALIDATOR(
-            values.programEndDate,
-            values.programStartDate
+        errors.enrollmentEnrolledBefore = DATE_AFTER_VALIDATOR(
+            values.enrollmentEnrolledBefore,
+            values.enrollmentEnrolledAfter
         )
     }