fix(migration-trackedentity): change followupStatus to followup

and ensure that the parameter is not selected if ALL is chosen
dhis2 · Mar 5, 2024 · 9105ff3 · 9105ff3
1 parent ce2235d
commit 9105ff3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/src/components/Inputs/FollowUpStatus.js b/src/components/Inputs/FollowUpStatus.js
@@ -5,12 +5,12 @@ import { RadioGroupField } from '../index.js'
 
 const followUpStatusOptions = [
     { value: 'ALL', label: i18n.t('All') },
-    { value: 'TRUE', label: i18n.t('Marked for follow-up') },
-    { value: 'FALSE', label: i18n.t('Not marked for follow-up') },
+    { value: 'true', label: i18n.t('Marked for follow-up') },
+    { value: 'false', label: i18n.t('Not marked for follow-up') },
 ]
 const defaultFollowUpStatusOption = followUpStatusOptions[0].value
 
-const NAME = 'followUpStatus'
+const NAME = 'followup'
 const DATATEST = 'input-follow-up-status'
 const LABEL = i18n.t('Include only entities with follow-up status')
 

diff --git a/src/pages/TEIExport/TEIExport.js b/src/pages/TEIExport/TEIExport.js
@@ -68,7 +68,7 @@ const initialValues = {
     inclusion: defaultInclusionOption,
     teiTypeFilter: defaultTEITypeFilterOption,
     programStatus: defaultProgramStatusOption,
-    followUpStatus: defaultFollowUpStatusOption,
+    followup: defaultFollowUpStatusOption,
     enrollmentEnrolledAfter: '',
     enrollmentEnrolledBefore: '',
     compression: '', // disable compression until it is properly implemented in the backend

diff --git a/src/pages/TEIExport/form-helper.js b/src/pages/TEIExport/form-helper.js
@@ -25,7 +25,7 @@ const valuesToParams = (
         assignedUserMode,
         teiTypeFilter,
         programStatus,
-        followUpStatus,
+        followup,
         enrollmentEnrolledAfter,
         enrollmentEnrolledBefore,
         lastUpdatedFilter,
@@ -70,7 +70,11 @@ const valuesToParams = (
             minParams.programStatus = programStatus
         }
 
-        minParams.followUpStatus = followUpStatus
+        console.log('>>>>>', followup, minParams.followup)
+
+        if(followup !== 'ALL') {
+            minParams.followup = followup
+        }
 
         if (enrollmentEnrolledAfter) {
             minParams.enrollmentEnrolledAfter = enrollmentEnrolledAfter