change wording from disable to allow

openmrs · Oct 29, 2024 · e1aa33b · e1aa33b
1 parent 32486f2
commit e1aa33b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/packages/esm-patient-registration-app/src/config-schema.ts b/packages/esm-patient-registration-app/src/config-schema.ts
@@ -12,8 +12,8 @@ export interface FieldDefinition {
   label?: string;
   uuid: string;
   placeholder?: string;
-  disableFutureDates?: boolean;
-  disablePastDates?: boolean;
+  allowFutureDates?: boolean;
+  allowPastDates?: boolean;
   showHeading: boolean;
   validation?: {
     required: boolean;

diff --git a/...s/esm-patient-registration-app/src/patient-registration/field/obs/obs-field.component.tsx b/...s/esm-patient-registration-app/src/patient-registration/field/obs/obs-field.component.tsx
@@ -57,8 +57,8 @@ export function ObsField({ fieldDefinition }: ObsFieldProps) {
           concept={concept}
           label={fieldDefinition.label}
           required={fieldDefinition.validation.required}
-          disablePastDates={fieldDefinition.disablePastDates}
-          disableFutureDates={fieldDefinition.disableFutureDates}
+          allowPastDates={fieldDefinition.allowPastDates}
+          allowFutureDates={fieldDefinition.allowFutureDates}
         />
       );
     case 'Coded':
@@ -159,14 +159,16 @@ interface DateObsFieldProps {
   concept: ConceptResponse;
   label: string;
   required?: boolean;
-  disablePastDates?: boolean;
-  disableFutureDates?: boolean;
+  allowPastDates?: boolean;
+  allowFutureDates?: boolean;
 }
 
-function DateObsField({ concept, label, required, disablePastDates, disableFutureDates }: DateObsFieldProps) {
+function DateObsField({ concept, label, required, allowPastDates, allowFutureDates }: DateObsFieldProps) {
   const { t } = useTranslation();
   const fieldName = `obs.${concept.uuid}`;
   const { setFieldValue } = useContext(PatientRegistrationContext);
+  const futureDatesAllowed = allowFutureDates ?? true;
+  const pastDatesAllowed = allowPastDates ?? true;
 
   const onDateChange = (date: Date) => {
     setFieldValue(fieldName, date);
@@ -188,8 +190,8 @@ function DateObsField({ concept, label, required, disablePastDates, disableFutur
                   isInvalid={errors[fieldName] && touched[fieldName]}
                   invalidText={t(meta.error)}
                   value={field.value}
-                  minDate={disablePastDates ? new Date() : undefined}
-                  maxDate={disableFutureDates ? new Date() : undefined}
+                  minDate={!pastDatesAllowed ? new Date() : undefined}
+                  maxDate={!futureDatesAllowed ? new Date() : undefined}
                 />
               </>
             );