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

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/en.json

@@ -48,9 +48,9 @@
   "fetchingEmrConfigurationFailed": "Fetching EMR configuration failed. Try refreshing the page or contact your system administrator.",
   "fetchingPatientNotesFailed": "Fetching patient notes failed. Try refreshing the page or contact your system administrator.",
   "freeBeds": "Free beds",
-  "freeBedsMetricValue": "{{ metricValue }}",
   "hours_one": "{{count}} hour",
   "hours_other": "{{count}} hours",
+  "infants": "Infants",
   "inpatientNotesWorkspaceTitle": "In-patient notes",
   "invalidLocationSpecified": "Invalid location specified",
   "invalidWardLocation": "Invalid ward location: {{location}}",
@@ -60,6 +60,7 @@
   "minutes_one": "{{count}} minutes",
   "minutes_other": "{{count}} minutes",
   "motherChildBedShare": "Mother / Child",
+  "mothers": "Mothers",
   "nextPage": "Next page",
   "noActiveVisit": "No active visit",
   "noAdmission": "No admission found",
@@ -91,7 +92,6 @@
   "patientNoteSaveError": "Error saving patient note",
   "patientNotesDidntLoad": "Patient notes didn't load",
   "patients": "Patients",
-  "patientsMetricValue": "{{ metricValue }}",
   "patientTransferRequestCreated": "Patient transfer request created",
   "patientUnassignedFromBed": "Patient unassigned from bed",
   "patientUnassignedFromBedDetail": "{{patientName}} is now unassigned from bed",
@@ -99,7 +99,6 @@
   "pendingAdmissions": "Pending admissions",
   "pendingDischarge": "Pending Discharge",
   "pendingOut": "Pending out",
-  "pendingOutMetricValue": "{{ metricValue }}",
   "pendingTransfer": "Pending Transfer",
   "pleaseSelectBed": "Please select a bed",
   "pleaseSelectTransferLocation": "Please select transfer location",
@@ -119,7 +118,6 @@
   "timeOnWard": "Time on this ward: {{timeOnWard}}",
   "timeSinceAdmission": "Admitted: {{timeSinceAdmission}}",
   "totalBeds": "Total beds",
-  "totalBedsMetricValue": "{{ metricValue }}",
   "transfer": "Transfer",
   "transferElsewhere": "Transfer elsewhere",
   "transferPatient": "Transfer patient",