(feat) 03-3404: follow-up -ensure the dateAppointmentScheduled <= app…

…ointmentDate (#1295)

packages/esm-appointments-app/src/form/appointments-form.component.tsx

@@ -181,11 +181,22 @@ const AppointmentsForm: React.FC<AppointmentsFormProps> = ({
     )
     .refine(
       (formValues) => {
-        const appointmentDate = formValues.appointmentDateTime?.startDate;
-        const dateAppointmentScheduled = formValues.dateAppointmentScheduled;
+        const { appointmentDateTime, dateAppointmentScheduled } = formValues;
 
-        if (!appointmentDate || !dateAppointmentScheduled) return true;
-        return dateAppointmentScheduled < appointmentDate;
+        const startDate = appointmentDateTime?.startDate;
+
+        if (!startDate || !dateAppointmentScheduled) return true;
+
+        const normalizeDate = (date: Date) => {
+          const normalizedDate = new Date(date);
+          normalizedDate.setHours(0, 0, 0, 0);
+          return normalizedDate;
+        };
+
+        const startDateObj = normalizeDate(startDate);
+        const scheduledDateObj = normalizeDate(dateAppointmentScheduled);
+
+        return scheduledDateObj <= startDateObj;
       },
       {
         path: ['dateAppointmentScheduled'],
@@ -195,6 +206,7 @@ const AppointmentsForm: React.FC<AppointmentsFormProps> = ({
         ),
       },
     );
+
   type AppointmentFormData = z.infer<typeof appointmentsFormSchema>;
 
   const defaultDateAppointmentScheduled = appointment?.dateAppointmentScheduled