(feat) O3-2684: Remove hard coded queue entry statuses (#920)

* O3-2684: remove hard coded queue entry statuses
openmrs · Jan 5, 2024 · 724352a · 724352a
1 parent 17b2bb0
commit 724352a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 10 deletions.
diff --git a/packages/esm-service-queues-app/src/active-visits/active-visits-table.component.tsx b/packages/esm-service-queues-app/src/active-visits/active-visits-table.component.tsx
@@ -203,7 +203,7 @@ function ActiveVisitsTable() {
         content: (
           <span className={styles.statusContainer}>
             <StatusIcon status={entry.status.toLowerCase()} />
-            <span>{buildStatusString(entry.status.toLowerCase(), entry.service)}</span>
+            <span>{buildStatusString(entry.status, entry.service)}</span>
           </span>
         ),
       },

diff --git a/packages/esm-service-queues-app/src/active-visits/active-visits-table.test.tsx b/packages/esm-service-queues-app/src/active-visits/active-visits-table.test.tsx
@@ -114,8 +114,8 @@ describe('ActiveVisitsTable: ', () => {
     });
 
     const expectedTableRows = [
-      /Eric Test Ric Not Urgent Waiting For Triage 206 hours and 2 minutes/,
-      /John Smith Emergency Attending Clinical Consultation 206 hours and 2 minutes/,
+      /Eric Test Ric Not Urgent Waiting - Triage 206 hours and 2 minutes/,
+      /John Smith Emergency In Service - Clinical consultation 206 hours and 2 minutes/,
     ];
 
     expectedTableRows.forEach((row) => {

diff --git a/packages/esm-service-queues-app/src/helpers/functions.ts b/packages/esm-service-queues-app/src/helpers/functions.ts
@@ -17,13 +17,7 @@ export const buildStatusString = (status: string, service: string) => {
     return '';
   }
 
-  if (status === 'waiting') {
-    return `${status} for ${service}`;
-  } else if (status === 'in service') {
-    return `Attending ${service}`;
-  } else if (status === 'finished service') {
-    return `Finished ${service}`;
-  }
+  return `${status} - ${service}`;
 };
 
 export const formatWaitTime = (waitTime: string, t) => {