@openmrs/esm-appointments-app 9.2.1-pre.6888 → 9.2.1-pre.6891

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"webservices.rest":"^2.2.0"},"extensions":[{"name":"home-appointments","slot":"homepage-widgets-slot","component":"homeAppointments","order":1},{"name":"clinical-appointments-dashboard-link","slot":"homepage-dashboard-slot","component":"appointmentsDashboardLink","meta":{"name":"appointments","slot":"clinical-appointments-dashboard-slot","title":"Appointments"},"order":2},{"component":"root","name":"clinical-appointments-dashboard","slot":"clinical-appointments-dashboard-slot"},{"name":"appointments-dashboard","slot":"appointments-dashboard-slot","component":"appointmentsDashboard"},{"name":"appointments-calendar-dashboard-link","slot":"calendar-dashboard-slot","component":"appointmentsCalendarDashboardLink"},{"name":"todays-appointments-dashboard","slot":"todays-appointment-slot","component":"homeAppointments"},{"name":"expected-appointments-panel","slot":"scheduled-appointments-panels-slot","component":"appointmentsList"},{"name":"checked-in-appointments-panel","slot":"scheduled-appointments-panels-slot","component":"appointmentsList"},{"name":"completed-appointments-panel","slot":"scheduled-appointments-panels-slot","component":"appointmentsList"},{"name":"missed-appointments-panel","slot":"scheduled-appointments-panels-slot","component":"appointmentsList"},{"name":"cancelled-appointments-panel","slot":"scheduled-appointments-panels-slot","component":"appointmentsList"},{"name":"early-appointments-panel","component":"earlyAppointments"},{"name":"patient-appointments-summary-dashboard","component":"patientAppointmentsSummaryDashboardLink","slot":"patient-chart-dashboard-slot","order":11,"meta":{"columns":1,"columnSpan":1,"hideDashboardTitle":true,"path":"Appointments","slot":"patient-chart-appointments-dashboard-slot","title":"Appointments"}},{"name":"appointments-details-widget","component":"patientAppointmentsDetailedSummary","slot":"patient-chart-appointments-dashboard-slot","meta":{"columnSpan":1}},{"name":"patient-upcoming-appointment-widget","component":"patientUpcomingAppointmentsWidget","slot":"visit-form-top-slot"},{"name":"search-patient","component":"searchPatient"},{"name":"home-appointments-tile","slot":"home-metrics-tiles-slot","component":"homeAppointmentsTile"},{"name":"metrics-card-scheduled-appointments","component":"metricsCardScheduledAppointments","slot":"appointments-metrics-slot","order":1},{"name":"metrics-card-highest-volume-service","component":"metricsCardHighestVolumeService","slot":"appointments-metrics-slot","order":2},{"name":"metrics-card-providers-booked","component":"metricsCardProvidersBooked","slot":"appointments-metrics-slot","order":3}],"modals":[{"name":"end-appointment-modal","component":"endAppointmentModal"},{"name":"cancel-appointment-modal","component":"cancelAppointmentModal"}],"workspaces":[{"name":"appointments-form-workspace","component":"appointmentsFormWorkspace","title":"createNewAppointment","type":"form"}],"version":"9.2.1-pre.6888"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"webservices.rest":"^2.2.0"},"extensions":[{"name":"home-appointments","slot":"homepage-widgets-slot","component":"homeAppointments","order":1},{"name":"clinical-appointments-dashboard-link","slot":"homepage-dashboard-slot","component":"appointmentsDashboardLink","meta":{"name":"appointments","slot":"clinical-appointments-dashboard-slot","title":"Appointments"},"order":2},{"component":"root","name":"clinical-appointments-dashboard","slot":"clinical-appointments-dashboard-slot"},{"name":"appointments-dashboard","slot":"appointments-dashboard-slot","component":"appointmentsDashboard"},{"name":"appointments-calendar-dashboard-link","slot":"calendar-dashboard-slot","component":"appointmentsCalendarDashboardLink"},{"name":"todays-appointments-dashboard","slot":"todays-appointment-slot","component":"homeAppointments"},{"name":"expected-appointments-panel","slot":"scheduled-appointments-panels-slot","component":"appointmentsList"},{"name":"checked-in-appointments-panel","slot":"scheduled-appointments-panels-slot","component":"appointmentsList"},{"name":"completed-appointments-panel","slot":"scheduled-appointments-panels-slot","component":"appointmentsList"},{"name":"missed-appointments-panel","slot":"scheduled-appointments-panels-slot","component":"appointmentsList"},{"name":"cancelled-appointments-panel","slot":"scheduled-appointments-panels-slot","component":"appointmentsList"},{"name":"early-appointments-panel","component":"earlyAppointments"},{"name":"patient-appointments-summary-dashboard","component":"patientAppointmentsSummaryDashboardLink","slot":"patient-chart-dashboard-slot","order":11,"meta":{"columns":1,"columnSpan":1,"hideDashboardTitle":true,"path":"Appointments","slot":"patient-chart-appointments-dashboard-slot","title":"Appointments"}},{"name":"appointments-details-widget","component":"patientAppointmentsDetailedSummary","slot":"patient-chart-appointments-dashboard-slot","meta":{"columnSpan":1}},{"name":"patient-upcoming-appointment-widget","component":"patientUpcomingAppointmentsWidget","slot":"visit-form-top-slot"},{"name":"search-patient","component":"searchPatient"},{"name":"home-appointments-tile","slot":"home-metrics-tiles-slot","component":"homeAppointmentsTile"},{"name":"metrics-card-scheduled-appointments","component":"metricsCardScheduledAppointments","slot":"appointments-metrics-slot","order":1},{"name":"metrics-card-highest-volume-service","component":"metricsCardHighestVolumeService","slot":"appointments-metrics-slot","order":2},{"name":"metrics-card-providers-booked","component":"metricsCardProvidersBooked","slot":"appointments-metrics-slot","order":3}],"modals":[{"name":"end-appointment-modal","component":"endAppointmentModal"},{"name":"cancel-appointment-modal","component":"cancelAppointmentModal"}],"workspaces":[{"name":"appointments-form-workspace","component":"appointmentsFormWorkspace","title":"createNewAppointment","type":"form"}],"version":"9.2.1-pre.6891"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-appointments-app",
-  "version": "9.2.1-pre.6888",
+  "version": "9.2.1-pre.6891",
   "description": "Appointments front-end module for O3",
   "browser": "dist/openmrs-esm-appointments-app.js",
   "main": "src/index.ts",

package/src/form/appointments-form.test.tsx

@@ -72,6 +72,10 @@ describe('AppointmentForm', () => {
       isValidating: false,
     });
   });
+  const getAllDayToggle = () => {
+    const toggles = screen.queryAllByRole('switch');
+    return toggles.find((toggle) => toggle.getAttribute('id') === 'allDayToggle');
+  };
 
   it('renders the appointments form', async () => {
     mockOpenmrsFetch.mockResolvedValue(mockUseAppointmentServiceData as unknown as FetchResponse);
@@ -260,4 +264,120 @@ describe('AppointmentForm', () => {
       title: 'Error scheduling appointment',
     });
   });
+
+  it('renders all-day toggle when allowAllDayAppointments is enabled', async () => {
+    mockUseConfig.mockReturnValue({
+      ...getDefaultsFromConfigSchema(configSchema),
+      appointmentTypes: ['Scheduled', 'WalkIn'],
+      allowAllDayAppointments: true,
+    });
+    mockOpenmrsFetch.mockResolvedValue(mockUseAppointmentServiceData as unknown as FetchResponse);
+
+    renderWithSwr(<AppointmentForm {...defaultProps} />);
+
+    await waitForLoadingToFinish();
+
+    const allDayToggle = getAllDayToggle();
+    expect(allDayToggle).toBeDefined();
+    expect(allDayToggle).toBeInTheDocument();
+  });
+
+  it('does not render all-day toggle when allowAllDayAppointments is disabled', async () => {
+    mockUseConfig.mockReturnValue({
+      ...getDefaultsFromConfigSchema(configSchema),
+      appointmentTypes: ['Scheduled', 'WalkIn'],
+      allowAllDayAppointments: false,
+    });
+
+    mockOpenmrsFetch.mockResolvedValue(mockUseAppointmentServiceData as unknown as FetchResponse);
+
+    renderWithSwr(<AppointmentForm {...defaultProps} />);
+
+    await waitForLoadingToFinish();
+
+    // Query by test ID since the toggle might not be present
+    const allDayToggles = screen.queryAllByRole('switch');
+    const allDayToggle = allDayToggles.find((toggle) => toggle.getAttribute('id') === 'allDayToggle');
+
+    expect(allDayToggle).toBeUndefined();
+  });
+
+  it('hides time and duration fields when all-day toggle is enabled', async () => {
+    mockUseConfig.mockReturnValue({
+      ...getDefaultsFromConfigSchema(configSchema),
+      appointmentTypes: ['Scheduled', 'WalkIn'],
+      allowAllDayAppointments: true,
+    });
+
+    const user = userEvent.setup();
+    mockOpenmrsFetch.mockResolvedValue(mockUseAppointmentServiceData as unknown as FetchResponse);
+
+    renderWithSwr(<AppointmentForm {...defaultProps} />);
+
+    await waitForLoadingToFinish();
+
+    // When allowAllDayAppointments is true, the toggle starts as ON (toggled)
+    // So time and duration fields should already be hidden initially
+    const allDayToggle = getAllDayToggle();
+    expect(allDayToggle).toBeChecked(); // Verify it's already toggled on
+
+    // Time and duration fields should already be hidden
+    expect(screen.queryByRole('textbox', { name: /time/i })).not.toBeInTheDocument();
+    expect(screen.queryByRole('spinbutton', { name: /duration \(minutes\)/i })).not.toBeInTheDocument();
+
+    // Now toggle it OFF to show the fields
+    await user.click(allDayToggle);
+
+    // After toggling OFF, time and duration fields should now be visible
+    expect(screen.getByRole('textbox', { name: /time/i })).toBeInTheDocument();
+    expect(screen.getByRole('spinbutton', { name: /duration \(minutes\)/i })).toBeInTheDocument();
+
+    // Toggle it back ON to hide them again
+    await user.click(allDayToggle);
+
+    // Fields should be hidden again
+    expect(screen.queryByRole('textbox', { name: /time/i })).not.toBeInTheDocument();
+    expect(screen.queryByRole('spinbutton', { name: /duration \(minutes\)/i })).not.toBeInTheDocument();
+  });
+
+  it('does not require duration validation for all-day appointments', async () => {
+    const user = userEvent.setup();
+
+    mockOpenmrsFetch.mockResolvedValue({ data: mockUseAppointmentServiceData } as unknown as FetchResponse);
+    mockSaveAppointment.mockResolvedValue({ status: 200, statusText: 'Ok' } as FetchResponse);
+
+    renderWithSwr(<AppointmentForm {...defaultProps} />);
+
+    await waitForLoadingToFinish();
+
+    const locationSelect = screen.getByRole('combobox', { name: /select a location/i });
+    const serviceSelect = screen.getByRole('combobox', { name: /select a service/i });
+    const appointmentTypeSelect = screen.getByRole('combobox', { name: /select the type of appointment/i });
+    const providerSelect = screen.getByRole('combobox', { name: /select a provider/i });
+    const dateInput = screen.getByRole('textbox', { name: /^date$/i });
+    const dateAppointmentIssuedInput = screen.getByRole('textbox', { name: /date appointment issued/i });
+    const allDayToggle = getAllDayToggle();
+    const saveButton = screen.getByRole('button', { name: /save and close/i });
+
+    await user.selectOptions(locationSelect, ['Inpatient Ward']);
+    await user.selectOptions(serviceSelect, ['Outpatient']);
+    await user.selectOptions(appointmentTypeSelect, ['Scheduled']);
+    await user.selectOptions(providerSelect, ['doctor - James Cook']);
+
+    const date = '2024-01-04';
+
+    fireEvent.change(dateInput, { target: { value: date } });
+    await user.click(dateAppointmentIssuedInput);
+    fireEvent.change(dateAppointmentIssuedInput, { target: { value: date } });
+
+    // Enable all-day appointment
+    await user.click(allDayToggle);
+
+    await user.click(saveButton);
+
+    // Should not show duration error message
+    expect(screen.queryByText(/duration should be greater than zero/i)).not.toBeInTheDocument();
+
+    expect(mockSaveAppointment).toHaveBeenCalledTimes(1);
+  });
 });

package/src/form/appointments-form.workspace.tsx

@@ -95,7 +95,6 @@ const AppointmentsForm: React.FC<AppointmentsFormProps & DefaultWorkspaceProps>
   const { appointmentStatuses, appointmentTypes, allowAllDayAppointments } = useConfig<ConfigObject>();
 
   const [isRecurringAppointment, setIsRecurringAppointment] = useState(false);
-  const [isAllDayAppointment, setIsAllDayAppointment] = useState(false);
   const defaultRecurringPatternType = recurringPattern?.type || 'DAY';
   const defaultRecurringPatternPeriod = recurringPattern?.period || 1;
   const defaultRecurringPatternDaysOfWeek = recurringPattern?.daysOfWeek || [];
@@ -130,12 +129,8 @@ const AppointmentsForm: React.FC<AppointmentsFormProps & DefaultWorkspaceProps>
   // t('durationErrorMessage', 'Duration should be greater than zero')
   const appointmentsFormSchema = z
     .object({
-      duration: z
-        .number()
-        .nullable()
-        .refine((duration) => (isAllDayAppointment ? true : duration > 0), {
-          message: translateFrom(moduleName, 'durationErrorMessage', 'Duration should be greater than zero'),
-        }),
+      duration: z.union([z.number(), z.null()]).optional(),
+      isAllDayAppointment: z.boolean(),
       location: z.string().refine((value) => value !== '', {
         message: translateFrom(moduleName, 'locationRequired', 'Location is required'),
       }),
@@ -205,7 +200,17 @@ const AppointmentsForm: React.FC<AppointmentsFormProps & DefaultWorkspaceProps>
           'Date appointment issued cannot be after the appointment date',
         ),
       },
-    );
+    )
+    .superRefine((data, ctx) => {
+      // If not all-day, duration must be > 0
+      if (!data.isAllDayAppointment && (!data.duration || data.duration <= 0)) {
+        ctx.addIssue({
+          path: ['duration'],
+          code: z.ZodIssueCode.custom,
+          message: translateFrom(moduleName, 'durationErrorMessage', 'Duration should be greater than zero'),
+        });
+      }
+    });
 
   type AppointmentFormData = z.infer<typeof appointmentsFormSchema>;
 
@@ -248,6 +253,7 @@ const AppointmentsForm: React.FC<AppointmentsFormProps & DefaultWorkspaceProps>
       },
       formIsRecurringAppointment: isRecurringAppointment,
       dateAppointmentScheduled: defaultDateAppointmentScheduled,
+      isAllDayAppointment: allowAllDayAppointments,
     },
   });
 
@@ -417,6 +423,7 @@ const AppointmentsForm: React.FC<AppointmentsFormProps & DefaultWorkspaceProps>
       appointmentNote,
       appointmentStatus,
       dateAppointmentScheduled,
+      isAllDayAppointment,
     } = data;
 
     const serviceUuid = services?.find((service) => service.name === selectedService)?.uuid;
@@ -424,7 +431,9 @@ const AppointmentsForm: React.FC<AppointmentsFormProps & DefaultWorkspaceProps>
     const hours = (hoursAndMinutes[0] % 12) + (timeFormat === 'PM' ? 12 : 0);
     const minutes = hoursAndMinutes[1];
     const startDatetime = startDate.setHours(hours, minutes);
-    const endDatetime = dayjs(startDatetime).add(duration, 'minutes').toDate();
+    const endDatetime = isAllDayAppointment
+      ? dayjs(startDate).endOf('day').toDate()
+      : dayjs(startDatetime).add(duration, 'minutes').toDate();
 
     return {
       appointmentKind: selectedAppointmentType,
@@ -599,13 +608,19 @@ const AppointmentsForm: React.FC<AppointmentsFormProps & DefaultWorkspaceProps>
             {isRecurringAppointment && (
               <div className={styles.inputContainer}>
                 {allowAllDayAppointments && (
-                  <Toggle
-                    id="allDayToggle"
-                    labelB={t('yes', 'Yes')}
-                    labelA={t('no', 'No')}
-                    labelText={t('allDay', 'All day')}
-                    onClick={() => setIsAllDayAppointment(!isAllDayAppointment)}
-                    toggled={isAllDayAppointment}
+                  <Controller
+                    name="isAllDayAppointment"
+                    control={control}
+                    render={({ field: { value, onChange } }) => (
+                      <Toggle
+                        id="allDayToggle"
+                        labelA={t('no', 'No')}
+                        labelB={t('yes', 'Yes')}
+                        labelText={t('allDay', 'All day')}
+                        toggled={value}
+                        onToggle={onChange}
+                      />
+                    )}
                   />
                 )}
                 <ResponsiveWrapper>
@@ -642,7 +657,7 @@ const AppointmentsForm: React.FC<AppointmentsFormProps & DefaultWorkspaceProps>
                   />
                 </ResponsiveWrapper>
 
-                {!isAllDayAppointment && (
+                {!watch('isAllDayAppointment') && (
                   <TimeAndDuration control={control} errors={errors} services={services} watch={watch} t={t} />
                 )}
 
@@ -721,13 +736,19 @@ const AppointmentsForm: React.FC<AppointmentsFormProps & DefaultWorkspaceProps>
             {!isRecurringAppointment && (
               <div className={styles.inputContainer}>
                 {allowAllDayAppointments && (
-                  <Toggle
-                    id="allDayToggle"
-                    labelB={t('yes', 'Yes')}
-                    labelA={t('no', 'No')}
-                    labelText={t('allDay', 'All day')}
-                    onClick={() => setIsAllDayAppointment(!isAllDayAppointment)}
-                    toggled={isAllDayAppointment}
+                  <Controller
+                    name="isAllDayAppointment"
+                    control={control}
+                    render={({ field: { value, onChange } }) => (
+                      <Toggle
+                        id="allDayToggle"
+                        labelA={t('no', 'No')}
+                        labelB={t('yes', 'Yes')}
+                        labelText={t('allDay', 'All day')}
+                        toggled={value}
+                        onToggle={onChange}
+                      />
+                    )}
                   />
                 )}
                 <ResponsiveWrapper>
@@ -755,7 +776,7 @@ const AppointmentsForm: React.FC<AppointmentsFormProps & DefaultWorkspaceProps>
                   />
                 </ResponsiveWrapper>
 
-                {!isAllDayAppointment && (
+                {!watch('isAllDayAppointment') && (
                   <TimeAndDuration control={control} services={services} watch={watch} t={t} errors={errors} />
                 )}
               </div>

package/translations/am.json

@@ -10,6 +10,7 @@
   "appointmentCancelledSuccessfully": "Appointment cancelled successfully",
   "appointmentCheckedIn": "Appointment Checked In",
   "appointmentConflict": "Appointment conflict",
+  "appointmentDate": "Appointment date",
   "appointmentEdited": "Appointment edited",
   "appointmentEditError": "Error editing appointment",
   "appointmentEnded": "Appointment ended",
@@ -58,11 +59,11 @@
   "createNewAppointment": "Create new appointment",
   "date": "Date",
   "date&Time": "Date & time",
+  "dateAppointmentIssued": "Date appointment issued",
   "dateAppointmentIssuedCannotBeAfterAppointmentDate": "Date appointment issued cannot be after the appointment date",
   "dateOfBirth": "Date of birth",
   "dateRange": "Set date range",
   "dateScheduled": "Date appointment issued",
-  "dateScheduledDetail": "Date appointment issued",
   "dateTime": "Date & Time",
   "day": "Day",
   "daysOfWeek": "Days of the week",
@@ -136,7 +137,6 @@
   "selectALocation": "Select a location",
   "selectAppointmentStatus": "Select status",
   "selectAppointmentType": "Select an appointment type",
-  "selectDate": "Select date",
   "selectOption": "Select an option",
   "selectProvider": "Select a provider",
   "selectService": "Select a service",

package/translations/ar.json

@@ -10,6 +10,7 @@
   "appointmentCancelledSuccessfully": "تم إلغاء الموعد بنجاح",
   "appointmentCheckedIn": "Appointment Checked In",
   "appointmentConflict": "تعارض بالمواعيد",
+  "appointmentDate": "Appointment date",
   "appointmentEdited": "تم تعديل الموعد",
   "appointmentEditError": "خطأ في تعديل الموعد",
   "appointmentEnded": "انتهى الموعد",
@@ -58,11 +59,11 @@
   "createNewAppointment": "إنشاء موعد جديد",
   "date": "تاريخ",
   "date&Time": "Date & time",
+  "dateAppointmentIssued": "Date appointment issued",
   "dateAppointmentIssuedCannotBeAfterAppointmentDate": "Date appointment issued cannot be after the appointment date",
   "dateOfBirth": "تاريخ الميلاد",
   "dateRange": "Set date range",
   "dateScheduled": "Date appointment issued",
-  "dateScheduledDetail": "Date appointment issued",
   "dateTime": "Date & Time",
   "day": "Day",
   "daysOfWeek": "Days of the week",
@@ -136,7 +137,6 @@
   "selectALocation": "Select a location",
   "selectAppointmentStatus": "اختر الحالة",
   "selectAppointmentType": "اختر نوع الموعد",
-  "selectDate": "Select date",
   "selectOption": "اختر خيارًا",
   "selectProvider": "Select a provider",
   "selectService": "اختر الخدمة",

package/translations/ar_SY.json

@@ -10,6 +10,7 @@
   "appointmentCancelledSuccessfully": "Appointment cancelled successfully",
   "appointmentCheckedIn": "Appointment Checked In",
   "appointmentConflict": "Appointment conflict",
+  "appointmentDate": "Appointment date",
   "appointmentEdited": "Appointment edited",
   "appointmentEditError": "Error editing appointment",
   "appointmentEnded": "Appointment ended",
@@ -58,11 +59,11 @@
   "createNewAppointment": "Create new appointment",
   "date": "Date",
   "date&Time": "Date & time",
+  "dateAppointmentIssued": "Date appointment issued",
   "dateAppointmentIssuedCannotBeAfterAppointmentDate": "Date appointment issued cannot be after the appointment date",
   "dateOfBirth": "Date of birth",
   "dateRange": "Set date range",
   "dateScheduled": "Date appointment issued",
-  "dateScheduledDetail": "Date appointment issued",
   "dateTime": "Date & Time",
   "day": "Day",
   "daysOfWeek": "Days of the week",
@@ -136,7 +137,6 @@
   "selectALocation": "Select a location",
   "selectAppointmentStatus": "Select status",
   "selectAppointmentType": "Select an appointment type",
-  "selectDate": "Select date",
   "selectOption": "Select an option",
   "selectProvider": "Select a provider",
   "selectService": "Select a service",

package/translations/bn.json

@@ -10,6 +10,7 @@
   "appointmentCancelledSuccessfully": "সাক্ষাৎ সফলভাবে বাতিল হয়েছে",
   "appointmentCheckedIn": "Appointment Checked In",
   "appointmentConflict": "Appointment conflict",
+  "appointmentDate": "Appointment date",
   "appointmentEdited": "সাক্ষাৎ পরিবর্তিত হয়েছে",
   "appointmentEditError": "Error editing appointment",
   "appointmentEnded": "সাক্ষাৎ সমাপ্ত",
@@ -58,11 +59,11 @@
   "createNewAppointment": "Create new appointment",
   "date": "তারিখ",
   "date&Time": "তারিখ ও সময়",
+  "dateAppointmentIssued": "Date appointment issued",
   "dateAppointmentIssuedCannotBeAfterAppointmentDate": "Date appointment issued cannot be after the appointment date",
   "dateOfBirth": "জন্মতারিখ",
   "dateRange": "Set date range",
   "dateScheduled": "Date appointment issued",
-  "dateScheduledDetail": "Date appointment issued",
   "dateTime": "তারিখ ও সময়",
   "day": "দিন",
   "daysOfWeek": "সপ্তাহের দিনসমূহ",
@@ -136,7 +137,6 @@
   "selectALocation": "Select a location",
   "selectAppointmentStatus": "Select status",
   "selectAppointmentType": "Select an appointment type",
-  "selectDate": "Select date",
   "selectOption": "Select an option",
   "selectProvider": "Select a provider",
   "selectService": "Select a service",

package/translations/de.json

@@ -10,6 +10,7 @@
   "appointmentCancelledSuccessfully": "Appointment cancelled successfully",
   "appointmentCheckedIn": "Appointment Checked In",
   "appointmentConflict": "Appointment conflict",
+  "appointmentDate": "Appointment date",
   "appointmentEdited": "Appointment edited",
   "appointmentEditError": "Error editing appointment",
   "appointmentEnded": "Appointment ended",
@@ -58,11 +59,11 @@
   "createNewAppointment": "Create new appointment",
   "date": "Date",
   "date&Time": "Date & time",
+  "dateAppointmentIssued": "Date appointment issued",
   "dateAppointmentIssuedCannotBeAfterAppointmentDate": "Date appointment issued cannot be after the appointment date",
   "dateOfBirth": "Date of birth",
   "dateRange": "Set date range",
   "dateScheduled": "Date appointment issued",
-  "dateScheduledDetail": "Date appointment issued",
   "dateTime": "Date & Time",
   "day": "Day",
   "daysOfWeek": "Days of the week",
@@ -136,7 +137,6 @@
   "selectALocation": "Select a location",
   "selectAppointmentStatus": "Select status",
   "selectAppointmentType": "Select an appointment type",
-  "selectDate": "Select date",
   "selectOption": "Select an option",
   "selectProvider": "Select a provider",
   "selectService": "Select a service",

package/translations/en_US.json

@@ -10,6 +10,7 @@
   "appointmentCancelledSuccessfully": "Appointment cancelled successfully",
   "appointmentCheckedIn": "Appointment Checked In",
   "appointmentConflict": "Appointment conflict",
+  "appointmentDate": "Appointment date",
   "appointmentEdited": "Appointment edited",
   "appointmentEditError": "Error editing appointment",
   "appointmentEnded": "Appointment ended",
@@ -58,11 +59,11 @@
   "createNewAppointment": "Create new appointment",
   "date": "Date",
   "date&Time": "Date & time",
+  "dateAppointmentIssued": "Date appointment issued",
   "dateAppointmentIssuedCannotBeAfterAppointmentDate": "Date appointment issued cannot be after the appointment date",
   "dateOfBirth": "Date of birth",
   "dateRange": "Set date range",
   "dateScheduled": "Date appointment issued",
-  "dateScheduledDetail": "Date appointment issued",
   "dateTime": "Date & Time",
   "day": "Day",
   "daysOfWeek": "Days of the week",
@@ -136,7 +137,6 @@
   "selectALocation": "Select a location",
   "selectAppointmentStatus": "Select status",
   "selectAppointmentType": "Select an appointment type",
-  "selectDate": "Select date",
   "selectOption": "Select an option",
   "selectProvider": "Select a provider",
   "selectService": "Select a service",

package/translations/es.json

@@ -10,6 +10,7 @@
   "appointmentCancelledSuccessfully": "Cita cancelada con éxito",
   "appointmentCheckedIn": "Llegada a la cita registrada",
   "appointmentConflict": "Conflicto en las citas",
+  "appointmentDate": "Appointment date",
   "appointmentEdited": "Cita editada",
   "appointmentEditError": "Error al editar la cita",
   "appointmentEnded": "Cita finalizada",
@@ -58,11 +59,11 @@
   "createNewAppointment": "Crear nueva cita",
   "date": "Fecha",
   "date&Time": "Fecha y hora",
+  "dateAppointmentIssued": "Date appointment issued",
   "dateAppointmentIssuedCannotBeAfterAppointmentDate": "La fecha de emisión de la cita no puede ser posterior a la fecha de la cita",
   "dateOfBirth": "Fecha de nacimiento",
   "dateRange": "Set date range",
   "dateScheduled": "Fecha de emisión de la cita",
-  "dateScheduledDetail": "Fecha de emisión de la cita",
   "dateTime": "Fecha y Hora",
   "day": "Día",
   "daysOfWeek": "Días de la semana",
@@ -136,7 +137,6 @@
   "selectALocation": "Seleccionar una ubicación",
   "selectAppointmentStatus": "Seleccionar estado",
   "selectAppointmentType": "Seleccione un tipo de cita",
-  "selectDate": "Select date",
   "selectOption": "Seleccione una opción",
   "selectProvider": "Seleccione un proveedor de la salud",
   "selectService": "Seleccione un servicio",

package/translations/es_MX.json

@@ -10,6 +10,7 @@
   "appointmentCancelledSuccessfully": "Appointment cancelled successfully",
   "appointmentCheckedIn": "Appointment Checked In",
   "appointmentConflict": "Appointment conflict",
+  "appointmentDate": "Appointment date",
   "appointmentEdited": "Appointment edited",
   "appointmentEditError": "Error editing appointment",
   "appointmentEnded": "Appointment ended",
@@ -58,11 +59,11 @@
   "createNewAppointment": "Create new appointment",
   "date": "Date",
   "date&Time": "Date & time",
+  "dateAppointmentIssued": "Date appointment issued",
   "dateAppointmentIssuedCannotBeAfterAppointmentDate": "Date appointment issued cannot be after the appointment date",
   "dateOfBirth": "Date of birth",
   "dateRange": "Set date range",
   "dateScheduled": "Date appointment issued",
-  "dateScheduledDetail": "Date appointment issued",
   "dateTime": "Date & Time",
   "day": "Day",
   "daysOfWeek": "Days of the week",
@@ -136,7 +137,6 @@
   "selectALocation": "Select a location",
   "selectAppointmentStatus": "Select status",
   "selectAppointmentType": "Select an appointment type",
-  "selectDate": "Select date",
   "selectOption": "Select an option",
   "selectProvider": "Select a provider",
   "selectService": "Select a service",

package/translations/fr.json

@@ -10,6 +10,7 @@
   "appointmentCancelledSuccessfully": "Rendez-vous annulé avec succès",
   "appointmentCheckedIn": "Patient arrivé pour le rendez-vous",
   "appointmentConflict": "Conflit du rendez-vous",
+  "appointmentDate": "Appointment date",
   "appointmentEdited": "Rendez-vous modifié",
   "appointmentEditError": "Erreur de modification du rendez-vous",
   "appointmentEnded": "Rendez-vous terminé",
@@ -58,11 +59,11 @@
   "createNewAppointment": "Créer un nouveau rendez-vous",
   "date": "Date",
   "date&Time": "Date et heure",
+  "dateAppointmentIssued": "Date appointment issued",
   "dateAppointmentIssuedCannotBeAfterAppointmentDate": "La date du rendez-vous ne peut pas être postérieure à la date du rendez-vous",
   "dateOfBirth": "Date de naissance",
   "dateRange": "Set date range",
   "dateScheduled": "Date de rendez vous émise",
-  "dateScheduledDetail": "Date de rendez vous émise",
   "dateTime": "Date et heure",
   "day": "Jour",
   "daysOfWeek": "Jours de la semaine",
@@ -136,7 +137,6 @@
   "selectALocation": "Sélectionner un emplacement",
   "selectAppointmentStatus": "Sélectionner le statut",
   "selectAppointmentType": "Sélectionnez un type de rendez-vous",
-  "selectDate": "Select date",
   "selectOption": "Sélectionner une option",
   "selectProvider": "Sélectionnez un prestataire",
   "selectService": "Sélectionner un service",

package/translations/he.json

@@ -10,6 +10,7 @@
   "appointmentCancelledSuccessfully": "התור בוטל בהצלחה",
   "appointmentCheckedIn": "Appointment Checked In",
   "appointmentConflict": "סתירת תורים",
+  "appointmentDate": "Appointment date",
   "appointmentEdited": "התור נערך",
   "appointmentEditError": "שגיאה בעריכת תור",
   "appointmentEnded": "התור הסתיים",
@@ -58,11 +59,11 @@
   "createNewAppointment": "יצירת תור חדש",
   "date": "תאריך",
   "date&Time": "תאריך ושעה",
+  "dateAppointmentIssued": "Date appointment issued",
   "dateAppointmentIssuedCannotBeAfterAppointmentDate": "תאריך התור שהונפק לא יכול להיות אחרי תאריך התור",
   "dateOfBirth": "תאריך לידה",
   "dateRange": "Set date range",
   "dateScheduled": "הונפק תאריך לתור",
-  "dateScheduledDetail": "הונפק תאריך לתור",
   "dateTime": "תאריך ושעה",
   "day": "יום",
   "daysOfWeek": "ימי השבוע",
@@ -136,7 +137,6 @@
   "selectALocation": "בחירת מקום",
   "selectAppointmentStatus": "בחירת מצב",
   "selectAppointmentType": "בחירת סוג תור",
-  "selectDate": "Select date",
   "selectOption": "בחירת אפשרות",
   "selectProvider": "בחירת ספק",
   "selectService": "בחירת שירות",

package/translations/hi.json

@@ -10,6 +10,7 @@
   "appointmentCancelledSuccessfully": "Appointment cancelled successfully",
   "appointmentCheckedIn": "Appointment Checked In",
   "appointmentConflict": "Appointment conflict",
+  "appointmentDate": "Appointment date",
   "appointmentEdited": "Appointment edited",
   "appointmentEditError": "Error editing appointment",
   "appointmentEnded": "Appointment ended",
@@ -58,11 +59,11 @@
   "createNewAppointment": "Create new appointment",
   "date": "Date",
   "date&Time": "Date & time",
+  "dateAppointmentIssued": "Date appointment issued",
   "dateAppointmentIssuedCannotBeAfterAppointmentDate": "Date appointment issued cannot be after the appointment date",
   "dateOfBirth": "Date of birth",
   "dateRange": "Set date range",
   "dateScheduled": "Date appointment issued",
-  "dateScheduledDetail": "Date appointment issued",
   "dateTime": "Date & Time",
   "day": "Day",
   "daysOfWeek": "Days of the week",
@@ -136,7 +137,6 @@
   "selectALocation": "Select a location",
   "selectAppointmentStatus": "Select status",
   "selectAppointmentType": "Select an appointment type",
-  "selectDate": "Select date",
   "selectOption": "Select an option",
   "selectProvider": "Select a provider",
   "selectService": "Select a service",