@kenyaemr/esm-service-queues-app 8.0.1-pre.99 → 8.0.2

package/src/remove-queue-entry-dialog/remove-queue-entry.component.tsx

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Button, ModalBody, ModalFooter, ModalHeader } from '@carbon/react';
 import { parseDate, showSnackbar, useVisit } from '@openmrs/esm-framework';
@@ -20,7 +20,7 @@ const RemoveQueueEntryDialog: React.FC<RemoveQueueEntryDialogProps> = ({ queueEn
 
   const { data: appointments } = useCheckedInAppointments(queueEntry.patientUuid, startOfDay);
 
-  const removeQueueEntry = () => {
+  const removeQueueEntry = useCallback(() => {
     const endCurrentVisitPayload = {
       location: currentVisit?.location?.uuid,
       startDatetime: parseDate(currentVisit?.startDatetime),
@@ -37,25 +37,26 @@ const RemoveQueueEntryDialog: React.FC<RemoveQueueEntryDialogProps> = ({ queueEn
       endCurrentVisitPayload,
       queueEntry.visitUuid,
       appointments,
-    ).then((response) => {
-      closeModal();
-      mutateQueueEntries();
-      showSnackbar({
-        isLowContrast: true,
-        kind: 'success',
-        subtitle: t('queueEntryRemovedSuccessfully', `Queue entry removed successfully`),
-        title: t('queueEntryRemoved', 'Queue entry removed'),
-      });
-      (error) => {
+    )
+      .then(() => {
+        closeModal();
+        mutateQueueEntries();
+        showSnackbar({
+          isLowContrast: true,
+          kind: 'success',
+          subtitle: t('queueEntryRemovedSuccessfully', `Queue entry removed successfully`),
+          title: t('queueEntryRemoved', 'Queue entry removed'),
+        });
+      })
+      .catch((error) => {
         showSnackbar({
           title: t('removeQueueEntryError', 'Error removing queue entry'),
           kind: 'error',
           isLowContrast: false,
           subtitle: error?.message,
         });
-      };
-    });
-  };
+      });
+  }, [appointments, currentVisit, queueEntry]);
 
   return (
     <div>

package/src/remove-queue-entry-dialog/remove-queue-entry.resource.ts

@@ -1,16 +1,14 @@
-import { openmrsFetch, restBaseUrl, updateVisit } from '@openmrs/esm-framework';
 import dayjs from 'dayjs';
-import { endPatientStatus } from '../active-visits/active-visits-table.resource';
-import { type AppointmentsFetchResponse, type EndVisitPayload } from '../types';
 import useSWR from 'swr';
+import { openmrsFetch, restBaseUrl, updateVisit } from '@openmrs/esm-framework';
+import { type AppointmentsFetchResponse, type EndVisitPayload } from '../types';
+import { endPatientStatus } from '../active-visits/active-visits-table.resource';
 import { omrsDateFormat, timeZone } from '../constants';
-import { first } from 'rxjs/operators';
 
 const statusChangeTime = dayjs(new Date()).format(omrsDateFormat);
 
 export async function endQueueEntry(
   queueUuid: string,
-
   queueEntryUuid: string,
   endedAt: Date,
   endCurrentVisitPayload: EndVisitPayload,
@@ -21,31 +19,27 @@ export async function endQueueEntry(
 
   if (endCurrentVisitPayload) {
     if (appointments?.length) {
-      appointments.forEach(async (appointment) => {
-        await Promise.all([changeAppointmentStatus('Completed', appointment.uuid)]);
-      });
+      await Promise.all(
+        appointments.map(async (appointment) => {
+          await changeAppointmentStatus('Completed', appointment.uuid);
+        }),
+      );
     }
 
-    await Promise.all([endPatientStatus(queueUuid, queueEntryUuid, endedAt)]);
+    await endPatientStatus(queueUuid, queueEntryUuid, endedAt);
 
-    return updateVisit(visitUuid, endCurrentVisitPayload, abortController)
-      .pipe(first())
-      .subscribe(
-        (response) => {
-          return response.status;
-        },
-        (error) => {
-          return error;
-        },
-      );
+    try {
+      const response = await updateVisit(visitUuid, endCurrentVisitPayload, abortController);
+      return response.status;
+    } catch (error) {
+      return error;
+    }
   } else {
-    return await Promise.all([endPatientStatus(queueUuid, queueEntryUuid, endedAt)])
-      .then((res) => {
-        return res;
-      })
-      .catch((error) => {
-        return error;
-      });
+    try {
+      return await endPatientStatus(queueUuid, queueEntryUuid, endedAt);
+    } catch (error) {
+      return error;
+    }
   }
 }
 

package/src/routes.json

@@ -40,10 +40,6 @@
       "name": "service-queues-dashboard",
       "slot": "service-queues-dashboard-slot"
     },
-    {
-      "name": "edit-queue-entry-status-modal",
-      "component": "editQueueEntryStatusModal"
-    },
     {
       "name": "patient-info-banner-slot",
       "component": "patientInfoBannerSlot"
@@ -57,51 +53,62 @@
       "component": "clearAllQueueEntries"
     },
     {
-      "name": "add-visit-to-queue-modal",
-      "component": "addVisitToQueueModal"
+      "name": "previous-visit-summary-widget",
+      "component": "pastVisitSummary",
+      "slot": "previous-visit-summary-slot"
     },
+
     {
-      "name": "transition-queue-entry-status-modal",
-      "component": "transitionQueueEntryStatusModal"
+      "name": "active-visits-row-actions",
+      "component": "activeVisitsRowActions",
+      "slot": "queue-table-serve-patient-slot"
     },
     {
-      "name": "previous-visit-summary-widget",
-      "component": "pastVisitSummary",
-      "slot": "previous-visit-summary-slot"
+      "name": "visit-form-queue-fields",
+      "component": "visitFormQueueFields",
+      "slot":"visit-form-queue-slot"
+    }
+  ],
+  "modals": [
+    {
+      "name": "add-visit-to-queue-modal",
+      "component": "addVisitToQueueModal"
     },
     {
       "name": "add-provider-to-room-modal",
       "component": "addProviderToRoomModal"
     },
-    {
-      "name": "transition-queue-entry-modal",
-      "component": "transitionQueueEntryModal"
-    },
     {
       "name": "edit-queue-entry-modal",
       "component": "editQueueEntryModal"
     },
     {
-      "name": "undo-transition-queue-entry-modal",
-      "component": "undoTransitionQueueEntryModal"
-    },
-    {
-      "name": "void-queue-entry-modal",
-      "component": "voidQueueEntryModal"
+      "name": "edit-queue-entry-status-modal",
+      "component": "editQueueEntryStatusModal"
     },
     {
       "name": "end-queue-entry-modal",
       "component": "endQueueEntryModal"
     },
     {
-      "name": "active-visits-row-actions",
-      "component": "activeVisitsRowActions",
-      "slot": "queue-table-serve-patient-slot"
+      "name": "transition-patient-to-latest-queue-modal",
+      "component": "transitionPatientToLatestQueue"
     },
     {
-      "name": "visit-form-queue-fields",
-      "component": "visitFormQueueFields",
-      "slot":"visit-form-queue-slot"
+      "name": "transition-queue-entry-modal",
+      "component": "transitionQueueEntryModal"
+    },
+    {
+      "name": "transition-queue-entry-status-modal",
+      "component": "transitionQueueEntryStatusModal"
+    },
+    {
+      "name": "undo-transition-queue-entry-modal",
+      "component": "undoTransitionQueueEntryModal"
+    },
+    {
+      "name": "void-queue-entry-modal",
+      "component": "voidQueueEntryModal"
     }
   ],
   "workspaces": [

package/src/transition-latest-queue-entry/transition-latest-queue-entry.component.tsx

@@ -0,0 +1,33 @@
+import React, { useEffect } from 'react';
+import { useTranslation } from 'react-i18next';
+import { useLatestQueueEntry } from './transition-latest-queue-entry.resource';
+import TransitionQueueEntryModal from '../queue-table/queue-entry-actions/transition-queue-entry.modal';
+
+interface TransitionLatestQueueEntryProps {
+  patientUuid: string;
+  closeModal: () => void;
+  modalTitle?: string;
+}
+
+const TransitionLatestQueueEntry: React.FC<TransitionLatestQueueEntryProps> = ({
+  closeModal,
+  patientUuid,
+  modalTitle,
+}) => {
+  const { t } = useTranslation();
+  const { data: queueEntry, error, isLoading } = useLatestQueueEntry(patientUuid);
+
+  if (error || !queueEntry) {
+    return null;
+  }
+
+  return (
+    <TransitionQueueEntryModal
+      queueEntry={queueEntry}
+      closeModal={closeModal}
+      modalTitle={t('TransitionLatestQueueEntry', "Transition patient's latest queue")}
+    />
+  );
+};
+
+export default TransitionLatestQueueEntry;

package/src/transition-latest-queue-entry/transition-latest-queue-entry.resource.ts

@@ -0,0 +1,30 @@
+import {
+  type FetchResponse,
+  openmrsFetch,
+  type OpenmrsResource,
+  type Patient,
+  type Visit,
+} from '@openmrs/esm-framework';
+import useSWR from 'swr';
+import useSWRImmutable from 'swr/immutable';
+import { type QueueEntry } from '../types';
+import { FetcherResponse } from 'swr/_internal';
+
+export function useLatestQueueEntry(patientUuid: string) {
+  const customRepresentation =
+    'custom:(uuid,display,queue:(uuid,display,name,location:(uuid,display),service:(uuid,display),allowedPriorities:(uuid,display),allowedStatuses:(uuid,display)),status,patient:(uuid,display),visit:(uuid,display,startDatetime),priority,priorityComment,sortWeight,startedAt,endedAt,locationWaitingFor,queueComingFrom,providerWaitingFor,previousQueueEntry)';
+
+  const encodedRepresentation = encodeURIComponent(customRepresentation);
+  const url = `/ws/rest/v1/queue-entry?v=${encodedRepresentation}&patient=${patientUuid}&isEnded=false`;
+  const { data, error, isLoading, mutate } = useSWR<FetchResponse<{ results: QueueEntry[] }>>(url, openmrsFetch);
+
+  const queueEntry =
+    data?.data?.results?.reduce((latestEntry, currentEntry) => {
+      if (!latestEntry || new Date(currentEntry.startedAt) > new Date(latestEntry.startedAt)) {
+        return currentEntry;
+      }
+      return latestEntry;
+    }, null) || null;
+
+  return { data: queueEntry, error, isLoading, mutate };
+}

package/translations/am.json

@@ -93,7 +93,6 @@
   "gender": "Gender",
   "heartRate": "Heart rate",
   "height": "Height",
-  "home": "Home",
   "hourAndMinuteFormatted": "{{hours}} hour(s) and {{minutes}} minute(s)",
   "idNumber": "ID Number",
   "indication": "Indication",
@@ -162,6 +161,7 @@
   "patientAlreadyInQueue": "Patient is already in the queue",
   "patientAttendingService": "Patient attending service",
   "patientHasActiveVisit": "The patient already has an active visit",
+  "patientInfo": "{{name}}{{sexInfo}}{{ageInfo}}",
   "patientList": "Patient list",
   "patientName": "Patient name",
   "patientNotInQueue": "The patient is not in the queue",
@@ -204,7 +204,7 @@
   "queueEntryTransitionUndoSuccessful": "Queue entry transition undo success",
   "queueEntryUpdateFailed": "Error updating queue entry",
   "queueEntryUpdateSuccessfully": "Queue Entry Updated Successfully",
-  "queueLocation": "Queue Location",
+  "queueLocation": "Queue location",
   "queueLocationRequired": "Queue location is required",
   "queueName": "Queue name",
   "queuePriority": "Queue priority",
@@ -255,7 +255,7 @@
   "serve": "Serve",
   "servePatient": "Serve patient",
   "service": "Service",
-  "serviceIsRequired": "Status is required",
+  "serviceIsRequired": "Service is required",
   "serviceQueue": "Service queue",
   "serviceQueues": "Service queues",
   "sex": "Sex",
@@ -281,6 +281,7 @@
   "today": "Today",
   "totalPatients": "Total Patients",
   "transition": "Transition",
+  "TransitionLatestQueueEntry": "Transition patient to latest queue",
   "transitionPatient": "Transition patient",
   "transitionPatientStatusOrQueue": "Select a new status or queue for patient to transition to.",
   "triageForm": "Triage form",

package/translations/ar.json

@@ -93,7 +93,6 @@
   "gender": "الجنس",
   "heartRate": "معدل ضربات القلب",
   "height": "الطول",
-  "home": "المنزل",
   "hourAndMinuteFormatted": "{{hours}} hour(s) and {{minutes}} minute(s)",
   "idNumber": "رقم الهوية",
   "indication": "الدلالة",
@@ -162,6 +161,7 @@
   "patientAlreadyInQueue": "Patient is already in the queue",
   "patientAttendingService": "المريض الذي يحضر الخدمة",
   "patientHasActiveVisit": "لدى المريض زيارة نشطة بالفعل",
+  "patientInfo": "{{name}}{{sexInfo}}{{ageInfo}}",
   "patientList": "قائمة المرضى",
   "patientName": "اسم المريض",
   "patientNotInQueue": "المريض ليس في الطابور",
@@ -204,7 +204,7 @@
   "queueEntryTransitionUndoSuccessful": "Queue entry transition undo success",
   "queueEntryUpdateFailed": "خطأ في تحديث دخول الطابور",
   "queueEntryUpdateSuccessfully": "تم تحديث دخول الطابور بنجاح",
-  "queueLocation": "موقع الطابور",
+  "queueLocation": "Queue location",
   "queueLocationRequired": "Queue location is required",
   "queueName": "اسم الطابور",
   "queuePriority": "أولوية الطابور",
@@ -213,7 +213,7 @@
   "queueRoomAddFailed": "خطأ في إضافة غرفة الانتظار",
   "queueRoomName": "اسم غرفة الانتظار",
   "queueRoomUpdatedSuccessfully": "تم تحديث غرفة الانتظار بنجاح",
-  "queuesClearedSuccessfully": "تم مسح الطوابير بنجاح",
+  "queuesClearedSuccessfully": "Queues cleared successfully",
   "queueScreen": "شاشة الطابور",
   "queueService": "خدمة الطابور",
   "queueStatus": "حالة الطابور",
@@ -255,7 +255,7 @@
   "serve": "خدمة",
   "servePatient": "خدمة المريض",
   "service": "خدمة",
-  "serviceIsRequired": "Status is required",
+  "serviceIsRequired": "Service is required",
   "serviceQueue": "طابور الخدمة",
   "serviceQueues": "طوابير الخدمة",
   "sex": "الجنس",
@@ -281,6 +281,7 @@
   "today": "اليوم",
   "totalPatients": "Total Patients",
   "transition": "Transition",
+  "TransitionLatestQueueEntry": "Transition patient to latest queue",
   "transitionPatient": "Transition patient",
   "transitionPatientStatusOrQueue": "Select a new status or queue for patient to transition to.",
   "triageForm": "نموذج الترياج",

package/translations/en.json

@@ -83,8 +83,8 @@
   "femaleLabelText": "Female",
   "fields": "of the following fields",
   "filter": "Filter",
-  "filterByService": "Filter by service :",
-  "filterByStatus": "Filter by status :",
+  "filterByService": "Filter by service:",
+  "filterByStatus": "Filter by status:",
   "filterTable": "Filter table",
   "firstName": "First name",
   "firstNameSort": "First name (a-z)",
@@ -93,7 +93,6 @@
   "gender": "Gender",
   "heartRate": "Heart rate",
   "height": "Height",
-  "home": "Home",
   "hourAndMinuteFormatted": "{{hours}} hour(s) and {{minutes}} minute(s)",
   "idNumber": "ID Number",
   "indication": "Indication",
@@ -162,6 +161,7 @@
   "patientAlreadyInQueue": "Patient is already in the queue",
   "patientAttendingService": "Patient attending service",
   "patientHasActiveVisit": "The patient already has an active visit",
+  "patientInfo": "{{name}}{{sexInfo}}{{ageInfo}}",
   "patientList": "Patient list",
   "patientName": "Patient name",
   "patientNotInQueue": "The patient is not in the queue",
@@ -204,7 +204,7 @@
   "queueEntryTransitionUndoSuccessful": "Queue entry transition undo success",
   "queueEntryUpdateFailed": "Error updating queue entry status",
   "queueEntryUpdateSuccessfully": "Queue Entry Updated Successfully",
-  "queueLocation": "Queue Location",
+  "queueLocation": "Queue location",
   "queueLocationRequired": "Queue location is required",
   "queueName": "Queue name",
   "queuePriority": "Queue priority",
@@ -213,8 +213,9 @@
   "queueRoomAddFailed": "Error adding queue room",
   "queueRoomName": "Queue room name",
   "queueRoomUpdatedSuccessfully": "Queue room updated successfully",
-  "queuesClearedSuccessfully": "Queues Cleared Successfully",
+  "queuesClearedSuccessfully": "Queues cleared successfully",
   "queueScreen": "Queue screen",
+  "queueScreenError": "Queue screen error",
   "queueService": "Queue service",
   "queueStatus": "Queue status",
   "recentScheduledVisits_one": "{{count}} visit scheduled for +/- 7 days",
@@ -255,7 +256,7 @@
   "serve": "Serve",
   "servePatient": "Serve patient",
   "service": "Service",
-  "serviceIsRequired": "Status is required",
+  "serviceIsRequired": "Service is required",
   "serviceQueue": "Service queue",
   "serviceQueues": "Service queues",
   "sex": "Sex",
@@ -272,6 +273,7 @@
   "submitting": "Submitting...",
   "success": "Success",
   "temperature": "Temperature",
+  "ticketAnnouncement": "Ticket number: {{prefix}}, - {{suffix}}, please proceed to room {{room}}",
   "ticketNumber": "Ticket Number",
   "time": "Time",
   "timeCannotBeInFuture": "Time cannot be in the future",
@@ -281,6 +283,7 @@
   "today": "Today",
   "totalPatients": "Total Patients",
   "transition": "Transition",
+  "TransitionLatestQueueEntry": "Transition patient to latest queue",
   "transitionPatient": "Transition patient",
   "transitionPatientStatusOrQueue": "Select a new status or queue for patient to transition to.",
   "triageForm": "Triage form",