O3-2381 Patient Queue filter(drop-down) on service queues doesn't fil…

…ter the table based on the service selected
openmrs · Aug 31, 2023 · 7ebf1b7 · 7ebf1b7
1 parent dc68fe9
commit 7ebf1b7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/packages/esm-outpatient-app/src/active-visits/active-visits-table.component.tsx b/packages/esm-outpatient-app/src/active-visits/active-visits-table.component.tsx
@@ -332,9 +332,10 @@ function ActiveVisitsTable() {
           rows={tableRows}
           size="xs"
           useZebraStyles>
-          {({ rows, headers, getHeaderProps, getTableProps, getRowProps, onInputChange }) => (
+          {({ rows, headers, getHeaderProps, getTableProps, getRowProps, getToolbarProps, onInputChange }) => (
             <TableContainer className={styles.tableContainer}>
               <TableToolbar
+                {...getToolbarProps()}
                 style={{ position: 'static', height: '3rem', overflow: 'visible', backgroundColor: 'color' }}>
                 <TableToolbarContent className={styles.toolbarContent}>
                   <div className={styles.filterContainer}>

diff --git a/packages/esm-outpatient-app/src/active-visits/active-visits-table.resource.ts b/packages/esm-outpatient-app/src/active-visits/active-visits-table.resource.ts
@@ -254,11 +254,11 @@ export function useVisitQueueEntries(currServiceName: string, locationUuid: stri
   let mappedVisitQueueEntries;
 
   if (!currServiceName || currServiceName == t('all', 'All')) {
+    mappedVisitQueueEntries = data?.data?.results?.map(mapVisitQueueEntryProperties);
+  } else {
     mappedVisitQueueEntries = data?.data?.results
       ?.map(mapVisitQueueEntryProperties)
-      .filter((data) => dayjs(data.visitStartDateTime).isToday());
-  } else {
-    mappedVisitQueueEntries = data?.data?.results?.map(mapVisitQueueEntryProperties);
+      .filter((data) => data.service == currServiceName);
   }
 
   return {

diff --git a/packages/esm-outpatient-app/src/patient-queue-metrics/clinic-metrics.component.tsx b/packages/esm-outpatient-app/src/patient-queue-metrics/clinic-metrics.component.tsx
@@ -29,7 +29,7 @@ function ClinicMetrics() {
   const { allServices } = useServices(currentQueueLocation ?? queueLocations?.[0]?.id);
   const currentServiceUuid = useSelectedServiceUuid();
   const currentServiceName = useSelectedServiceName();
-  const { serviceCount } = useServiceMetricsCount(currentServiceName, currentQueueLocation);
+  const { serviceCount } = useServiceMetricsCount(currentServiceName, currentQueueLocation ?? queueLocations?.[0]?.id);
   const [initialSelectedItem, setInitialSelectItem] = useState(() => {
     if (currentServiceName && currentServiceUuid) {
       return false;