@kenyaemr/esm-ward-app 8.5.1-pre.22 → 8.5.1-pre.25

package/src/config-schema.ts

@@ -270,7 +270,7 @@ export const configSchema: ConfigSchema = {
     _default: '14b36860-5033-4765-b91b-ace856ab64c2',
   },
   admissionEncounterTypeUuid: {
-    _description: "Admission encounter type",
+    _description: 'Admission encounter type',
     _type: Type.String,
     _default: 'e22e39fd-7db2-45e7-80f1-60fa0d5a4378',
   },
@@ -299,6 +299,11 @@ export const configSchema: ConfigSchema = {
     _type: Type.String,
     _default: '98a781d2-b777-4756-b4c9-c9b0deb3483c',
   },
+  mortuaryAdmissionLoctionTagUuid: {
+    _description: 'Mortuary admission location tag uuid',
+    _type: Type.String,
+    _default: '1dbbfe22-d21f-499c-bf33-cc9f75b6c7e8',
+  },
 };
 
 export interface WardConfigObject {
@@ -318,8 +323,9 @@ export interface WardConfigObject {
   referralsConceptUuid: string;
   referringToAnotherFacilityConceptUuid: string;
   dischargeHomeConceptUuid: string;
-  doctorsNoteFormUuid:string
-  inpatientDischargeFormUuid:string
+  doctorsNoteFormUuid: string;
+  inpatientDischargeFormUuid: string;
+  mortuaryAdmissionLoctionTagUuid: string;
 }
 
 export interface PendingItemsElementConfig {

package/src/hooks/useSummaryMetrics.ts

@@ -6,27 +6,40 @@ import { useIpdDischargeEncounter } from './useIpdDischargeEncounter';
 import { useWardPatientGrouping } from './useWardPatientGrouping';
 
 export const useWardsSummaryMetrics = () => {
-  const rep = 'custom:(totalBeds,occupiedBeds,bedLayouts:(patients:(uuid,display)))';
+  const rep = 'custom:(uuid,display,tags:(uuid,display),totalBeds,occupiedBeds,bedLayouts:(patients:(uuid,display)))';
 
   const apiUrl = `${restBaseUrl}/admissionLocation?v=${rep}`;
   const { data = [], isLoading, error } = useOpenmrsFetchAll<AdmissionLocationFetchResponse>(apiUrl);
+  const { mortuaryAdmissionLoctionTagUuid } = useConfig<WardConfigObject>();
+
+  const filteredData = useMemo(() => {
+    if (!mortuaryAdmissionLoctionTagUuid) return data;
+
+    return data.filter((location) => {
+      const hasMortuaryTag = location.ward.tags?.some((tag) => tag.uuid === mortuaryAdmissionLoctionTagUuid);
+      return !hasMortuaryTag;
+    });
+  }, [data, mortuaryAdmissionLoctionTagUuid]);
+
   const totalBeds = useMemo(() => {
-    return data.reduce((prev, curr) => {
+    return filteredData.reduce((prev, curr) => {
       return prev + curr.totalBeds;
     }, 0);
-  }, [data]);
+  }, [filteredData]);
+
   const occupiedBeds = useMemo(() => {
-    return data.reduce((prev, curr) => {
+    return filteredData.reduce((prev, curr) => {
       return prev + curr.occupiedBeds;
     }, 0);
-  }, [data]);
+  }, [filteredData]);
+
   const bedOccupancy = useMemo(() => {
     if (!totalBeds || !occupiedBeds) return `0%`;
     return `${((occupiedBeds / totalBeds) * 100).toFixed(2)}%`;
   }, [totalBeds, occupiedBeds]);
 
   const admittedPatients = useMemo(() => {
-    return data.reduce((prev, curr) => {
+    return filteredData.reduce((prev, curr) => {
       return (
         prev +
         curr.bedLayouts?.reduce((p, c) => {
@@ -34,7 +47,8 @@ export const useWardsSummaryMetrics = () => {
         }, 0)
       );
     }, 0);
-  }, [totalBeds, occupiedBeds, data]);
+  }, [filteredData]);
+
   return {
     totalBeds,
     occupiedBeds,

package/src/ward-view/linelist-wards/LineListTable.tsx

@@ -12,7 +12,7 @@ import {
   TableRow,
   Tile,
 } from '@carbon/react';
-import { ConfigurableLink, ErrorState } from '@openmrs/esm-framework';
+import { ConfigurableLink, ErrorState, useConfig } from '@openmrs/esm-framework';
 import { CardHeader } from '@openmrs/esm-patient-common-lib';
 import { useTranslation } from 'react-i18next';
 import React, { useMemo } from 'react';
@@ -22,6 +22,8 @@ import styles from './linelist-wards.scss';
 import { type AdmissionLocationFetchResponse } from '../../types';
 import { EmptyState } from '../../ward-patients/table-state-components';
 import WardPendingOutCell from './WardPendingOutCell';
+import { type WardConfigObject } from '../../config-schema';
+
 const LineListTable = () => {
   const {
     admissionLocations,
@@ -37,6 +39,17 @@ const LineListTable = () => {
   } = useAdmisiionLocations();
   const { t } = useTranslation();
   const headerTitle = t('wards', 'Wards');
+  const { mortuaryAdmissionLoctionTagUuid } = useConfig<WardConfigObject>();
+
+  const filteredAdmissionLocations = useMemo(() => {
+    if (!mortuaryAdmissionLoctionTagUuid) return admissionLocations;
+
+    return admissionLocations.filter((location) => {
+      const hasMortuaryTag = location.ward.tags?.some((tag) => tag.uuid === mortuaryAdmissionLoctionTagUuid);
+      return !hasMortuaryTag;
+    });
+  }, [admissionLocations, mortuaryAdmissionLoctionTagUuid]);
+
   const headers = [
     { key: 'ward', header: t('wardName', 'Ward Name') },
     { key: 'numberOfBeds', header: t('numberofbeds', 'Number of Beds') },
@@ -46,12 +59,14 @@ const LineListTable = () => {
     { key: 'pendingOut', header: t('pendingOut', 'Pending Out') },
     { key: 'action', header: t('action', 'Action') },
   ];
+
   const calculateOccupancy = (location: AdmissionLocationFetchResponse) => {
     if (!location.totalBeds || !location.occupiedBeds) return 0;
     return (((location.totalBeds - location.occupiedBeds) / location.totalBeds) * 100).toFixed(2);
   };
+
   const tableRows = useMemo(() => {
-    return admissionLocations.map((location) => {
+    return filteredAdmissionLocations.map((location) => {
       const url = '${openmrsSpaBase}/home/ward/${locationUuid}';
 
       return {
@@ -68,19 +83,22 @@ const LineListTable = () => {
         pendingOut: <WardPendingOutCell locationUuid={location.ward.uuid} />,
       };
     });
-  }, [admissionLocations]);
+  }, [filteredAdmissionLocations]);
+
   if (isLoading)
     return (
       <Layer className={styles.tableContainer}>
         <DataTableSkeleton />
       </Layer>
     );
+
   if (error)
     return (
       <Layer className={styles.tableContainer}>
         <ErrorState headerTitle={headerTitle} error={error} />
       </Layer>
     );
+
   return (
     <Tile className={styles.tableContainer}>
       <CardHeader title={headerTitle}>