@openmrs/esm-ward-app 9.2.1-pre.7385 → 9.2.1-pre.7405

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"webservices.rest":">=2.2.0","emrapi":">=2.0.0 <4.0.0"},"optionalBackendDependencies":{"bedmanagement":{"version":"^6.0.0 || 6.0.0-SNAPSHOT","feature":{"flagName":"bedmanagement-module","label":"Ward App Patient Service","description":"This module, if installed, provides services for managing patients admitted to the ward."}}},"extensions":[{"name":"ward-dashboard-link","component":"wardDashboardLink","slot":"homepage-dashboard-slot","meta":{"name":"ward","slot":"ward-dashboard-slot","title":"Wards"}},{"component":"root","name":"ward-dashboard","slot":"ward-dashboard-slot"},{"component":"wardView","name":"ward-view","slot":"ward-view-slot"},{"component":"wardPatientActionButtonExtension","name":"ward-patient-action-button","slot":"action-menu-ward-patient-items-slot"},{"component":"coloredObsTagCardRowExtension","name":"colored-obs-tags-card-row","slot":"ward-patient-card-slot"},{"name":"patient-discharge-siderail-button","slot":"action-menu-ward-patient-items-slot","component":"patientDischargeWorkspaceSideRailIcon"},{"component":"defaultWardView","name":"default-ward","slot":"default-ward"},{"component":"maternalWardView","name":"maternal-ward","slot":"maternal-ward"},{"component":"wardPatientWorkspaceBanner","name":"ward-patient-workspace-banner","slot":"ward-workspace-patient-banner-slot"}],"workspaces2":[{"name":"admission-requests-workspace","component":"admissionRequestWorkspace","window":"pending-admissions"},{"name":"transfer-elsewhere-workspace","component":"patientTransferRequestWorkspace","window":"pending-admissions"},{"name":"cancel-admission-request-workspace","component":"cancelAdmissionRequestWorkspace","window":"pending-admissions"},{"name":"admit-patient-form-workspace","component":"admitPatientFormWorkspace","window":"pending-admissions"},{"name":"ward-app-patient-search-workspace","component":"@openmrs/esm-patient-search-app#patientSearchWorkspace2","window":"add-patient-to-ward"},{"name":"ward-app-start-visit-workspace","component":"@openmrs/esm-patient-chart-app#exportedVisitForm","window":"add-patient-to-ward"},{"name":"create-admission-encounter-workspace","component":"createAdmissionEncounterWorkspace","window":"add-patient-to-ward"},{"name":"ward-patient-workspace","component":"wardPatientWorkspace","window":"ward-patient"},{"name":"ward-patient-vitals-workspace","component":"@openmrs/esm-patient-vitals-app#exportedVitalsBiometricsFormWorkspace","window":"ward-patient"},{"name":"ward-patient-notes-workspace","component":"wardPatientNotesWorkspace","window":"ward-patient-notes"},{"name":"ward-patient-transfer-swap-workspace","component":"patientTransferAndSwapWorkspace","window":"ward-patient-transfer-swap"},{"name":"patient-discharge-workspace","component":"patientDischargeWorkspace","window":"ward-patient-discharge"},{"name":"ward-patient-clinical-forms-workspace","component":"@openmrs/esm-patient-forms-app#exportedClinicalFormsWorkspace","window":"ward-patient-clinical-forms"},{"name":"ward-patient-form-entry-workspace","component":"@openmrs/esm-patient-forms-app#exportedPatientFormEntryWorkspace","window":"ward-patient-clinical-forms"},{"name":"ward-patient-cancel-admission-request-workspace","component":"wardPatientCancelAdmissionRequestWorkspace","window":"ward-patient-cancel-admission-request"},{"name":"ward-patient-order-basket-workspace","component":"@openmrs/esm-patient-orders-app#exportedOrderBasketWorkspace","window":"ward-patient-order-basket"},{"name":"ward-patient-order-basket-add-drug-order-workspace","component":"@openmrs/esm-patient-medications-app#exportedAddDrugOrderWorkspace","window":"ward-patient-order-basket"},{"name":"ward-patient-order-basket-add-lab-order-workspace","component":"@openmrs/esm-patient-tests-app#exportedAddLabOrderWorkspace","window":"ward-patient-order-basket"},{"name":"ward-patient-order-basket-add-general-order-workspace","component":"@openmrs/esm-patient-orders-app#exportedOrderBasketWorkspace","window":"ward-patient-order-basket"}],"workspaceWindows2":[{"name":"pending-admissions","group":"ward-manage-admissions","icon":"admissionRequestsWorkspaceSideRailIcon","width":"wider"},{"name":"add-patient-to-ward","group":"ward-manage-admissions","icon":"createAdmissionEncounterWorkspaceSideRailIcon"},{"name":"ward-patient","group":"ward-patient","icon":"wardPatientActionButton","width":"wider"},{"name":"ward-patient-notes","group":"ward-patient","icon":"wardPatientNotesActionButton"},{"name":"ward-patient-transfer-swap","group":"ward-patient","icon":"patientTransferAndSwapWorkspaceSiderailIcon"},{"name":"ward-patient-discharge","group":"ward-patient","icon":"patientDischargeWorkspaceSideRailIcon"},{"name":"ward-patient-clinical-forms","group":"ward-patient","icon":"clinicalFormWorkspaceSideRailIcon"},{"name":"ward-patient-order-basket","group":"ward-patient","icon":"orderBasketWorkspaceSideRailIcon"},{"name":"ward-patient-cancel-admission-request","group":"ward-patient"}],"workspaceGroups2":[{"name":"ward-manage-admissions","overlay":true,"persistence":"closable"},{"name":"ward-patient","overlay":true,"persistence":"closable"}],"version":"9.2.1-pre.7385"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"webservices.rest":">=2.2.0","emrapi":">=2.0.0 <4.0.0"},"optionalBackendDependencies":{"bedmanagement":{"version":"^6.0.0 || 6.0.0-SNAPSHOT","feature":{"flagName":"bedmanagement-module","label":"Ward App Patient Service","description":"This module, if installed, provides services for managing patients admitted to the ward."}}},"extensions":[{"name":"ward-dashboard-link","component":"wardDashboardLink","slot":"homepage-dashboard-slot","meta":{"name":"ward","slot":"ward-dashboard-slot","title":"Wards"}},{"component":"root","name":"ward-dashboard","slot":"ward-dashboard-slot"},{"component":"wardView","name":"ward-view","slot":"ward-view-slot"},{"component":"wardPatientActionButtonExtension","name":"ward-patient-action-button","slot":"action-menu-ward-patient-items-slot"},{"component":"coloredObsTagCardRowExtension","name":"colored-obs-tags-card-row","slot":"ward-patient-card-slot"},{"name":"patient-discharge-siderail-button","slot":"action-menu-ward-patient-items-slot","component":"patientDischargeWorkspaceSideRailIcon"},{"component":"defaultWardView","name":"default-ward","slot":"default-ward"},{"component":"maternalWardView","name":"maternal-ward","slot":"maternal-ward"},{"component":"wardPatientWorkspaceBanner","name":"ward-patient-workspace-banner","slot":"ward-workspace-patient-banner-slot"}],"workspaces2":[{"name":"admission-requests-workspace","component":"admissionRequestWorkspace","window":"pending-admissions"},{"name":"transfer-elsewhere-workspace","component":"patientTransferRequestWorkspace","window":"pending-admissions"},{"name":"cancel-admission-request-workspace","component":"cancelAdmissionRequestWorkspace","window":"pending-admissions"},{"name":"admit-patient-form-workspace","component":"admitPatientFormWorkspace","window":"pending-admissions"},{"name":"ward-app-patient-search-workspace","component":"@openmrs/esm-patient-search-app#patientSearchWorkspace2","window":"add-patient-to-ward"},{"name":"ward-app-start-visit-workspace","component":"@openmrs/esm-patient-chart-app#exportedVisitForm","window":"add-patient-to-ward"},{"name":"create-admission-encounter-workspace","component":"createAdmissionEncounterWorkspace","window":"add-patient-to-ward"},{"name":"ward-patient-workspace","component":"wardPatientWorkspace","window":"ward-patient"},{"name":"ward-patient-vitals-workspace","component":"@openmrs/esm-patient-vitals-app#exportedVitalsBiometricsFormWorkspace","window":"ward-patient"},{"name":"ward-patient-notes-workspace","component":"wardPatientNotesWorkspace","window":"ward-patient-notes"},{"name":"ward-patient-transfer-swap-workspace","component":"patientTransferAndSwapWorkspace","window":"ward-patient-transfer-swap"},{"name":"patient-discharge-workspace","component":"patientDischargeWorkspace","window":"ward-patient-discharge"},{"name":"ward-patient-clinical-forms-workspace","component":"@openmrs/esm-patient-forms-app#exportedClinicalFormsWorkspace","window":"ward-patient-clinical-forms"},{"name":"ward-patient-form-entry-workspace","component":"@openmrs/esm-patient-forms-app#exportedPatientFormEntryWorkspace","window":"ward-patient-clinical-forms"},{"name":"ward-patient-cancel-admission-request-workspace","component":"wardPatientCancelAdmissionRequestWorkspace","window":"ward-patient-cancel-admission-request"},{"name":"ward-patient-order-basket-workspace","component":"@openmrs/esm-patient-orders-app#exportedOrderBasketWorkspace","window":"ward-patient-order-basket"},{"name":"ward-patient-order-basket-add-drug-order-workspace","component":"@openmrs/esm-patient-medications-app#exportedAddDrugOrderWorkspace","window":"ward-patient-order-basket"},{"name":"ward-patient-order-basket-add-lab-order-workspace","component":"@openmrs/esm-patient-tests-app#exportedAddLabOrderWorkspace","window":"ward-patient-order-basket"},{"name":"ward-patient-order-basket-add-general-order-workspace","component":"@openmrs/esm-patient-orders-app#exportedOrderBasketWorkspace","window":"ward-patient-order-basket"}],"workspaceWindows2":[{"name":"pending-admissions","group":"ward-manage-admissions","icon":"admissionRequestsWorkspaceSideRailIcon","width":"wider"},{"name":"add-patient-to-ward","group":"ward-manage-admissions","icon":"createAdmissionEncounterWorkspaceSideRailIcon"},{"name":"ward-patient","group":"ward-patient","icon":"wardPatientActionButton","width":"wider"},{"name":"ward-patient-notes","group":"ward-patient","icon":"wardPatientNotesActionButton"},{"name":"ward-patient-transfer-swap","group":"ward-patient","icon":"patientTransferAndSwapWorkspaceSiderailIcon"},{"name":"ward-patient-discharge","group":"ward-patient","icon":"patientDischargeWorkspaceSideRailIcon"},{"name":"ward-patient-clinical-forms","group":"ward-patient","icon":"clinicalFormWorkspaceSideRailIcon"},{"name":"ward-patient-order-basket","group":"ward-patient","icon":"orderBasketWorkspaceSideRailIcon"},{"name":"ward-patient-cancel-admission-request","group":"ward-patient"}],"workspaceGroups2":[{"name":"ward-manage-admissions","overlay":true,"persistence":"closable"},{"name":"ward-patient","overlay":true,"persistence":"closable"}],"version":"9.2.1-pre.7405"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-ward-app",
-  "version": "9.2.1-pre.7385",
+  "version": "9.2.1-pre.7405",
   "description": "Ward and bed management module for O3",
   "browser": "dist/openmrs-esm-ward-app.js",
   "main": "src/index.ts",

package/src/types/index.ts

@@ -230,6 +230,17 @@ export interface WardMetrics {
   patients: string;
   freeBeds: string;
   totalBeds: string;
+  femalesOfReproductiveAge?: string; // used in Maternal Ward View
+  newborns?: string; // used in Maternal Ward View
+}
+
+export enum WardMetricType {
+  PATIENTS = 'patients',
+  FREE_BEDS = 'freeBeds',
+  TOTAL_BEDS = 'totalBeds',
+  PENDING_OUT = 'pendingOut',
+  FEMALE_OF_REPRODUCTIVE_AGE = 'femalesOfReproductiveAge',
+  NEWBORNS = 'newborns',
 }
 
 export interface EncounterPayload {

package/src/utils.ts

@@ -0,0 +1,15 @@
+import { type Patient } from '@openmrs/esm-framework';
+
+// TODO: potentially move these rules into config so they can be customized and defined in a centralized place
+
+export function filterNewborns(patients: Patient[]) {
+  return patients.filter((patient) => patient.person.age < 1);
+}
+
+export function filterReproductiveAge(patients: Patient[]) {
+  return patients.filter((patient) => patient.person.age >= 10);
+}
+
+export function filterFemale(patients: Patient[]) {
+  return patients.filter((patient) => patient.person.gender === 'F');
+}

package/src/ward-view/default-ward/default-ward-view.component.tsx

@@ -8,6 +8,7 @@ import DefaultWardPendingPatients from './default-ward-pending-patients.componen
 import DefaultWardUnassignedPatients from './default-ward-unassigned-patients.component';
 import Ward from '../ward.component';
 import WardViewHeader from '../../ward-view-header/ward-view-header.component';
+import WardMetrics from '../../ward-view-header/ward-metrics.component';
 
 const DefaultWardView = () => {
   const wardPatientGroupDetails = useWardPatientGrouping();
@@ -17,12 +18,13 @@ const DefaultWardView = () => {
   });
 
   const wardBeds = <DefaultWardBeds />;
+  const wardMetrics = <WardMetrics />;
   const wardUnassignedPatients = <DefaultWardUnassignedPatients />;
   const wardPendingPatients = <DefaultWardPendingPatients />;
 
   return (
     <>
-      <WardViewHeader {...{ wardPendingPatients }} />
+      <WardViewHeader {...{ wardPendingPatients, wardMetrics }} />
       <Ward {...{ wardBeds, wardUnassignedPatients }} />
     </>
   );

package/src/ward-view/materal-ward/maternal-ward-view.component.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { useDefineAppContext } from '@openmrs/esm-framework';
 import { useWardPatientGrouping } from '../../hooks/useWardPatientGrouping';
-import { type MaternalWardViewContext, type WardViewContext } from '../../types';
+import { type MaternalWardViewContext, WardMetricType, type WardViewContext } from '../../types';
 import { useMotherChildrenRelationshipsByPatient } from './maternal-ward-view.resource';
 import MaternalWardBeds from './maternal-ward-beds.component';
 import MaternalWardPatientCardHeader from './maternal-ward-patient-card-header.component';
@@ -9,6 +9,7 @@ import MaternalWardPendingPatients from './maternal-ward-pending-patients.compon
 import MaternalWardUnassignedPatients from './maternal-ward-unassigned-patients.component';
 import Ward from '../ward.component';
 import WardViewHeader from '../../ward-view-header/ward-view-header.component';
+import WardMetrics from '../../ward-view-header/ward-metrics.component';
 
 const MaternalWardView = () => {
   const wardPatientGroupDetails = useWardPatientGrouping();
@@ -24,12 +25,24 @@ const MaternalWardView = () => {
   });
 
   const wardBeds = <MaternalWardBeds {...motherChildRelationships} />;
+  const wardMetrics = (
+    <WardMetrics
+      metrics={[
+        WardMetricType.PATIENTS,
+        WardMetricType.FEMALE_OF_REPRODUCTIVE_AGE,
+        WardMetricType.NEWBORNS,
+        WardMetricType.FREE_BEDS,
+        WardMetricType.TOTAL_BEDS,
+        WardMetricType.PENDING_OUT,
+      ]}
+    />
+  );
   const wardUnassignedPatients = <MaternalWardUnassignedPatients />;
   const wardPendingPatients = <MaternalWardPendingPatients />;
 
   return (
     <>
-      <WardViewHeader {...{ wardPendingPatients }} />
+      <WardViewHeader {...{ wardPendingPatients, wardMetrics }} />
       <Ward {...{ wardBeds, wardUnassignedPatients }} />
     </>
   );

package/src/ward-view/ward-view.resource.test.ts

@@ -0,0 +1,140 @@
+import { createAndGetWardPatientGrouping, getWardMetrics } from './ward-view.resource';
+import { type AdmissionLocationFetchResponse, type InpatientAdmission, type WardPatientGroupDetails } from '../types';
+import type { Location } from '@openmrs/esm-framework';
+
+describe('Ward View Resource', () => {
+  const patient1 = {
+    uuid: 'patient-uuid-1',
+    person: {
+      uuid: 'some-person-uuid-1',
+      age: 24,
+      gender: 'F',
+    },
+  };
+
+  const patient2 = {
+    uuid: 'patient-uuid-2',
+    person: {
+      uuid: 'some-person-uuid-2',
+      age: 0.5,
+      gender: 'M',
+    },
+  };
+
+  const currentWardLocation: Location = {
+    uuid: 'some-location-uuid',
+  };
+
+  const inpatientAdmissionsAtCurrentLocation: InpatientAdmission[] = [
+    {
+      patient: patient1,
+      visit: undefined,
+      encounterAssigningToCurrentInpatientLocation: undefined,
+      firstAdmissionOrTransferEncounter: undefined,
+      currentInpatientRequest: undefined,
+      currentInpatientLocation: currentWardLocation,
+    },
+    {
+      patient: patient2,
+      visit: undefined,
+      encounterAssigningToCurrentInpatientLocation: undefined,
+      firstAdmissionOrTransferEncounter: undefined,
+      currentInpatientRequest: undefined,
+      currentInpatientLocation: currentWardLocation,
+    },
+  ];
+
+  const admissionLocationFetchResponse: AdmissionLocationFetchResponse = {
+    bedLayouts: [
+      {
+        rowNumber: 1,
+        columnNumber: 1,
+        bedNumber: '1',
+        bedId: 1,
+        bedUuid: 'some-bed-uuid',
+        status: 'OCCUPIED',
+        bedType: undefined,
+        location: '',
+        patients: [patient1],
+        bedTagMaps: [],
+      },
+    ],
+    occupiedBeds: 1,
+    totalBeds: 1,
+    ward: currentWardLocation,
+  };
+
+  describe('createAndGetWardPatientGrouping', () => {
+    it('should handle null data', () => {
+      const wardPatientGrouping = createAndGetWardPatientGrouping(null, null, null, null, null);
+      expect(wardPatientGrouping.allWardPatientUuids.size).toBe(0);
+    });
+    it('should include inpatient admissions at current location when counting total patients', () => {
+      const wardPatientGrouping = createAndGetWardPatientGrouping(
+        inpatientAdmissionsAtCurrentLocation,
+        null,
+        null,
+        null,
+        null,
+      );
+      expect(wardPatientGrouping.allWardPatientUuids.size).toBe(2);
+    });
+    it('should return admitted patient with bed', () => {
+      const wardPatientGrouping = createAndGetWardPatientGrouping(
+        inpatientAdmissionsAtCurrentLocation,
+        admissionLocationFetchResponse,
+        null,
+        null,
+        currentWardLocation,
+      );
+      expect(wardPatientGrouping.wardAdmittedPatientsWithBed.size).toBe(1);
+      expect(wardPatientGrouping.wardAdmittedPatientsWithBed.has('patient-uuid-1')).toBeTruthy();
+    });
+    it('should return admitted patient without bed', () => {
+      const wardPatientGrouping = createAndGetWardPatientGrouping(
+        inpatientAdmissionsAtCurrentLocation,
+        admissionLocationFetchResponse,
+        null,
+        null,
+        currentWardLocation,
+      );
+      expect(wardPatientGrouping.wardUnassignedPatientsList.length).toBe(1);
+      expect(wardPatientGrouping.wardUnassignedPatientsList.at(0).patient.uuid).toBe('patient-uuid-2');
+    });
+  });
+
+  describe('getWardMetrics', () => {
+    const createAndGetWardPatientGroupingResults = createAndGetWardPatientGrouping(
+      inpatientAdmissionsAtCurrentLocation,
+      admissionLocationFetchResponse,
+      null,
+      null,
+      currentWardLocation,
+    );
+    const wardPatientGrouping: WardPatientGroupDetails = {
+      allWardPatientUuids: createAndGetWardPatientGroupingResults.allWardPatientUuids,
+      bedLayouts: createAndGetWardPatientGroupingResults.bedLayouts,
+      inpatientAdmissionsByPatientUuid: createAndGetWardPatientGroupingResults.inpatientAdmissionsByPatientUuid,
+      wardAdmittedPatientsWithBed: createAndGetWardPatientGroupingResults.wardAdmittedPatientsWithBed,
+      wardPatientPendingCount: createAndGetWardPatientGroupingResults.wardPatientPendingCount,
+      wardUnadmittedPatientsWithBed: createAndGetWardPatientGroupingResults.wardUnadmittedPatientsWithBed,
+      wardUnassignedPatientsList: createAndGetWardPatientGroupingResults.wardUnassignedPatientsList,
+      inpatientRequestResponse: undefined,
+      inpatientAdmissionResponse: undefined,
+      admissionLocationResponse: undefined,
+      isLoading: false,
+      async mutate(): Promise<void> {
+        return Promise.resolve(undefined);
+      },
+    };
+
+    it('should return metrics', () => {
+      const metrics = getWardMetrics(wardPatientGrouping);
+      expect(metrics.patients).toBe('2');
+      expect(metrics.freeBeds).toBe('0');
+      expect(metrics.totalBeds).toBe('1');
+      expect(metrics.newborns).toBe('1');
+      expect(metrics.femalesOfReproductiveAge).toBe('1');
+    });
+  });
+});

package/src/ward-view/ward-view.resource.ts

@@ -21,6 +21,7 @@ import type {
   WardPatientGroupDetails,
 } from '../types';
 import { useTranslation } from 'react-i18next';
+import { filterFemale, filterNewborns, filterReproductiveAge } from '../utils';
 
 // the server side has 2 slightly incompatible types for Bed
 export function bedLayoutToBed(bedLayout: BedLayout): Bed {
@@ -46,14 +47,25 @@ export function filterBeds(admissionLocation: AdmissionLocationFetchResponse): B
   return bedLayouts;
 }
 
-export function getWardMetrics(bedLayouts: BedLayout[], wardPatientGroup: WardPatientGroupDetails): WardMetrics {
-  const patients = wardPatientGroup?.totalPatientsCount ?? 0;
-  const totalBeds = bedLayouts?.length ?? 0;
-  const occupiedBeds = bedLayouts?.filter((bed) => bed.patients?.length > 0).length ?? 0;
+export function getWardMetrics(wardPatientGroup: WardPatientGroupDetails): WardMetrics {
+  // pull all the patients out of the three constructs they are stored in: unadmitted but in a bed, admitted and in a bed, and admitted but not in a bed
+  const allPatients = [
+    ...wardPatientGroup.wardUnadmittedPatientsWithBed?.values(),
+    ...[...wardPatientGroup.wardAdmittedPatientsWithBed?.values()].map((admission) => admission.patient),
+    ...wardPatientGroup.wardUnassignedPatientsList?.map((admission) => admission.patient),
+  ];
+
+  const patientCount = allPatients?.length ?? 0;
+  const newborns = filterNewborns(allPatients)?.length ?? 0;
+  const femalesOfReproductiveAge = filterReproductiveAge(filterFemale(allPatients))?.length ?? 0;
+  const totalBeds = wardPatientGroup.bedLayouts?.length ?? 0;
+  const occupiedBeds = wardPatientGroup.bedLayouts?.filter((bed) => bed.patients?.length > 0).length ?? 0;
   return {
-    patients: patients.toString(),
+    patients: patientCount.toString(),
     freeBeds: (totalBeds - occupiedBeds).toString(),
     totalBeds: totalBeds.toString(),
+    newborns: newborns.toString(), // used by maternal ward only
+    femalesOfReproductiveAge: femalesOfReproductiveAge.toString(), // used by maternal ward only
   };
 }
 
@@ -110,9 +122,6 @@ export function createAndGetWardPatientGrouping(
       );
     }) ?? [];
 
-  //excluding inpatientRequests
-  const totalPatientsCount = allWardPatientUuids.size;
-
   for (const inpatientRequest of inpatientRequests ?? []) {
     // TODO: inpatientRequest is undefined sometimes, why?
     if (inpatientRequest) {
@@ -127,7 +136,6 @@ export function createAndGetWardPatientGrouping(
     bedLayouts,
     wardUnassignedPatientsList,
     allWardPatientUuids,
-    totalPatientsCount,
     inpatientAdmissionsByPatientUuid,
   };
 }
@@ -142,19 +150,10 @@ export function getWardMetricNameTranslation(name: string, t: TFunction) {
       return t('totalBeds', 'Total beds');
     case 'pendingOut':
       return t('pendingOut', 'Pending out');
-  }
-}
-
-export function getWardMetricValueTranslation(name: string, t: TFunction, value: string) {
-  switch (name) {
-    case 'patients':
-      return t('patientsMetricValue', '{{ metricValue }}', { metricValue: value });
-    case 'freeBeds':
-      return t('freeBedsMetricValue', '{{ metricValue }}', { metricValue: value });
-    case 'totalBeds':
-      return t('totalBedsMetricValue', '{{ metricValue }}', { metricValue: value });
-    case 'pendingOut':
-      return t('pendingOutMetricValue', '{{ metricValue }}', { metricValue: value });
+    case 'femalesOfReproductiveAge':
+      return t('mothers', 'Mothers');
+    case 'newborns':
+      return t('infants', 'Infants');
   }
 }
 

package/src/ward-view-header/ward-metrics.component.tsx

@@ -1,22 +1,22 @@
 import { showNotification, useAppContext, useFeatureFlag } from '@openmrs/esm-framework';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
-import type { WardViewContext } from '../types';
-import {
-  getWardMetricNameTranslation,
-  getWardMetrics,
-  getWardMetricValueTranslation,
-} from '../ward-view/ward-view.resource';
+import { WardMetricType, type WardViewContext } from '../types';
+import { getWardMetricNameTranslation, getWardMetrics } from '../ward-view/ward-view.resource';
 import WardMetric from './ward-metric.component';
-import styles from './ward-metrics.scss';
+import styles from '../ward-view/ward-metrics.scss';
 
-const wardMetrics = [{ name: 'patients' }, { name: 'freeBeds' }, { name: 'totalBeds' }];
+interface WardMetricsProps {
+  metrics?: WardMetricType[];
+}
 
-const WardMetrics = () => {
+const WardMetrics: React.FC<WardMetricsProps> = ({
+  metrics = [WardMetricType.PATIENTS, WardMetricType.FREE_BEDS, WardMetricType.TOTAL_BEDS, WardMetricType.PENDING_OUT],
+}) => {
   const { t } = useTranslation();
   const isBedManagementModuleInstalled = useFeatureFlag('bedmanagement-module');
   const { wardPatientGroupDetails } = useAppContext<WardViewContext>('ward-view-context') ?? {};
-  const { admissionLocationResponse, inpatientAdmissionResponse, inpatientRequestResponse, bedLayouts } =
+  const { admissionLocationResponse, inpatientAdmissionResponse, inpatientRequestResponse } =
     wardPatientGroupDetails || {};
   const { isLoading, error } = admissionLocationResponse ?? {};
   const isDataLoading =
@@ -33,43 +33,64 @@ const WardMetrics = () => {
     });
   }
 
-  const wardMetricValues = getWardMetrics(bedLayouts, wardPatientGroupDetails);
+  const wardMetricValues = getWardMetrics(wardPatientGroupDetails);
   return (
     <div className={styles.metricsContainer}>
-      {isBedManagementModuleInstalled ? (
-        wardMetrics.map((wardMetric) => {
-          return (
-            <WardMetric
-              metricName={getWardMetricNameTranslation(wardMetric.name, t)}
-              metricValue={getWardMetricValueTranslation(wardMetric.name, t, wardMetricValues[wardMetric.name])}
-              isLoading={!!isLoading || !!isDataLoading}
-              key={wardMetric.name}
-            />
-          );
-        })
-      ) : (
+      {metrics.includes(WardMetricType.PATIENTS) && (
         <WardMetric
           metricName={getWardMetricNameTranslation('patients', t)}
-          metricValue={'--'}
+          metricValue={wardMetricValues['patients']}
           isLoading={false}
           key={'patients'}
         />
       )}
+      {metrics.includes(WardMetricType.FEMALE_OF_REPRODUCTIVE_AGE) &&
+        wardMetricValues['femalesOfReproductiveAge'] &&
+        wardMetricValues['femalesOfReproductiveAge'] !== '0' && (
+          <WardMetric
+            metricName={getWardMetricNameTranslation('femalesOfReproductiveAge', t)}
+            metricValue={wardMetricValues['femalesOfReproductiveAge']}
+            isLoading={!!isLoading || !!isDataLoading}
+            key={'femalesOfReproductiveAge'}
+          />
+        )}
+      {metrics.includes(WardMetricType.NEWBORNS) &&
+        wardMetricValues['newborns'] &&
+        wardMetricValues['newborns'] !== '0' && (
+          <WardMetric
+            metricName={getWardMetricNameTranslation('newborns', t)}
+            metricValue={wardMetricValues['newborns']}
+            isLoading={!!isLoading || !!isDataLoading}
+            key={'newborns'}
+          />
+        )}
       {isBedManagementModuleInstalled && (
-        <WardMetric
-          metricName={getWardMetricNameTranslation('pendingOut', t)}
-          metricValue={
-            error
-              ? '--'
-              : getWardMetricValueTranslation(
-                  'pendingOut',
-                  t,
-                  wardPatientGroupDetails?.wardPatientPendingCount?.toString(),
-                )
-          }
-          isLoading={!!isDataLoading}
-          key="pending"
-        />
+        <>
+          {metrics.includes(WardMetricType.FREE_BEDS) && (
+            <WardMetric
+              metricName={getWardMetricNameTranslation('freeBeds', t)}
+              metricValue={wardMetricValues['freeBeds']}
+              isLoading={!!isLoading || !!isDataLoading}
+              key={'freeBeds'}
+            />
+          )}
+          {metrics.includes(WardMetricType.TOTAL_BEDS) && (
+            <WardMetric
+              metricName={getWardMetricNameTranslation('totalBeds', t)}
+              metricValue={wardMetricValues['totalBeds']}
+              isLoading={!!isLoading || !!isDataLoading}
+              key={'totalBeds'}
+            />
+          )}
+          {metrics.includes(WardMetricType.PENDING_OUT) && (
+            <WardMetric
+              metricName={getWardMetricNameTranslation('pendingOut', t)}
+              metricValue={wardPatientGroupDetails?.wardPatientPendingCount?.toString()}
+              isLoading={!!isDataLoading}
+              key="pending"
+            />
+          )}
+        </>
       )}
     </div>
   );

package/src/ward-view-header/ward-metrics.test.tsx

@@ -1,29 +1,29 @@
 import { useAppContext } from '@openmrs/esm-framework';
 import { screen } from '@testing-library/react';
 import React from 'react';
-import { renderWithSwr } from '../../../../tools/test-utils';
+import { renderWithSwr } from 'tools';
 import { mockWardViewContext } from '../../mock';
-import { type WardViewContext } from '../types';
-import { getWardMetrics } from '../ward-view/ward-view.resource';
+import { WardMetricType, type WardViewContext } from '../types';
 import WardMetrics from './ward-metrics.component';
 
-const wardMetrics = [
-  { name: 'patients', key: 'patients', defaultTranslation: 'Patients' },
-  { name: 'freeBeds', key: 'freeBeds', defaultTranslation: 'Free beds' },
-  { name: 'totalBeds', key: 'totalBeds', defaultTranslation: 'Total beds' },
-];
-
 jest.mocked(useAppContext<WardViewContext>).mockReturnValue(mockWardViewContext);
 
 describe('Ward Metrics', () => {
-  it('Should display metrics of in the ward ', () => {
-    const mockWardPatientGroupDetails = mockWardViewContext.wardPatientGroupDetails;
-    const { bedLayouts } = mockWardPatientGroupDetails;
-    const bedMetrics = getWardMetrics(bedLayouts, mockWardPatientGroupDetails);
+  it('Should display standard metrics by default', () => {
     renderWithSwr(<WardMetrics />);
-    for (let [key, value] of Object.entries(bedMetrics)) {
-      const fieldName = wardMetrics.find((metric) => metric.name == key)?.defaultTranslation;
-      expect(screen.getByText(fieldName!)).toBeInTheDocument();
-    }
+    expect(screen.getByText('Patients')).toBeInTheDocument();
+    expect(screen.getByText('Free beds')).toBeInTheDocument();
+    expect(screen.getByText('Total beds')).toBeInTheDocument();
+    expect(screen.getByText('Pending out')).toBeInTheDocument();
+    expect(screen.queryByText('Mothers')).not.toBeInTheDocument();
+    expect(screen.queryByText('Infants')).not.toBeInTheDocument();
+  });
+  it('Should display extra metrics when configured', () => {
+    renderWithSwr(<WardMetrics metrics={[WardMetricType.FEMALE_OF_REPRODUCTIVE_AGE]} />);
+    expect(screen.getByText('Mothers')).toBeInTheDocument();
+    expect(screen.queryByText('Patients')).not.toBeInTheDocument();
+    expect(screen.queryByText('Free beds')).not.toBeInTheDocument();
+    expect(screen.queryByText('Total beds')).not.toBeInTheDocument();
+    expect(screen.queryByText('Pending out')).not.toBeInTheDocument();
   });
 });

package/src/ward-view-header/ward-view-header.component.tsx

@@ -2,19 +2,19 @@ import React, { type ReactNode } from 'react';
 import styles from './ward-view-header.scss';
 import AdmissionRequestsBar from './admission-requests-bar.component';
 import useWardLocation from '../hooks/useWardLocation';
-import WardMetrics from './ward-metrics.component';
 
 interface WardViewHeaderProps {
   wardPendingPatients: ReactNode;
+  wardMetrics: ReactNode;
 }
 
-const WardViewHeader: React.FC<WardViewHeaderProps> = ({ wardPendingPatients }) => {
+const WardViewHeader: React.FC<WardViewHeaderProps> = ({ wardPendingPatients, wardMetrics }) => {
   const { location } = useWardLocation();
 
   return (
     <div className={styles.wardViewHeader}>
       <h4>{location?.display}</h4>
-      <WardMetrics />
+      {wardMetrics}
       <AdmissionRequestsBar {...{ wardPendingPatients }} />
     </div>
   );

package/translations/am.json

@@ -17,8 +17,6 @@
   "bedSwap": "Bed swap",
   "cancel": "Cancel",
   "cancelAdmissionRequest": "Cancel admission request",
-  "capacity": "Capacity",
-  "capacityMetricValue": "{{ metricValue }} %",
   "chooseAnOption": "Choose an option",
   "clinicalForms": "Clinical forms",
   "clinicalNoteLabel": "Write your notes",
@@ -120,6 +118,8 @@
   "somePartsOfTheFormDidntLoad": "Some parts of the form didn't load",
   "timeOnWard": "Time on this ward: {{timeOnWard}}",
   "timeSinceAdmission": "Admitted: {{timeSinceAdmission}}",
+  "totalBeds": "Total beds",
+  "totalBedsMetricValue": "{{ metricValue }}",
   "transfer": "Transfer",
   "transferElsewhere": "Transfer elsewhere",
   "transferPatient": "Transfer patient",

package/translations/ar.json

@@ -17,8 +17,6 @@
   "bedSwap": "Bed swap",
   "cancel": "Cancel",
   "cancelAdmissionRequest": "Cancel admission request",
-  "capacity": "Capacity",
-  "capacityMetricValue": "{{ metricValue }} %",
   "chooseAnOption": "Choose an option",
   "clinicalForms": "Clinical forms",
   "clinicalNoteLabel": "Write your notes",
@@ -120,6 +118,8 @@
   "somePartsOfTheFormDidntLoad": "Some parts of the form didn't load",
   "timeOnWard": "Time on this ward: {{timeOnWard}}",
   "timeSinceAdmission": "Admitted: {{timeSinceAdmission}}",
+  "totalBeds": "Total beds",
+  "totalBedsMetricValue": "{{ metricValue }}",
   "transfer": "Transfer",
   "transferElsewhere": "Transfer elsewhere",
   "transferPatient": "Transfer patient",

package/translations/ar_SY.json

@@ -17,8 +17,6 @@
   "bedSwap": "Bed swap",
   "cancel": "Cancel",
   "cancelAdmissionRequest": "Cancel admission request",
-  "capacity": "Capacity",
-  "capacityMetricValue": "{{ metricValue }} %",
   "chooseAnOption": "Choose an option",
   "clinicalForms": "Clinical forms",
   "clinicalNoteLabel": "Write your notes",
@@ -120,6 +118,8 @@
   "somePartsOfTheFormDidntLoad": "Some parts of the form didn't load",
   "timeOnWard": "Time on this ward: {{timeOnWard}}",
   "timeSinceAdmission": "Admitted: {{timeSinceAdmission}}",
+  "totalBeds": "Total beds",
+  "totalBedsMetricValue": "{{ metricValue }}",
   "transfer": "Transfer",
   "transferElsewhere": "Transfer elsewhere",
   "transferPatient": "Transfer patient",

package/translations/bn.json

@@ -17,8 +17,6 @@
   "bedSwap": "Bed swap",
   "cancel": "Cancel",
   "cancelAdmissionRequest": "Cancel admission request",
-  "capacity": "Capacity",
-  "capacityMetricValue": "{{ metricValue }} %",
   "chooseAnOption": "Choose an option",
   "clinicalForms": "Clinical forms",
   "clinicalNoteLabel": "Write your notes",
@@ -120,6 +118,8 @@
   "somePartsOfTheFormDidntLoad": "Some parts of the form didn't load",
   "timeOnWard": "Time on this ward: {{timeOnWard}}",
   "timeSinceAdmission": "Admitted: {{timeSinceAdmission}}",
+  "totalBeds": "Total beds",
+  "totalBedsMetricValue": "{{ metricValue }}",
   "transfer": "Transfer",
   "transferElsewhere": "Transfer elsewhere",
   "transferPatient": "Transfer patient",