@openmrs/esm-appointments-app 10.0.2 → 10.0.3-pre.2

package/src/metrics/metrics-cards/highest-volume-service.extension.tsx

@@ -1,17 +1,38 @@
-import React from 'react';
+import React, { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
+import { formatDate, parseDate } from '@openmrs/esm-framework';
 import MetricsCard from './metrics-card.component';
 import MetricsErrorCard from './metrics-error-card.component';
-import { useClinicalMetrics } from '../../hooks/useClinicalMetrics';
-import { formatDate, parseDate } from '@openmrs/esm-framework';
-import { useAppointmentsStore } from '../../store';
+import { useAppointmentsAppContext } from '../../hooks/useAppointmentsAppContext';
+import { useSelectedDate } from '../../hooks/useSelectedDate';
 
 export default function HighestVolumeServiceExtension() {
   const { t } = useTranslation();
-  const { highestServiceLoad, error } = useClinicalMetrics();
-  const { selectedDate } = useAppointmentsStore();
+  const { appointmentForSelectedDateFilteredByServiceTypes, error } = useAppointmentsAppContext();
+  const selectedDate = useSelectedDate();
   const formattedStartDate = formatDate(parseDate(selectedDate), { mode: 'standard', time: false });
 
+  const highestServiceLoad = useMemo(() => {
+    const serviceVolumeMap = new Map<string, number>();
+    const serviceNameMap = new Map<string, string>();
+    for (const appointment of appointmentForSelectedDateFilteredByServiceTypes) {
+      const serviceUuid = appointment.service?.uuid;
+      const serviceName = appointment.service?.name;
+      if (serviceUuid && serviceName) {
+        serviceVolumeMap.set(serviceUuid, (serviceVolumeMap.get(serviceUuid) ?? 0) + 1);
+        serviceNameMap.set(serviceUuid, serviceName);
+      }
+    }
+
+    let highestServiceLoad: { serviceUuid: string; serviceName: string; count: number } | null = null;
+    for (const [serviceUuid, count] of serviceVolumeMap.entries()) {
+      if (!highestServiceLoad || count > highestServiceLoad.count) {
+        highestServiceLoad = { serviceUuid, serviceName: serviceNameMap.get(serviceUuid) ?? '', count };
+      }
+    }
+    return highestServiceLoad;
+  }, [appointmentForSelectedDateFilteredByServiceTypes]);
+
   if (error) {
     return <MetricsErrorCard headerLabel={t('highestServiceVolumeCardTitle', 'Highest volume service')} />;
   }

package/src/metrics/metrics-cards/metrics-card.component.tsx

@@ -5,6 +5,7 @@ import { useTranslation } from 'react-i18next';
 import { isEmpty } from 'lodash-es';
 import { useAppointmentsStore } from '../../store';
 import styles from './metrics-card.scss';
+import { useSelectedDate } from '../../hooks/useSelectedDate';
 dayjs.extend(isSameOrBefore);
 
 interface MetricsCardProps {
@@ -16,7 +17,7 @@ interface MetricsCardProps {
 
 const MetricsCard: React.FC<MetricsCardProps> = ({ label, value, headerLabel, count }) => {
   const { t } = useTranslation();
-  const { selectedDate } = useAppointmentsStore();
+  const selectedDate = useSelectedDate();
   const isSelectedDateInPast = useMemo(() => dayjs(selectedDate).isBefore(dayjs(), 'date'), [selectedDate]);
 
   return (

package/src/metrics/metrics-cards/providers-booked.extension.tsx

@@ -1,14 +1,22 @@
-import React from 'react';
-import MetricsCard from './metrics-card.component';
+import React, { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
-import { useAllAppointmentsByDate } from '../../hooks/useClinicalMetrics';
 import { formatDate, parseDate } from '@openmrs/esm-framework';
-import { useAppointmentsStore } from '../../store';
+import MetricsCard from './metrics-card.component';
+import { useAppointmentsAppContext } from '../../hooks/useAppointmentsAppContext';
+import { useSelectedDate } from '../../hooks/useSelectedDate';
 
 export default function ProvidersBookedExtension() {
   const { t } = useTranslation();
-  const { totalProviders } = useAllAppointmentsByDate();
-  const { selectedDate } = useAppointmentsStore();
+  const selectedDate = useSelectedDate();
+  const { appointmentForSelectedDateFilteredByServiceTypes } = useAppointmentsAppContext();
+
+  const totalProviders = useMemo(() => {
+    return appointmentForSelectedDateFilteredByServiceTypes.reduce((providersSet, appointment) => {
+      appointment.providers?.forEach((provider) => providersSet.add(provider.uuid));
+      return providersSet;
+    }, new Set<string>()).size;
+  }, [appointmentForSelectedDateFilteredByServiceTypes]);
+
   const formattedStartDate = formatDate(parseDate(selectedDate), { mode: 'standard', time: false });
 
   return (

package/src/metrics/metrics-cards/scheduled-appointments.extension.tsx

@@ -1,30 +1,34 @@
-import React from 'react';
+import React, { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import MetricsCard from './metrics-card.component';
-import { useScheduledAppointments } from '../../hooks/useClinicalMetrics';
-import { useAppointmentsStore } from '../../store';
-import { useAppointmentList } from '../../hooks/useAppointmentList';
+import { useAppointmentsAppContext } from '../../hooks/useAppointmentsAppContext';
 
+/**
+ * This extension shows the metrics of the number of scheduled appointments for the selected date and services,
+ * showing the total number of appointments (across all status), the number of checked in ones (status == CheckedIn),
+ * and number of not arrived (status == Scheduled).
+ *
+ */
 export default function ScheduledAppointmentsExtension() {
   const { t } = useTranslation();
-  const { appointmentServiceTypes } = useAppointmentsStore();
+  const { appointmentForSelectedDateFilteredByServiceTypes } = useAppointmentsAppContext();
 
-  const { appointmentList: arrivedAppointments } = useAppointmentList('CheckedIn');
-  const { appointmentList: pendingAppointments } = useAppointmentList('Scheduled');
+  const totalScheduledAppointments = appointmentForSelectedDateFilteredByServiceTypes.length;
 
-  const { totalScheduledAppointments } = useScheduledAppointments(appointmentServiceTypes);
+  const count = useMemo(() => {
+    const arrivedAppointments = appointmentForSelectedDateFilteredByServiceTypes.filter(
+      ({ status }) => status === 'CheckedIn',
+    );
+    const pendingAppointments = appointmentForSelectedDateFilteredByServiceTypes.filter(
+      ({ status }) => status === 'Scheduled',
+    );
 
-  const filteredArrivedAppointments = appointmentServiceTypes
-    ? arrivedAppointments.filter(({ service }) => appointmentServiceTypes.includes(service.uuid))
-    : arrivedAppointments;
-
-  const filteredPendingAppointments = appointmentServiceTypes
-    ? pendingAppointments.filter(({ service }) => appointmentServiceTypes.includes(service.uuid))
-    : pendingAppointments;
+    return { pendingAppointments, arrivedAppointments };
+  }, [appointmentForSelectedDateFilteredByServiceTypes]);
 
   return (
     <MetricsCard
-      count={{ pendingAppointments: filteredPendingAppointments, arrivedAppointments: filteredArrivedAppointments }}
+      count={count}
       headerLabel={t('scheduledAppointments', 'Scheduled appointments')}
       label={t('appointments', 'Appointments')}
       value={totalScheduledAppointments}

package/src/metrics/metrics-container.component.tsx

@@ -3,11 +3,7 @@ import { ExtensionSlot } from '@openmrs/esm-framework';
 import MetricsHeader from './metrics-header.component';
 import styles from './metrics-container.scss';
 
-interface AppointmentMetricsProps {
-  appointmentServiceTypes: Array<string>;
-}
-
-const AppointmentsMetrics: React.FC<AppointmentMetricsProps> = ({ appointmentServiceTypes }) => {
+const AppointmentsMetrics: React.FC<{}> = () => {
   return (
     <>
       <MetricsHeader />

package/src/metrics/metrics-header.component.tsx

@@ -6,15 +6,15 @@ import { Calendar, Hospital } from '@carbon/react/icons';
 import { Button } from '@carbon/react';
 import { isDesktop, navigate, useLayoutType } from '@openmrs/esm-framework';
 import { spaHomePage } from '../constants';
-import { useAppointmentsStore } from '../store';
 import styles from './metrics-header.scss';
 import { launchCreateAppointmentForm } from '../helpers';
+import { useSelectedDate } from '../hooks/useSelectedDate';
 
 dayjs.extend(isToday);
 
 const MetricsHeader: React.FC = () => {
   const { t } = useTranslation();
-  const { selectedDate } = useAppointmentsStore();
+  const selectedDate = useSelectedDate();
   const layout = useLayoutType();
   const responsiveSize = isDesktop(layout) ? 'sm' : 'md';
 

package/src/patient-appointments/patient-appointments-detailed-summary.extension.tsx

@@ -100,7 +100,7 @@ const PatientAppointmentsDetailedSummary: React.FC<PatientAppointmentsDetailProp
             <Button
               kind="ghost"
               renderIcon={(props) => <AddIcon size={16} {...props} />}
-              iconDescription="Add Appointments"
+              iconDescription={t('addAppointments', 'Add Appointments')}
               onClick={() => handleLaunchAppointmentForm(patientUuid)}>
               {t('add', 'Add')}
             </Button>

package/src/patient-appointments/patient-upcoming-appointments-card.component.tsx

@@ -14,7 +14,7 @@ import {
 import { ErrorCard, formatDate, parseDate, showSnackbar, type Visit } from '@openmrs/esm-framework';
 import { changeAppointmentStatus, usePatientAppointments } from './patient-appointments.resource';
 import { type Appointment } from '../types';
-import { useMutateAppointments } from '../form/appointments-form.resource';
+import { useMutateAppointments } from '../hooks/useMutateAppointments';
 import styles from './patient-upcoming-appointments-card.scss';
 
 interface VisitFormCallbacks {
@@ -47,7 +47,6 @@ const PatientUpcomingAppointmentsCard: React.FC<PatientUpcomingAppointmentsProps
   const headerTitle = t('upcomingAppointments', 'Upcoming appointments');
   const [selectedAppointment, setSelectedAppointment] = useState<Appointment>(null);
   const { mutateAppointments } = useMutateAppointments();
-  const memoMutateAppointments = useMemo(() => mutateAppointments, [mutateAppointments]);
 
   const ac = useMemo<AbortController>(() => new AbortController(), []);
   useEffect(() => () => ac.abort(), [ac]);
@@ -59,7 +58,7 @@ const PatientUpcomingAppointmentsCard: React.FC<PatientUpcomingAppointmentsProps
         if (selectedAppointment) {
           return changeAppointmentStatus('CheckedIn', selectedAppointment.uuid)
             .then(() => {
-              memoMutateAppointments();
+              mutateAppointments();
               showSnackbar({
                 isLowContrast: true,
                 kind: 'success',
@@ -80,7 +79,7 @@ const PatientUpcomingAppointmentsCard: React.FC<PatientUpcomingAppointmentsProps
         }
       },
     }),
-    [selectedAppointment, memoMutateAppointments, t],
+    [selectedAppointment, mutateAppointments, t],
   );
 
   useEffect(() => {

package/src/routes.json

@@ -1,7 +1,8 @@
 {
   "$schema": "https://json.openmrs.org/routes.schema.json",
   "backendDependencies": {
-    "webservices.rest": ">=2.2.0"
+    "webservices.rest": ">=2.2.0",
+    "appointments": ">=2.0.0"
   },
   "extensions": [
     {
@@ -41,31 +42,6 @@
       "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"
@@ -79,7 +55,7 @@
         "columns": 1,
         "columnSpan": 1,
         "hideDashboardTitle": true,
-        "path": "Appointments",
+        "path": "appointments",
         "slot": "patient-chart-appointments-dashboard-slot",
         "title": "Appointments"
       }

package/src/store.ts

@@ -1,46 +1,29 @@
-import { createGlobalStore, isOmrsDateStrict, useStore } from '@openmrs/esm-framework';
-import dayjs from 'dayjs';
-import { omrsDateFormat } from './constants';
+import { type Actions, createGlobalStore, useStoreWithActions } from '@openmrs/esm-framework';
+import { type AppointmentStatus } from './types';
 
-export const appointmentsStore = createGlobalStore('appointments-app', {
-  appointmentServiceTypes: getFromLocalStorage('openmrs:appointments:serviceTypes') || [],
-  selectedDate: dayjs().startOf('day').format(omrsDateFormat),
-});
-
-export function useAppointmentsStore() {
-  return useStore(appointmentsStore);
-}
-
-export function setAppointmentServiceTypes(serviceTypes: Array<string>) {
-  appointmentsStore.setState({ appointmentServiceTypes: serviceTypes });
-}
-
-export function setSelectedDate(date: string) {
-  if (!isOmrsDateStrict(date)) {
-    console.warn(
-      'esm-appointments-app: setSelectedDate called with incorrectly formatted date. Should be omrsDateFormat string. Received:',
-      date,
-    );
-  }
-  appointmentsStore.setState({ selectedDate: date });
+interface AppointmentsStore {
+  appointmentServiceTypes: Array<string>;
+  selectedAppointmentStatuses: Array<AppointmentStatus>;
 }
 
-/* Set up localStorage serialization */
+export const appointmentsStore = createGlobalStore<AppointmentsStore>(
+  'appointments-app',
+  {
+    appointmentServiceTypes: [],
+    selectedAppointmentStatuses: [],
+  },
+  'sessionStorage',
+);
+
+export const storeActions = {
+  setAppointmentServiceTypes(_, appointmentServiceTypes: Array<string>) {
+    return { appointmentServiceTypes };
+  },
+  setSelectedAppointmentStatuses(_, selectedAppointmentStatuses: Array<AppointmentStatus>) {
+    return { selectedAppointmentStatuses };
+  },
+} satisfies Actions<AppointmentsStore>;
 
-let lastValueOfAppointmentServiceTypes = getFromLocalStorage('openmrs:appointments:serviceTypes');
-
-function getFromLocalStorage(key: string) {
-  const value = localStorage.getItem(key);
-  return value ? JSON.parse(value) : undefined;
-}
-
-function setInLocalStorage(key: string, value: any) {
-  localStorage.setItem(key, JSON.stringify(value));
+export function useAppointmentsStore() {
+  return useStoreWithActions(appointmentsStore, storeActions);
 }
-
-appointmentsStore.subscribe(({ appointmentServiceTypes }) => {
-  if (lastValueOfAppointmentServiceTypes !== appointmentServiceTypes) {
-    setInLocalStorage('openmrs:appointments:serviceTypes', appointmentServiceTypes);
-    lastValueOfAppointmentServiceTypes = appointmentServiceTypes;
-  }
-});

package/src/types/index.ts

@@ -14,6 +14,7 @@ export interface AppointmentLocation {
 }
 
 // note that the API supports two other statuses that we are not currently supporting: "Requested" and "WaitList"
+// Translation keys for these enum values are in src/constants.ts (scanned by extract-translations)
 export enum AppointmentStatus {
   SCHEDULED = 'Scheduled',
   CANCELLED = 'Cancelled',
@@ -184,3 +185,9 @@ export interface RecurringAppointmentsPayload {
 export interface PatientDetails {
   dateOfBirth: string;
 }
+
+export interface AppointmentsAppContext {
+  appointmentForSelectedDateFilteredByServiceTypes: Array<Appointment>;
+  isLoading: boolean;
+  error: any;
+}

package/src/workload/monthly-view-workload/monthly-view.component.tsx

@@ -3,10 +3,10 @@ import dayjs from 'dayjs';
 import { useTranslation } from 'react-i18next';
 import { formatDate } from '@openmrs/esm-framework';
 import { monthDays } from '../../helpers';
-import { useAppointmentsStore } from '../../store';
 import DaysOfWeekCard from '../../calendar/monthly/days-of-week.component';
 import MonthlyWorkloadCard from './monthlyWorkCard';
 import styles from './monthly-workload.scss';
+import { useSelectedDate } from '../../hooks/useSelectedDate';
 
 interface MonthlyCalendarViewProps {
   calendarWorkload: Array<{ count: number; date: string }>;
@@ -20,7 +20,7 @@ const MonthlyCalendarView: React.FC<MonthlyCalendarViewProps> = ({
   onDateClick,
 }) => {
   const { t } = useTranslation();
-  const { selectedDate } = useAppointmentsStore();
+  const selectedDate = useSelectedDate();
   const daysInWeek = ['SUN', 'MON', 'TUE', 'WED', 'THUR', 'FRI', 'SAT'];
   const monthViewDate = dateToDisplay === '' ? selectedDate : dateToDisplay;
   const daysInWeeks = daysInWeek.map((day) => t(day));

package/src/workload/workload.component.tsx

@@ -1,5 +1,5 @@
 import React, { useState } from 'react';
-import { useAppointmentService } from '../form/appointments-form.resource';
+import { useAppointmentServices } from '../hooks/useAppointmentService';
 import { useCalendarDistribution, useMonthlyCalendarDistribution } from './workload.resource';
 import MonthlyCalendarView from './monthly-view-workload/monthly-view.component';
 import styles from './workload.scss';
@@ -11,8 +11,8 @@ interface WorkloadProps {
 }
 
 const Workload: React.FC<WorkloadProps> = ({ selectedService, appointmentDate, onWorkloadDateChange }) => {
-  const { data: services } = useAppointmentService();
-  const serviceUuid = services?.find((service) => service.name === selectedService)?.uuid;
+  const { serviceTypes } = useAppointmentServices();
+  const serviceUuid = serviceTypes?.find((service) => service.name === selectedService)?.uuid;
 
   const [selectedTab, setSelectedTab] = useState(0);
 

package/src/workload/workload.resource.ts

@@ -15,7 +15,7 @@ export const getMonthlyCalendarDistribution = (startDate: Date, appointmentCount
   for (let i = 0; i <= 35; i++) {
     distributionHashTable.set(dayjs(startDate).add(i, 'day').format('YYYY-MM-DD'), 0);
   }
-  appointmentCount.map(({ date, count }) => {
+  appointmentCount.forEach(({ date, count }) => {
     if (distributionHashTable.has(date)) {
       distributionHashTable.set(date, count);
     }

package/translations/am.json

@@ -2,6 +2,7 @@
   "action": "Action",
   "actions": "Actions",
   "add": "Add",
+  "addAppointments": "Add Appointments",
   "age": "Age",
   "allDay": "All day",
   "appointment": "Appointment",
@@ -9,6 +10,8 @@
   "appointmentCancelled": "Appointment Cancelled",
   "appointmentCancelledSuccessfully": "Appointment cancelled successfully",
   "appointmentCheckedIn": "Appointment Checked In",
+  "appointmentCheckedInWithExistingVisit": "Appointment checked in using existing active visit",
+  "appointmentCheckInFailed": "An error occurred while checking in the appointment",
   "appointmentConflict": "Appointment conflict",
   "appointmentDate": "Appointment date",
   "appointmentDisplay": "<0>{{patientName}}</0> - {{serviceName}} - {{currentStatus}}",
@@ -31,7 +34,7 @@
   "appointments_lower": "appointments",
   "appointmentsCalendar": "Appointments calendar",
   "appointmentScheduled": "Appointment scheduled",
-  "appointmentsScheduledForToday": "appointments scheduled for today",
+  "appointmentsForDate": "Appointments for: {{date}}",
   "appointmentsTable": "Appointments table",
   "appointmentStatus": "Appointment status",
   "appointmentsUpdated": "Appointments updated",
@@ -48,19 +51,22 @@
   "cancelAppointment": "Cancel Appointment",
   "cancelAppointmentModalConfirmationText": "Are you sure you want to cancel this appointment?",
   "cancelled": "Cancelled",
+  "Cancelled": "Cancelled",
   "changeAppointmentsStatus": "Change appointments status",
   "changeStatus": "Change status",
   "changeStatusForSelectedAppointments": "Change the status for the following appointments.",
   "checkedIn": "Checked in",
-  "checkedOut": "Checked out",
+  "CheckedIn": "Checked in",
   "checkFilters": "Check the filters above",
   "checkIn": "Check In",
+  "checkInFailed": "Check-in failed",
   "checkOut": "Check out",
   "chooseAppointmentType": "Choose appointment type",
   "chooseLocation": "Choose a location",
   "chooseProvider": "Choose a provider",
   "chooseService": "Select service",
   "completed": "Completed",
+  "Completed": "Completed",
   "Contact": "Contact {{index}}",
   "countMore_one": "{{count}} more",
   "countMore_other": "{{count}} more",
@@ -71,24 +77,25 @@
   "dateAppointmentScheduled": "Date appointment scheduled",
   "dateOfBirth": "Date of birth",
   "dateRange": "Set date range",
-  "dateTime": "Date & Time",
+  "dateTime": "Appointment time",
   "day": "Day",
   "daysOfWeek": "Days of the week",
   "discard": "Discard",
   "download": "Download",
   "durationErrorMessage": "Duration should be greater than zero",
   "durationInMinutes": "Duration (minutes)",
+  "early": "Early",
   "edit": "Edit",
   "editAppointment": "Edit appointment",
   "endAppointmentAndVisitConfirmationMessage": "Checking the patient out will mark the appointment as complete, and close out the active visit for this patient.",
   "endAppointmentConfirmation": "Are you sure you want to check the patient out for this appointment?",
   "endAppointmentConfirmationMessage": "Checking the patient out will mark the appointment as complete.",
-  "expected": "Expected",
   "failedToEndActiveVisit": "Failed to end active visit for {{patient}}",
   "failedToLoadMetrics": "Failed to load",
   "failedToUpdateVisit": "Failed to update visit",
   "filterAppointments": "Filter appointments",
   "filterAppointmentsByServiceType": "Filter appointments by service type",
+  "filterAppointmentsByStatus": "Filter appointments by status",
   "filterTable": "Filter table",
   "FRI": "FRI",
   "gender": "Gender",
@@ -104,6 +111,7 @@
   "markAppointmentAsCompletedMessage": "Marking appointment as completed will end the active visit of the patient",
   "metricLoadErrorMessage": "Please contact your system administrator if the problem persists.",
   "missed": "Missed",
+  "Missed": "Missed",
   "MON": "MON",
   "next": "Next",
   "nextMonth": "Next month",
@@ -112,7 +120,6 @@
   "noAppointmentsToDisplay": "No appointments to display",
   "noContent": "No Content",
   "noCurrentAppointments": "There are no appointments scheduled for today to display for this patient",
-  "noMatchingAppointments": "No matching appointments found",
   "noPastAppointments": "There are no past appointments to display for this patient",
   "notArrived": "Not arrived",
   "note": "Note",
@@ -139,6 +146,7 @@
   "saveAndClose": "Save and close",
   "saving": "Saving",
   "scheduled": "Scheduled",
+  "Scheduled": "Scheduled",
   "scheduledAppointments": "Scheduled appointments",
   "scheduledForToday": "Scheduled For Today",
   "selectALocation": "Select a location",
@@ -157,7 +165,7 @@
   "THUR": "THUR",
   "time": "Time",
   "today": "Today",
-  "todays": "Today's",
+  "todaysAppointment": "Today's Appointments",
   "TUE": "TUE",
   "type": "Type",
   "unknownError": "An unknown error occurred",
@@ -167,6 +175,7 @@
   "upcoming": "Upcoming",
   "upcomingAppointments": "Upcoming appointments",
   "updateError": "Error updating upcoming appointment",
+  "visitStartTime": "Visit start time",
   "WED": "WED",
   "week": "Week",
   "yes": "Yes"

package/translations/ar.json

@@ -2,6 +2,7 @@
   "action": "الإجراء",
   "actions": "الإجراءات",
   "add": "إضافة",
+  "addAppointments": "Add Appointments",
   "age": "العمر",
   "allDay": "كل اليوم",
   "appointment": "Appointment",
@@ -9,6 +10,8 @@
   "appointmentCancelled": "تم إلغاء الموعد",
   "appointmentCancelledSuccessfully": "تم إلغاء الموعد بنجاح",
   "appointmentCheckedIn": "Appointment Checked In",
+  "appointmentCheckedInWithExistingVisit": "Appointment checked in using existing active visit",
+  "appointmentCheckInFailed": "An error occurred while checking in the appointment",
   "appointmentConflict": "تعارض بالمواعيد",
   "appointmentDate": "Appointment date",
   "appointmentDisplay": "<0>{{patientName}}</0> - {{serviceName}} - {{currentStatus}}",
@@ -31,7 +34,7 @@
   "appointments_lower": "مواعيد",
   "appointmentsCalendar": "جدول المواعيد",
   "appointmentScheduled": "تم جدولة الموعد",
-  "appointmentsScheduledForToday": "المواعيد المقررة لهذا اليوم",
+  "appointmentsForDate": "Appointments for: {{date}}",
   "appointmentsTable": "جدول المواعيد",
   "appointmentStatus": "Appointment status",
   "appointmentsUpdated": "Appointments updated",
@@ -48,19 +51,22 @@
   "cancelAppointment": "إلغاء الموعد",
   "cancelAppointmentModalConfirmationText": "هل أنت متأكد أنك تريد إلغاء هذا الموعد؟",
   "cancelled": "تم الإلغاء",
+  "Cancelled": "Cancelled",
   "changeAppointmentsStatus": "Change appointments status",
   "changeStatus": "Change status",
   "changeStatusForSelectedAppointments": "Change the status for the following appointments.",
   "checkedIn": "تم تسجيل الوصول",
-  "checkedOut": "تم تسجيل الخروج",
+  "CheckedIn": "Checked in",
   "checkFilters": "Check the filters above",
   "checkIn": "تسجيل الوصول",
+  "checkInFailed": "Check-in failed",
   "checkOut": "تسجيل الخروج",
   "chooseAppointmentType": "Choose appointment type",
   "chooseLocation": "Choose a location",
   "chooseProvider": "Choose a provider",
   "chooseService": "اختر الخدمة",
   "completed": "مكتمل",
+  "Completed": "Completed",
   "Contact": "Contact {{index}}",
   "countMore_one": "{{count}} more",
   "countMore_other": "{{count}} more",
@@ -71,24 +77,25 @@
   "dateAppointmentScheduled": "Date appointment scheduled",
   "dateOfBirth": "تاريخ الميلاد",
   "dateRange": "Set date range",
-  "dateTime": "Date & Time",
+  "dateTime": "Appointment time",
   "day": "Day",
   "daysOfWeek": "Days of the week",
   "discard": "تجاهل",
   "download": "تحميل",
   "durationErrorMessage": "Duration should be greater than zero",
   "durationInMinutes": "Duration (minutes)",
+  "early": "Early",
   "edit": "Edit",
   "editAppointment": "Edit appointment",
   "endAppointmentAndVisitConfirmationMessage": "Checking the patient out will mark the appointment as complete, and close out the active visit for this patient.",
   "endAppointmentConfirmation": "Are you sure you want to check the patient out for this appointment?",
   "endAppointmentConfirmationMessage": "Checking the patient out will mark the appointment as complete.",
-  "expected": "Expected",
   "failedToEndActiveVisit": "Failed to end active visit for {{patient}}",
   "failedToLoadMetrics": "Failed to load",
   "failedToUpdateVisit": "Failed to update visit",
   "filterAppointments": "Filter appointments",
   "filterAppointmentsByServiceType": "Filter appointments by service type",
+  "filterAppointmentsByStatus": "Filter appointments by status",
   "filterTable": "Filter table",
   "FRI": "FRI",
   "gender": "الجنس",
@@ -104,6 +111,7 @@
   "markAppointmentAsCompletedMessage": "Marking appointment as completed will end the active visit of the patient",
   "metricLoadErrorMessage": "Please contact your system administrator if the problem persists.",
   "missed": "فائت",
+  "Missed": "Missed",
   "MON": "MON",
   "next": "Next",
   "nextMonth": "Next month",
@@ -112,7 +120,6 @@
   "noAppointmentsToDisplay": "لا توجد مواعيد لعرضها",
   "noContent": "No Content",
   "noCurrentAppointments": "لا توجد مواعيد مجدولة لهذا المريض اليوم",
-  "noMatchingAppointments": "No matching appointments found",
   "noPastAppointments": "لا توجد مواعيد سابقة لعرضها لهذا المريض\"",
   "notArrived": "لم يصل",
   "note": "Note",
@@ -139,6 +146,7 @@
   "saveAndClose": "حفظ وإغلاق",
   "saving": "Saving",
   "scheduled": "مجدول",
+  "Scheduled": "Scheduled",
   "scheduledAppointments": "المواعيد المجدولة",
   "scheduledForToday": "مجدول لليوم",
   "selectALocation": "Select a location",
@@ -157,7 +165,7 @@
   "THUR": "THUR",
   "time": "الوقت",
   "today": "اليوم",
-  "todays": "Today's",
+  "todaysAppointment": "Today's Appointments",
   "TUE": "TUE",
   "type": "Type",
   "unknownError": "An unknown error occurred",
@@ -167,6 +175,7 @@
   "upcoming": "القادمة",
   "upcomingAppointments": "المواعيد القادمة",
   "updateError": "Error updating upcoming appointment",
+  "visitStartTime": "Visit start time",
   "WED": "WED",
   "week": "Week",
   "yes": "نعم"