@kenyaemr/esm-service-queues-app 8.1.1-pre.114 → 8.1.1-pre.118

package/src/queue-screen/queue-screen.component.tsx

@@ -1,31 +1,87 @@
-import React from 'react';
+import React, { useState, useEffect, useCallback, useMemo } from 'react';
 import { DataTableSkeleton } from '@carbon/react';
 import { useTranslation } from 'react-i18next';
 import { useActiveTickets } from './useActiveTickets';
 import PatientQueueHeader from '../patient-queue-header/patient-queue-header.component';
 import styles from './queue-screen.scss';
+import { useSelectedQueueLocationUuid } from '../helpers/helpers';
+import { ErrorState } from '@openmrs/esm-framework';
 
 interface QueueScreenProps {}
 
 const QueueScreen: React.FC<QueueScreenProps> = () => {
-  const { t } = useTranslation();
-  const { activeTickets, isLoading, error } = useActiveTickets();
+  const { t, i18n } = useTranslation();
+  const { activeTickets, isLoading, error, mutate } = useActiveTickets();
+  const [isSpeaking, setIsSpeaking] = useState(false);
+  const selectedLocation = useSelectedQueueLocationUuid();
+
+  const rowData = useMemo(
+    () =>
+      activeTickets.map((ticket, index) => ({
+        id: `${index}`,
+        room: ticket.room,
+        ticketNumber: ticket.ticketNumber,
+        status: ticket.status,
+      })),
+    [activeTickets],
+  );
+
+  const readTicket = useCallback(
+    (queue) => {
+      if ('speechSynthesis' in window) {
+        window.speechSynthesis.cancel();
+
+        const message = new SpeechSynthesisUtterance();
+        const [prefix, suffix] = queue.ticketNumber.split('-');
+        const utterance = t(
+          'ticketAnnouncement',
+          'Ticket number: {{prefix}}, - {{suffix}}, please proceed to room {{room}}',
+          {
+            prefix: prefix.split(''),
+            suffix: suffix.split(''),
+            room: queue.room,
+          },
+        );
+        message.rate = 1;
+        message.pitch = 1;
+        message.text = utterance;
+        message.lang = i18n.language;
+
+        return new Promise<void>((resolve) => {
+          message.onend = () => resolve();
+          window.speechSynthesis.speak(message);
+        });
+      }
+      return Promise.resolve();
+    },
+    [i18n.language, t],
+  );
+
+  useEffect(() => {
+    const ticketsToCallOut = activeTickets.filter((item) => item.status.toLowerCase() === 'calling');
+
+    if (ticketsToCallOut.length > 0 && !isSpeaking) {
+      setIsSpeaking(true);
+      const readTickets = async () => {
+        for (const ticket of ticketsToCallOut) {
+          await readTicket(ticket);
+        }
+        setIsSpeaking(false);
+        mutate?.();
+      };
+
+      readTickets();
+    }
+  }, [activeTickets, isSpeaking, readTicket, mutate]);
 
   if (isLoading) {
     return <DataTableSkeleton row={5} className={styles.queueScreen} role="progressbar" />;
   }
 
   if (error) {
-    return <div>Error</div>;
+    return <ErrorState error={error} headerTitle={t('queueScreenError', 'Queue screen error')} />;
   }
 
-  const rowData = activeTickets.map((ticket, index) => ({
-    id: `${index}}`,
-    room: ticket.room,
-    ticketNumber: ticket.ticketNumber,
-    status: ticket.status,
-  }));
-
   return (
     <div>
       <PatientQueueHeader title={t('queueScreen', 'Queue screen')} showLocationDropdown />

package/src/queue-screen/queue-screen.test.tsx

@@ -26,7 +26,7 @@ describe('QueueScreen component', () => {
       mutate: jest.fn(),
     });
     render(<QueueScreen />);
-    expect(screen.getByText('Error')).toBeInTheDocument();
+    expect(screen.getByText(/Error State/i)).toBeInTheDocument();
   });
 
   test('renders table with active tickets when data is loaded', () => {

package/src/queue-screen/useActiveTickets.tsx

@@ -5,7 +5,7 @@ export const useActiveTickets = () => {
   const { data, isLoading, error, mutate } = useSWR<{ data: Record<string, { status: string; ticketNumber: string }> }>(
     `${restBaseUrl}/queueutil/active-tickets`,
     openmrsFetch,
-    { refreshInterval: 3000 },
+    { refreshInterval: 30000 },
   );
   const activeTickets =
     Array.from(Object.entries(data?.data ?? {}).map(([key, value]) => ({ room: key, ...value }))) ?? [];

package/src/queue-table/cells/columns.resource.ts

@@ -83,9 +83,9 @@ export function useColumns(queue: string, status: string): QueueTableColumn[] {
 }
 
 function getColumnFromDefinition(t: TFunction, columnDef: ColumnDefinition): QueueTableColumn {
-  const { id, header, headerI18nModule, columnType } = columnDef;
+  const { id, header, columnType } = columnDef;
 
-  const translatedHeader = header ? translateFrom(headerI18nModule ?? '@openmrs/esm-service-queues-app', header) : null;
+  const translatedHeader = header ? t(header) : null;
 
   switch (columnType ?? id) {
     case 'patient-name': {

package/src/queue-table/queue-entry-actions/transition-queue-entry.modal.tsx

@@ -8,16 +8,21 @@ import { convertTime12to24 } from '../../helpers/time-helpers';
 interface TransitionQueueEntryModalProps {
   queueEntry: QueueEntry;
   closeModal: () => void;
+  modalTitle?: string;
 }
 
-const TransitionQueueEntryModal: React.FC<TransitionQueueEntryModalProps> = ({ queueEntry, closeModal }) => {
+const TransitionQueueEntryModal: React.FC<TransitionQueueEntryModalProps> = ({
+  queueEntry,
+  closeModal,
+  modalTitle,
+}) => {
   const { t } = useTranslation();
   return (
     <QueueEntryActionModal
       queueEntry={queueEntry}
       closeModal={closeModal}
       modalParams={{
-        modalTitle: t('transitionPatient', 'Transition patient'),
+        modalTitle: modalTitle || t('transitionPatient', 'Transition patient'),
         modalInstruction: t(
           'transitionPatientStatusOrQueue',
           'Select a new status or queue for patient to transition to.',

package/src/routes.json

@@ -77,6 +77,10 @@
       "name": "transition-queue-entry-modal",
       "component": "transitionQueueEntryModal"
     },
+    {
+      "name": "transition-patient-to-latest-queue-modal",
+      "component": "transitionPatientToLatestQueue"
+    },
     {
       "name": "edit-queue-entry-modal",
       "component": "editQueueEntryModal"

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

@@ -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",