@kenyaemr/esm-ward-app 8.1.1-pre.118 → 8.1.1-pre.121

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"webservices.rest":"^2.2.0","emrapi":"^2.0.0 || 2.0.0-SNAPSHOT"},"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":"wardPatientActionButtonExtension","name":"ward-patient-action-button","slot":"action-menu-ward-patient-items-slot"},{"component":"wardPatientNotesActionButtonExtension","name":"ward-inpatient-notes-form-action-button","slot":"action-menu-ward-patient-items-slot"},{"component":"coloredObsTagCardRowExtension","name":"colored-obs-tags-card-row","slot":"ward-patient-card-slot"},{"name":"transfer-swap-patient-siderail-button","slot":"action-menu-ward-patient-items-slot","component":"patientTransferAndSwapWorkspaceSiderailIcon"},{"name":"patient-discharge-siderail-button","slot":"action-menu-ward-patient-items-slot","component":"patientDischargeWorkspaceSideRailIcon"},{"name":"clinical-forms-workspace-siderail-button","component":"clinicalFormWorkspaceSideRailIcon","slot":"action-menu-ward-patient-items-slot"},{"component":"admissionRequestNoteRowExtension","name":"admission-request-note-card-row","slot":"ward-patient-card-slot"},{"component":"motherChildRowExtension","name":"mother-child-card-row","slot":"ward-patient-card-slot"},{"component":"pendingItemsCardRowExtension","name":"ward-patient-pending-items-card-row","slot":"ward-patient-card-pending-items-slot"}],"workspaces":[{"name":"admission-requests-workspace","component":"admissionRequestWorkspace","title":"admissionRequests","type":"admission-requests"},{"name":"ward-patient-notes-workspace","component":"wardPatientNotesWorkspace","type":"ward-patient-notes","title":"inpatientNotesWorkspaceTitle","sidebarFamily":"ward-patient","hasOwnSidebar":true},{"name":"admit-patient-form-workspace","component":"admitPatientFormWorkspace","title":"admissionRequests","type":"admission-requests"},{"name":"ward-patient-workspace","component":"wardPatientWorkspace","type":"ward","title":"Ward Patient","width":"extra-wide","hasOwnSidebar":true,"sidebarFamily":"ward-patient"},{"name":"patient-transfer-swap-workspace","component":"patientTransferAndSwapWorkspace","title":"transfers","type":"transfer-swap-bed-form","hasOwnSidebar":true,"sidebarFamily":"ward-patient"},{"name":"patient-transfer-request-workspace","component":"patientTransferRequestWorkspace","title":"transferRequest","type":"transfer-request-form"},{"name":"patient-discharge-workspace","component":"patientDischargeWorkspace","title":"discharge","type":"ward-patient-discharge","hasOwnSidebar":true,"sidebarFamily":"ward-patient"},{"name":"ward-patient-clinical-forms-workspace","component":"patientClinicalFormsWorkspace","title":"clinicalForms","type":"ward-patient-clinical-forms","hasOwnSidebar":true,"sidebarFamily":"ward-patient","width":"wider"}],"version":"8.1.1-pre.118"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"webservices.rest":"^2.2.0","emrapi":"^2.0.0 || 2.0.0-SNAPSHOT"},"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":"wardPatientActionButtonExtension","name":"ward-patient-action-button","slot":"action-menu-ward-patient-items-slot"},{"component":"wardPatientNotesActionButtonExtension","name":"ward-inpatient-notes-form-action-button","slot":"action-menu-ward-patient-items-slot"},{"component":"coloredObsTagCardRowExtension","name":"colored-obs-tags-card-row","slot":"ward-patient-card-slot"},{"name":"transfer-swap-patient-siderail-button","slot":"action-menu-ward-patient-items-slot","component":"patientTransferAndSwapWorkspaceSiderailIcon"},{"name":"patient-discharge-siderail-button","slot":"action-menu-ward-patient-items-slot","component":"patientDischargeWorkspaceSideRailIcon"},{"name":"clinical-forms-workspace-siderail-button","component":"clinicalFormWorkspaceSideRailIcon","slot":"action-menu-ward-patient-items-slot"},{"component":"defaultWardView","name":"default-ward","slot":"default-ward"},{"component":"maternalWardView","name":"maternal-ward","slot":"maternal-ward"}],"workspaces":[{"name":"admission-requests-workspace","component":"admissionRequestWorkspace","title":"admissionRequests","type":"admission-requests"},{"name":"ward-patient-notes-workspace","component":"wardPatientNotesWorkspace","type":"ward-patient-notes","title":"inpatientNotesWorkspaceTitle","sidebarFamily":"ward-patient","hasOwnSidebar":true},{"name":"admit-patient-form-workspace","component":"admitPatientFormWorkspace","title":"admissionRequests","type":"admission-requests"},{"name":"ward-patient-workspace","component":"wardPatientWorkspace","type":"ward","title":"Ward Patient","width":"extra-wide","hasOwnSidebar":true,"sidebarFamily":"ward-patient"},{"name":"patient-transfer-swap-workspace","component":"patientTransferAndSwapWorkspace","title":"transfers","type":"transfer-swap-bed-form","hasOwnSidebar":true,"sidebarFamily":"ward-patient"},{"name":"patient-transfer-request-workspace","component":"patientTransferRequestWorkspace","title":"transferRequest","type":"transfer-request-form"},{"name":"patient-discharge-workspace","component":"patientDischargeWorkspace","title":"discharge","type":"ward-patient-discharge","hasOwnSidebar":true,"sidebarFamily":"ward-patient"},{"name":"ward-patient-clinical-forms-workspace","component":"patientClinicalFormsWorkspace","title":"clinicalForms","type":"ward-patient-clinical-forms","hasOwnSidebar":true,"sidebarFamily":"ward-patient","width":"wider"}],"version":"8.1.1-pre.121"}

package/mock.tsx

@@ -4,6 +4,8 @@ import { useInpatientAdmission } from './src/hooks/useInpatientAdmission';
 import { createAndGetWardPatientGrouping } from './src/ward-view/ward-view.resource';
 import { useInpatientRequest } from './src/hooks/useInpatientRequest';
 import { useWardPatientGrouping } from './src/hooks/useWardPatientGrouping';
+import { type WardViewContext } from './src/types';
+import DefaultWardPatientCardHeader from './src/ward-view/default-ward/default-ward-patient-card-header.component';
 
 jest.mock('./src/hooks/useAdmissionLocation', () => ({
   useAdmissionLocation: jest.fn(),
@@ -51,4 +53,10 @@ export const mockWardPatientGroupDetails = jest.mocked(useWardPatientGrouping).m
   inpatientAdmissionResponse: mockInpatientAdmissionResponse(),
   inpatientRequestResponse: mockInpatientRequestResponse(),
   ...createAndGetWardPatientGrouping(mockInpatientAdmissions, mockAdmissionLocation, mockInpatientRequest),
+  isLoading: false,
 });
+
+export const mockWardViewContext: WardViewContext = {
+  wardPatientGroupDetails: mockWardPatientGroupDetails(),
+  WardPatientHeader: DefaultWardPatientCardHeader,
+};

package/package.json

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

package/src/beds/empty-bed-skeleton.tsx

@@ -1,11 +1,11 @@
 import { SkeletonIcon } from '@carbon/react';
 import React from 'react';
-import styles from './empty-bed.scss';
-import WardPatientSkeletonText from '../ward-patient-card/row-elements/ward-pateint-skeleton-text';
+import styles from './ward-bed.scss';
+import WardPatientSkeletonText from '../ward-patient-card/row-elements/ward-patient-skeleton-text';
 
 const EmptyBedSkeleton = () => {
   return (
-    <div className={styles.container + ' ' + styles.skeleton}>
+    <div className={styles.emptyBed + ' ' + styles.skeleton}>
       <SkeletonIcon />
       <WardPatientSkeletonText />
     </div>

package/src/beds/empty-bed.component.tsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import styles from './empty-bed.scss';
+import styles from './ward-bed.scss';
 import wardPatientCardStyles from '../ward-patient-card/ward-patient-card.scss';
 import { type Bed } from '../types';
 import { useTranslation } from 'react-i18next';
@@ -12,11 +12,11 @@ const EmptyBed: React.FC<EmptyBedProps> = ({ bed }) => {
   const { t } = useTranslation();
 
   return (
-    <div className={styles.container}>
+    <div className={styles.emptyBed}>
       <span className={`${wardPatientCardStyles.wardPatientBedNumber} ${wardPatientCardStyles.empty}`}>
         {bed.bedNumber}
       </span>
-      <p className={styles.emptyBed}>{t('emptyBed', 'Empty bed')}</p>
+      <p className={styles.emptyBedText}>{t('emptyBed', 'Empty bed')}</p>
     </div>
   );
 };

package/src/beds/ward-bed.component.tsx

@@ -0,0 +1,41 @@
+import React, { type ReactNode } from 'react';
+import { type Bed } from '../types';
+import EmptyBed from './empty-bed.component';
+import styles from './ward-bed.scss';
+import { useTranslation } from 'react-i18next';
+import { Tag } from '@carbon/react';
+
+export interface WardBedProps {
+  patientCards: Array<ReactNode>;
+  bed: Bed;
+}
+
+const WardBed: React.FC<WardBedProps> = ({ bed, patientCards }) => {
+  return patientCards?.length > 0 ? <OccupiedBed bed={bed} patientCards={patientCards} /> : <EmptyBed bed={bed} />;
+};
+
+const OccupiedBed: React.FC<WardBedProps> = ({ patientCards }) => {
+  // interlace patient card with bed dividers between each of them
+  const patientCardsWithDividers = patientCards.flatMap((patientCard, index) => {
+    if (index == 0) {
+      return [patientCard];
+    } else {
+      return [<BedShareDivider key={'divider-' + index} />, patientCard];
+    }
+  });
+
+  return <div className={styles.occupiedBed}>{patientCardsWithDividers}</div>;
+};
+
+const BedShareDivider = () => {
+  const { t } = useTranslation();
+  return (
+    <div className={styles.bedDivider}>
+      <div className={styles.bedDividerLine}></div>
+      <Tag>{t('bedShare', 'Bed share')}</Tag>
+      <div className={styles.bedDividerLine}></div>
+    </div>
+  );
+};
+
+export default WardBed;

package/src/beds/ward-bed.scss

@@ -0,0 +1,45 @@
+@use '@carbon/layout';
+@use '@openmrs/esm-styleguide/src/vars';
+@use '@carbon/type';
+
+.occupiedBed {
+  display: flex;
+  flex-direction: column;
+  background-color: vars.$ui-02;
+  height: fit-content;
+}
+
+.bedDivider {
+  background-color: vars.$ui-02;
+  color: vars.$text-02;
+  padding: layout.$spacing-01;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.bedDividerLine {
+  height: 1px;
+  background-color: vars.$ui-05;
+  width: 30%;
+}
+.emptyBed {
+  display: flex;
+  gap: layout.$spacing-04;
+  justify-content: center;
+  align-items: center;
+  border: 1px dashed vars.$ui-04;
+  padding: layout.$spacing-03 layout.$spacing-04;
+  height: fit-content;
+}
+
+.emptyBed:hover:not(.skeleton) {
+  border: 1px solid transparent;
+  box-shadow: inset 0px 0px 0px 2px vars.$color-blue-60-2;
+  cursor: pointer;
+}
+
+.emptyBedText {
+  @include type.type-style('heading-compact-01');
+  color: vars.$text-02;
+}

package/src/beds/{occupied-bed.test.tsx → ward-bed.test.tsx}

@@ -10,7 +10,9 @@ import {
 } from '../../../../__mocks__';
 import { bedLayoutToBed, filterBeds } from '../ward-view/ward-view.resource';
 import useWardLocation from '../hooks/useWardLocation';
-import OccupiedBed from './occupied-bed.component';
+import WardBed from './ward-bed.component';
+import { type WardPatient } from '../types';
+import DefaultWardPatientCard from '../ward-view/default-ward/default-ward-patient-card.component';
 
 const defaultConfig: WardConfigObject = getDefaultsFromConfigSchema(configSchema);
 
@@ -31,34 +33,43 @@ mockedUseWardLocation.mockReturnValue({
 const mockBedToUse = mockBedLayouts[0];
 const mockBed = bedLayoutToBed(mockBedToUse);
 
-const mockWardPatientProps = {
-  admitted: true,
+const mockWardPatientAliceProps: WardPatient = {
   visit: null,
-  encounterAssigningToCurrentInpatientLocation: null,
-  firstAdmissionOrTransferEncounter: null,
+  patient: mockPatientAlice,
+  bed: mockBed,
+  inpatientAdmission: null,
+  inpatientRequest: null,
 };
 
-describe('Occupied bed', () => {
+const mockWardPatientBrianProps: WardPatient = {
+  visit: null,
+  patient: mockPatientBrian,
+  bed: mockBed,
+  inpatientAdmission: null,
+  inpatientRequest: null,
+};
+
+describe('Ward bed', () => {
   it('renders a single bed with patient details', () => {
-    render(<OccupiedBed wardPatients={[{ ...mockWardPatientProps, patient: mockPatientAlice }]} bed={mockBed} />);
+    render(
+      <WardBed
+        patientCards={[<DefaultWardPatientCard key={mockPatientAlice.uuid} {...mockWardPatientAliceProps} />]}
+        bed={mockBed}
+      />,
+    );
     const patientName = screen.getByText('Alice Johnson');
     expect(patientName).toBeInTheDocument();
     const patientAge = `${mockPatientAlice.person.age} yrs`;
     expect(screen.getByText(patientAge)).toBeInTheDocument();
-    const defaultAddressFields = ['cityVillage', 'country'];
-    defaultAddressFields.forEach((addressField) => {
-      const addressFieldValue = mockPatientAlice.person.preferredAddress[addressField] as string;
-      expect(screen.getByText(addressFieldValue)).toBeInTheDocument();
-    });
   });
 
   it('renders a divider for shared patients', () => {
     render(
-      <OccupiedBed
+      <WardBed
         bed={mockBed}
-        wardPatients={[
-          { ...mockWardPatientProps, patient: mockPatientAlice },
-          { ...mockWardPatientProps, patient: mockPatientBrian },
+        patientCards={[
+          <DefaultWardPatientCard key={mockPatientAlice.uuid} {...mockWardPatientAliceProps} />,
+          <DefaultWardPatientCard key={mockPatientBrian.uuid} {...mockWardPatientBrianProps} />,
         ]}
       />,
     );

package/src/config-schema.ts

@@ -1,14 +1,5 @@
 import { type ConfigSchema, Type, validators } from '@openmrs/esm-framework';
 
-export const defaultWardPatientCard: WardPatientCardDefinition = {
-  id: 'default',
-  headerRowElements: ['patient-age', 'patient-address', 'patient-identifier'],
-  footerRowElements: [],
-  appliedTo: null,
-};
-
-export const builtInPatientCardElements = ['patient-age', 'time-on-ward', 'time-since-admission', 'patient-location'];
-
 export const addressFields = [
   'cityVillage',
   'stateProvince',
@@ -37,11 +28,12 @@ export const addressFields = [
 type AddressField = keyof typeof addressFields;
 
 export const configSchema: ConfigSchema = {
-  wardPatientCards: {
-    _description: 'Configure the display of ward patient cards',
-    obsElementDefinitions: {
+  patientCardElements: {
+    _description:
+      'Configuration of various patient card elements. Each configured element must have a unique id, defined in the ward React component being used.',
+    obs: {
       _type: Type.Array,
-      _description: 'Defines obs display elements that can be included in the card header or footer.',
+      _description: 'Configures obs values to display.',
       _default: [],
       _elements: {
         id: {
@@ -79,12 +71,16 @@ export const configSchema: ConfigSchema = {
         },
       },
     },
-    identifierElementDefinitions: {
+    pendingItems: {
       _type: Type.Array,
-      _description: `Defines patient identifier elements that can be included in the card header or footer. The default element 'patient-identifier' displays the preferred identifier.`,
+      _description: 'Configures pending orders and transfers to display.',
       _default: [
         {
-          id: 'patient-identifier',
+          id: 'pending-items',
+          orders: {
+            orderTypes: [{ label: 'Labs', uuid: '52a447d3-a64a-11e3-9aeb-50e549534c5e' }],
+          },
+          showPendingItems: true,
         },
       ],
       _elements: {
@@ -92,23 +88,55 @@ export const configSchema: ConfigSchema = {
           _type: Type.String,
           _description: 'The unique identifier for this patient card element',
         },
-        identifierTypeUuid: {
-          _type: Type.UUID,
+        orders: {
+          orderTypes: {
+            _type: Type.Array,
+            _description: 'Configures pending orders and transfers to display.',
+            _elements: {
+              uuid: {
+                _type: Type.UUID,
+                _description: 'Identifies the order type.',
+              },
+              label: {
+                _type: Type.String,
+                _description:
+                  "The label or i18n key to the translated label to display. If not provided, defaults to 'Orders'",
+                _default: null,
+              },
+            },
+          },
+        },
+        showPendingItems: {
+          _type: Type.Boolean,
           _description:
-            'The UUID of the identifier type to display. If not provided, defaults to the preferred identifier.',
-          _default: null,
+            'Optional. If true, pending items (e.g., number of pending orders) will be displayed on the patient card.',
         },
-        label: {
+      },
+    },
+    patientIdentifier: {
+      _type: Type.Array,
+      _description: `Configures patient identifier to display. An unconfigured element displays the preferred identifier.`,
+      _default: [
+        {
+          id: 'patient-identifier',
+          showIdentifierLabel: false,
+        },
+      ],
+      _elements: {
+        id: {
           _type: Type.String,
+          _description: 'The unique identifier for this patient card element',
+        },
+        showIdentifierLabel: {
+          _type: Type.Boolean,
           _description:
-            'the custom label or i18n key to the translated label to display for patient identifier. If not provided, defaults to the patient-identifier name.',
-          _default: null,
+            'If true, the identifier type (eg: "OpenMRS ID") is shown along with the identifier itself. Defaults to false',
         },
       },
     },
-    addressElementDefinitions: {
+    patientAddress: {
       _type: Type.Array,
-      _description: 'Defines patient address elements that can be included in the card header or footer.',
+      _description: 'Configures patient address elements.',
       _default: [
         {
           id: 'patient-address',
@@ -132,66 +160,116 @@ export const configSchema: ConfigSchema = {
         },
       },
     },
-    cardDefinitions: {
+    admissionRequestNote: {
       _type: Type.Array,
-      _default: [defaultWardPatientCard],
-      _description: `An array of card configuration. A card configuration can be applied to different ward locations.
-         If multiple card configurations apply to a location, only the first one is chosen.`,
+      _description: 'Configures admission request notes to display.',
+      _default: [
+        {
+          id: 'admission-request-note',
+          conceptUuid: '161011AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
+        },
+      ],
       _elements: {
-        id: {
-          _type: Type.String,
-          _description:
-            'The unique identifier for this card definition. This is used to set the name of the extension slot the card has, where the rows go. The slot name is "ward-patient-card-<id>", unless the id is "default", in which case the slot name is "ward-patient-card".',
-          _default: 'default',
-        },
-        headerRowElements: {
-          _type: Type.Array,
-          _description: `IDs of patient card elements to appear in the header row. These can be built-in, or custom ones can be defined in patientCardElementDefinitions. Built-in elements are: '${builtInPatientCardElements.join(
-            "', '",
-          )}'.`,
-          _elements: {
+        fields: {
+          id: {
             _type: Type.String,
+            _description: 'The unique identifier for this patient card element',
+          },
+          conceptUuid: {
+            _type: Type.UUID,
+            _description: 'Required. Identifies the concept for the admission request note.',
           },
         },
-        footerRowElements: {
-          _type: Type.Array,
-          _description: `IDs of patient card elements to appear in the footer row. These can be built-in, or custom ones can be defined in patientCardElementDefinitions. Built-in elements are: '${builtInPatientCardElements.join(
-            "', '",
-          )}'.`,
-          _elements: {
+      },
+      coloredObsTags: {
+        _type: Type.Array,
+        _description: 'Configures observation values to display as Carbon tags.',
+        _elements: {
+          conceptUuid: {
+            _type: Type.UUID,
+            _description: 'Required. Identifies the concept to use to identify the desired observations.',
+            // Problem list
+            _default: '1284AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
+          },
+          summaryLabel: {
             _type: Type.String,
+            _description: `Optional. The custom label or i18n key to the translated label to display for the summary tag. The summary tag shows the count of the number of answers that are present but not configured to show as their own tags. If not provided, defaults to the name of the concept.`,
+            _default: null,
           },
-        },
-        appliedTo: {
-          _type: Type.Array,
-          _description:
-            'Conditions under which this card definition should be used. If not provided, the configuration is applied to all wards.',
-          _elements: {
-            location: {
-              _type: Type.UUID,
-              _description: 'The UUID of the location. If not provided, applies to all wards.',
-              _default: null,
+          summaryLabelI18nModule: {
+            _type: Type.String,
+            _description: 'Optional. The custom module to use for translation of the summary label',
+            _default: null,
+          },
+          summaryLabelColor: {
+            _type: Type.String,
+            _description:
+              'The color of the summary tag. See https://react.carbondesignsystem.com/?path=/docs/components-tag--overview for a list of supported colors',
+            _default: null,
+          },
+          tags: {
+            _type: Type.Array,
+            _description: `An array specifying concept sets and color. Observations with coded values that are members of the specified concept sets will be displayed as their own tags with the specified color. Any observation with coded values not belonging to any concept sets specified will be summarized as a count in the summary tag. If a concept set is listed multiple times, the first matching applied-to rule takes precedence.`,
+            _default: [],
+            _elements: {
+              color: {
+                _type: Type.String,
+                _description:
+                  'Color of the tag. See https://react.carbondesignsystem.com/?path=/docs/components-tag--overview for a list of supported colors.',
+              },
+              appliedToConceptSets: {
+                _type: Type.Array,
+                _description: `The concept sets which the color applies to. Observations with coded values that are members of the specified concept sets will be displayed as their own tag with the specified color. If an observation's coded value belongs to multiple concept sets, the first matching applied-to rule takes precedence.`,
+                _elements: {
+                  _type: Type.UUID,
+                },
+              },
             },
           },
         },
       },
     },
   },
+  wards: {
+    _description: 'Configuration of what type of ward to use at different ward locations.',
+    _type: Type.Array,
+    _default: [{ id: 'default-ward' }],
+    _elements: {
+      id: {
+        _type: Type.String,
+        _description:
+          'The ward type to use. Currently, "default-ward" and "maternal-ward" are supported. This string also serves as the extension slot name for the ward view.',
+      },
+      appliedTo: {
+        _type: Type.Array,
+        _description:
+          'Optional. Conditions under which this card definition should be used. If not provided, the configuration is applied to all wards.',
+        _elements: {
+          location: {
+            _type: Type.UUID,
+            _description: 'The UUID of the location. If not provided, applies to all wards.',
+            _default: null,
+          },
+        },
+      },
+    },
+  },
 };
 
 export interface WardConfigObject {
-  wardPatientCards: WardPatientCardsConfig;
-}
-
-export interface WardPatientCardsConfig {
-  obsElementDefinitions: Array<ObsElementDefinition>;
-  pendingItemsDefinitions: Array<PendingItemsDefinition>;
-  identifierElementDefinitions: Array<IdentifierElementDefinition>;
-  addressElementDefinitions: Array<AddressElementDefinition>;
-  cardDefinitions: Array<WardPatientCardDefinition>;
+  patientCardElements: {
+    obs: Array<ObsElementConfig>;
+    pendingItems: Array<PendingItemsElementConfig>;
+    patientIdentifier: Array<IdentifierElementConfig>;
+    patientAddress: Array<PatientAddressElementConfig>;
+    coloredObsTags: Array<ColoredObsTagsElementConfig>;
+    admissionRequestNote: Array<AdmissionRequestNoteElementConfig>;
+  };
+  wards: Array<WardDefinition>;
 }
 
-export interface PendingItemsDefinition {
+export interface PendingItemsElementConfig {
+  id: string;
   showPendingItems: boolean;
   orders: {
     orderTypes: Array<{
@@ -201,7 +279,7 @@ export interface PendingItemsDefinition {
   };
 }
 
-export interface ObsElementDefinition {
+export interface ObsElementConfig {
   id: string;
   conceptUuid: string;
   onlyWithinCurrentVisit: boolean;
@@ -210,21 +288,23 @@ export interface ObsElementDefinition {
   label?: string;
 }
 
-export interface IdentifierElementDefinition {
+export interface IdentifierElementConfig {
   id: string;
-  identifierTypeUuid: string;
-  label?: string;
+  showIdentifierLabel: boolean;
 }
 
-export interface AddressElementDefinition {
+export interface PatientAddressElementConfig {
   id: string;
   fields: Array<AddressField>;
 }
 
-export interface WardPatientCardDefinition {
+export interface AdmissionRequestNoteElementConfig {
+  id: string;
+  conceptUuid: string;
+}
+
+export interface WardDefinition {
   id: string;
-  headerRowElements: Array<string>;
-  footerRowElements: Array<string>;
   appliedTo?: Array<{
     /**
      * locationUuid. If given, only applies to patients at the specified ward locations. (If not provided, applies to all locations)
@@ -232,3 +312,44 @@ export interface WardPatientCardDefinition {
     location: string;
   }>;
 }
+export interface ColoredObsTagsElementConfig {
+  /**
+   * Required. Identifies the concept to use to identify the desired observations.
+   */
+  conceptUuid: string;
+
+  /**
+   * Optional. The custom label or i18n key to the translated label to display for the summary tag. The summary tag
+   * shows the count of the number of answers that are present but not configured to show as their own tags. If not
+   * provided, defaults to the name of the concept.
+   */
+  summaryLabel?: string;
+
+  /**
+   * The color of the summary tag.
+   * See https://react.carbondesignsystem.com/?path=/docs/components-tag--overview for a list of supported colors
+   */
+  summaryLabelColor?: string;
+
+  /**
+   * An array specifying concept sets and color. Observations with coded values that are members of the specified concept sets
+   * will be displayed as their own tags with the specified color. Any observation with coded values not belonging to
+   * any concept sets specified will be summarized as a count in the summary tag. If a concept set is listed multiple times,
+   * the first matching applied-to rule takes precedence.
+   */
+  tags: Array<ColoredObsTagConfig>;
+}
+
+export interface ColoredObsTagConfig {
+  /**
+   * Color of the tag. See https://react.carbondesignsystem.com/?path=/docs/components-tag--overview for a list of supported colors.
+   */
+  color: string;
+
+  /**
+   * The concept sets which the color applies to. Observations with coded values that are members of the specified concept sets
+   * will be displayed as their own tag with the specified color.
+   * If an observation's coded value belongs to multiple concept sets, the first matching applied-to rule takes precedence.
+   */
+  appliedToConceptSets: Array<string>;
+}

package/src/hooks/useAssignedBedByPatient.ts

@@ -0,0 +1,9 @@
+import { openmrsFetch, restBaseUrl } from '@openmrs/esm-framework';
+import { type BedDetail } from '../types';
+import useSWR from 'swr';
+
+export function useAssignedBedByPatient(patientUuid: string) {
+  const url = `${restBaseUrl}/beds?patientUuid=${patientUuid}`;
+
+  return useSWR<{ data: { results: Array<BedDetail> } }, Error>(url, openmrsFetch);
+}

package/src/hooks/useInpatientAdmission.ts

@@ -8,7 +8,7 @@ export function useInpatientAdmission() {
   // prettier-ignore
   const customRepresentation =
     'custom:(visit,' +
-    'patient:(uuid,identifiers,voided,' +
+    'patient:(uuid,identifiers:(uuid,display,identifier,identifierType),voided,' +
     'person:(uuid,display,gender,age,birthdate,birthtime,preferredName,preferredAddress,dead,deathDate)),' +
     'encounterAssigningToCurrentInpatientLocation:(encounterDatetime),' +
     'currentInpatientRequest:(dispositionLocation,dispositionType,disposition:(uuid,display),dispositionEncounter:(uuid,display),dispositionObsGroup:(uuid,display),visit:(uuid),patient:(uuid)),' +

package/src/hooks/useMotherAndChildren.ts

@@ -1,5 +1,5 @@
 import { makeUrl, restBaseUrl, useOpenmrsFetchAll } from '@openmrs/esm-framework';
-import { type MotherAndChildren } from '../types';
+import { type MotherAndChild } from '../types';
 
 export interface MothersAndChildrenSearchCriteria {
   mothers?: Array<string>;
@@ -38,7 +38,7 @@ export function useMotherAndChildren(
     requireChildBornDuringMothersActiveVisit?.toString() ?? 'false',
   );
   rep && url.searchParams.append('v', rep);
-  return useOpenmrsFetchAll<MotherAndChildren>(fetch ? url : null);
+  return useOpenmrsFetchAll<MotherAndChild>(fetch ? url : null);
 }
 
 function makeUrlUrl(path: string) {

package/src/hooks/useObs.ts

@@ -6,12 +6,12 @@ interface ObsSearchCriteria {
   concept: string;
 }
 
-export function useObs(criteria?: ObsSearchCriteria, representation = 'default') {
+export function useObs(criteria?: ObsSearchCriteria, fetch: boolean = true, representation = 'default') {
   const params = new URLSearchParams({
     ...criteria,
     v: representation,
   });
 
   const apiUrl = `${restBaseUrl}/obs?${params}`;
-  return useOpenmrsFetchAll<Observation>(apiUrl);
+  return useOpenmrsFetchAll<Observation>(fetch ? apiUrl : null);
 }