From 2d15566d54962110c156cee0e67e270c0b8ae66b Mon Sep 17 00:00:00 2001 From: CynthiaKamau Date: Thu, 6 Jul 2023 12:25:39 +0300 Subject: [PATCH] (feat) Remove filtering todays queue entries on frontend (#752) --- .../src/active-visits/active-visits-table.resource.ts | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) 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 index 005c39533..3829b9a14 100644 --- 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 @@ -253,9 +253,7 @@ export function useVisitQueueEntries(currServiceName: string, locationUuid: stri ?.map(mapVisitQueueEntryProperties) .filter((data) => dayjs(data.visitStartDateTime).isToday()); } else { - mappedVisitQueueEntries = data?.data?.results - ?.map(mapVisitQueueEntryProperties) - .filter((data) => data.service === currServiceName && dayjs(data.visitStartDateTime).isToday()); + mappedVisitQueueEntries = data?.data?.results?.map(mapVisitQueueEntryProperties); } return { @@ -349,9 +347,7 @@ export function useServiceQueueEntries(service: string, locationUuid: string) { patientUuid: visitQueueEntry.queueEntry ? visitQueueEntry?.queueEntry.uuid : '--', }); - const mappedServiceQueueEntries = data?.data?.results - ?.map(mapServiceQueueEntryProperties) - .filter(({ returnDate }) => dayjs(returnDate).isToday()); + const mappedServiceQueueEntries = data?.data?.results?.map(mapServiceQueueEntryProperties); return { serviceQueueEntries: mappedServiceQueueEntries ? mappedServiceQueueEntries : [],