@openmrs/esm-appointments-app 5.2.2-pre.2430 → 5.2.2-pre.2432

package/dist/openmrs-esm-appointments-app.js.buildmanifest.json

@@ -80,10 +80,10 @@
       "initial": true,
       "entry": true,
       "recorded": false,
-      "size": 4538674,
+      "size": 4539072,
       "sizes": {
         "consume-shared": 252,
-        "javascript": 4517752,
+        "javascript": 4518150,
         "share-init": 252,
         "runtime": 20418
       },
@@ -100,7 +100,7 @@
       "auxiliaryFiles": [
         "main.js.map"
       ],
-      "hash": "e2a5317e72ad4308",
+      "hash": "a7e8f660b86ec22e",
       "childrenByOrder": {}
     },
     {
@@ -422,9 +422,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 480227,
+      "size": 480625,
       "sizes": {
-        "javascript": 480059,
+        "javascript": 480457,
         "consume-shared": 168
       },
       "names": [],
@@ -438,7 +438,7 @@
       "auxiliaryFiles": [
         "755.js.map"
       ],
-      "hash": "43422d9285aaa607",
+      "hash": "ec0e13a531b07fa9",
       "childrenByOrder": {}
     },
     {

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"}},{"component":"root","name":"clinical-appointments-dashboard","slot":"clinical-appointments-dashboard-slot"},{"name":"appointments-calendar-dashboard-link","slot":"calendar-dashboard-slot","component":"appointmentsCalendarDashboardLink"},{"name":"check-in-appointment-modal","slot":"todays-appointment-slot","component":"checkInModal"},{"name":"todays-appointments-dashboard","slot":"todays-appointment-slot","component":"homeAppointments"},{"name":"expected-appointments-panel","slot":"scheduled-appointments-panels-slot","component":"appointmentsByStatus"},{"name":"checked-in-appointments-panel","slot":"scheduled-appointments-panels-slot","component":"appointmentsByStatus"},{"name":"completed-appointments-panel","slot":"scheduled-appointments-panels-slot","component":"appointmentsByStatus"},{"name":"missed-appointments-panel","slot":"scheduled-appointments-panels-slot","component":"appointmentsByStatus"},{"name":"cancelled-appointments-panel","slot":"scheduled-appointments-panels-slot","component":"appointmentsByStatus"},{"name":"early-appointments-panel","component":"earlyAppointments"}],"version":"5.2.2-pre.2430"}
+{"$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"}},{"component":"root","name":"clinical-appointments-dashboard","slot":"clinical-appointments-dashboard-slot"},{"name":"appointments-calendar-dashboard-link","slot":"calendar-dashboard-slot","component":"appointmentsCalendarDashboardLink"},{"name":"check-in-appointment-modal","slot":"todays-appointment-slot","component":"checkInModal"},{"name":"todays-appointments-dashboard","slot":"todays-appointment-slot","component":"homeAppointments"},{"name":"expected-appointments-panel","slot":"scheduled-appointments-panels-slot","component":"appointmentsByStatus"},{"name":"checked-in-appointments-panel","slot":"scheduled-appointments-panels-slot","component":"appointmentsByStatus"},{"name":"completed-appointments-panel","slot":"scheduled-appointments-panels-slot","component":"appointmentsByStatus"},{"name":"missed-appointments-panel","slot":"scheduled-appointments-panels-slot","component":"appointmentsByStatus"},{"name":"cancelled-appointments-panel","slot":"scheduled-appointments-panels-slot","component":"appointmentsByStatus"},{"name":"early-appointments-panel","component":"earlyAppointments"}],"version":"5.2.2-pre.2432"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-appointments-app",
-  "version": "5.2.2-pre.2430",
+  "version": "5.2.2-pre.2432",
   "description": "Appointments front-end module for the OpenMRS SPA",
   "browser": "dist/openmrs-esm-appointments-app.js",
   "main": "src/index.ts",

package/src/appointments/forms/create-edit-form/appointments-form.component.tsx

@@ -28,7 +28,6 @@ import {
   Toggle,
 } from '@carbon/react';
 import {
-  ConfigObject,
   ExtensionSlot,
   showNotification,
   showToast,
@@ -55,6 +54,7 @@ import LocationSelectOption from '../../common-components/location-select-option
 import WorkloadCard from '../workload.component';
 import styles from './appointments-form.scss';
 import { useAppointmentList } from '../../../hooks/useAppointmentList';
+import { ConfigObject } from '../../../config-schema';
 
 interface AppointmentFormProps {
   appointment?: MappedAppointment;
@@ -71,7 +71,8 @@ const AppointmentForm: React.FC<AppointmentFormProps> = ({ appointment, patientU
   const sessionUser = useSession();
   const isTablet = useLayoutType() === 'tablet';
   const initialAppointmentFormValues = useInitialAppointmentFormValue(appointment, patientUuid);
-  const { appointmentTypes, appointmentStatuses, hiddenFormFields } = useConfig<ConfigObject>();
+  const { appointmentTypes, appointmentStatuses, hiddenFormFields, allowAllDayAppointments } =
+    useConfig<ConfigObject>();
 
   const [isSubmitting, setIsSubmitting] = useState(false);
   const [patientAppointment, setPatientAppointment] = useState<PatientAppointment>(initialAppointmentFormValues);
@@ -225,15 +226,17 @@ const AppointmentForm: React.FC<AppointmentFormProps> = ({ appointment, patientU
             </Column>
             <Column>
               <section className={styles.flexRow}>
-                <Toggle
-                  className={styles.flex1}
-                  defaultToggled={patientAppointment.isFullDay}
-                  id="allDay"
-                  labelA={t('off', 'Off')}
-                  labelB={t('on', 'On')}
-                  labelText={t('allDay', 'All Day')}
-                  onToggle={(value) => setPatientAppointment({ ...patientAppointment, isFullDay: value })}
-                />
+                {allowAllDayAppointments && (
+                  <Toggle
+                    className={styles.flex1}
+                    defaultToggled={patientAppointment.isFullDay}
+                    id="allDay"
+                    labelA={t('off', 'Off')}
+                    labelB={t('on', 'On')}
+                    labelText={t('allDay', 'All Day')}
+                    onToggle={(value) => setPatientAppointment({ ...patientAppointment, isFullDay: value })}
+                  />
+                )}
                 <DatePicker
                   dateFormat="d/m/Y"
                   datePickerType="single"

package/src/appointments/forms/useInitialFormValues.tsx

@@ -1,7 +1,8 @@
-import { OpenmrsResource, useSession } from '@openmrs/esm-framework';
+import { OpenmrsResource, useConfig, useSession } from '@openmrs/esm-framework';
 import dayjs from 'dayjs';
 import { amPm } from '../../helpers';
 import { MappedAppointment } from '../../types';
+import { ConfigObject } from '../../config-schema';
 
 export interface PatientAppointment {
   appointmentKind: string;
@@ -34,6 +35,7 @@ export const useInitialAppointmentFormValue = (
   patientUuid: string,
 ): PatientAppointment => {
   const session = useSession();
+  const { allowAllDayAppointments } = useConfig<ConfigObject>();
 
   // Build the initial form value for the appointment.
   const patientAppointment: PatientAppointment = {
@@ -52,7 +54,7 @@ export const useInitialAppointmentFormValue = (
     patientUuid: appointment?.patientUuid ?? patientUuid,
     visitDate: appointment?.dateTime ? new Date(appointment.dateTime) : new Date(),
     timeFormat: new Date().getHours() >= 12 ? 'PM' : 'AM',
-    isFullDay: true,
+    isFullDay: allowAllDayAppointments,
     day: appointment?.dateTime,
   };
 

package/src/config-schema.ts

@@ -83,6 +83,11 @@ export const configSchema = {
       'Whether to show the Unscheduled Appointments tab. Note that configuring this to true requires a custom unscheduledAppointment endpoint not currently available',
     _default: false,
   },
+  allowAllDayAppointments: {
+    _type: Type.Boolean,
+    _description: 'Whether to allow scheduling of all-day appointments (vs appointments with start time and end time)',
+    _default: true,
+  },
 };
 
 export interface ConfigObject {
@@ -102,4 +107,5 @@ export interface ConfigObject {
   customPatientChartUrl: string;
   patientIdentifierType: string;
   showUnscheduledAppointmentsTab: boolean;
+  allowAllDayAppointments: boolean;
 }