@kenyaemr/esm-morgue-app 5.4.2-pre.2344 → 5.4.2-pre.2349

package/src/switcher/content-switcher.component.tsx

@@ -11,6 +11,8 @@ import {
   Search,
   ComboBox,
   SkeletonText,
+  RadioButtonSkeleton,
+  TextInputSkeleton,
 } from '@carbon/react';
 import { useTranslation } from 'react-i18next';
 import styles from './content-switcher.scss';
@@ -97,6 +99,14 @@ const CustomContentSwitcher: React.FC<CustomContentSwitcherProps> = ({
     (tabIndex: TabType) => {
       const isListView = selectedView === ViewType.LIST;
 
+      if (isLoading || isLoadingAdmission || (tabIndex === TabType.DISCHARGE && isLoadingDischarge)) {
+        return (
+          <div className={styles.loadingContainer}>
+            <DataTableSkeleton showHeader={false} showToolbar={false} />
+          </div>
+        );
+      }
+
       switch (tabIndex) {
         case TabType.AWAITING_ADMISSION:
           return isListView ? (
@@ -109,12 +119,14 @@ const CustomContentSwitcher: React.FC<CustomContentSwitcherProps> = ({
               />
             </div>
           ) : (
-            <AwaitingBedLayout
-              mortuaryLocation={admissionLocation}
-              awaitingQueueDeceasedPatients={awaitingQueueDeceasedPatients}
-              isLoading={isLoading}
-              mutated={mutate}
-            />
+            <>
+              <AwaitingBedLayout
+                mortuaryLocation={admissionLocation}
+                awaitingQueueDeceasedPatients={awaitingQueueDeceasedPatients}
+                isLoading={isLoading}
+                mutated={mutate}
+              />
+            </>
           );
 
         case TabType.ADMITTED:
@@ -127,7 +139,9 @@ const CustomContentSwitcher: React.FC<CustomContentSwitcherProps> = ({
               />
             </div>
           ) : (
-            <BedLayout AdmittedDeceasedPatient={admissionLocation} isLoading={isLoadingAdmission} mutate={mutate} />
+            <>
+              <BedLayout AdmittedDeceasedPatient={admissionLocation} isLoading={isLoadingAdmission} mutate={mutate} />
+            </>
           );
 
         case TabType.DISCHARGE:
@@ -140,11 +154,13 @@ const CustomContentSwitcher: React.FC<CustomContentSwitcherProps> = ({
               />
             </div>
           ) : (
-            <DischargedBedLayout
-              AdmittedDeceasedPatient={admissionLocation}
-              isLoading={isLoadingDischarge}
-              mutate={mutate}
-            />
+            <>
+              <DischargedBedLayout
+                AdmittedDeceasedPatient={admissionLocation}
+                isLoading={isLoadingDischarge}
+                mutate={mutate}
+              />
+            </>
           );
 
         default:
@@ -153,23 +169,22 @@ const CustomContentSwitcher: React.FC<CustomContentSwitcherProps> = ({
     },
     [
       selectedView,
-      awaitingQueueDeceasedPatients,
       isLoading,
-      admissionLocation,
       isLoadingAdmission,
       isLoadingDischarge,
+      awaitingQueueDeceasedPatients,
+      admissionLocation,
       dischargedPatients,
-
       mutate,
     ],
   );
 
   return (
     <div className={styles.switcherContainer}>
-      <CardHeader title={t('mortuaryOperations', 'Mortuary operations')}>
+      <CardHeader title={isLoading ? t('loading', 'Loading...') : t('mortuaryOperations', 'Mortuary operations')}>
         {locationItems.length > 1 &&
           (isLoadingLocation ? (
-            <SkeletonText />
+            <RadioButtonSkeleton />
           ) : (
             <ComboBox
               items={locationItems}
@@ -182,28 +197,39 @@ const CustomContentSwitcher: React.FC<CustomContentSwitcherProps> = ({
           ))}
 
         <ContentSwitcher size="sm" className={styles.switcher} selectedIndex={selectedView} onChange={handleViewChange}>
-          <Switch>{t('listView', 'List')}</Switch>
-          <Switch>{t('cardView', 'Card')}</Switch>
+          <Switch>{isLoading ? <RadioButtonSkeleton /> : t('listView', 'List')}</Switch>
+          <Switch>{isLoading ? <RadioButtonSkeleton /> : t('cardView', 'Card')}</Switch>
         </ContentSwitcher>
       </CardHeader>
+
       <div className={styles.tabsContainer}>
-        <Search labelText={t('searchPatients', 'Search Patients')} />
         <Tabs selectedIndex={selectedTab} onChange={handleTabChange}>
-          <div className={styles.tabListContainer}>
-            <TabList scrollDebounceWait={200}>
-              {tabs.map((tab) => (
-                <Tab key={tab.id}>
-                  {t(tab.labelKey, tab.defaultLabel)}
-                  {tab.id === 'awaiting-admission' && ` (${awaitingQueueDeceasedPatients?.length || 0})`}
-                  {tab.id === 'admitted' &&
-                    ` (${
-                      admissionLocation?.bedLayouts?.reduce((total, bed) => total + (bed.patients?.length || 0), 0) || 0
-                    })`}
-                  {tab.id === 'discharge' && ` (${dischargedPatients?.length || 0})`}
-                </Tab>
-              ))}
-            </TabList>
-          </div>
+          {isLoading || isLoadingAdmission || isLoadingDischarge ? (
+            <div className={styles.tabSkeletonContainer}>
+              <div className={styles.tabListSkeleton}>
+                {[1, 2, 3].map((i) => (
+                  <RadioButtonSkeleton key={i} className={styles.tabSkeleton} />
+                ))}
+              </div>
+            </div>
+          ) : (
+            <div className={styles.tabListContainer}>
+              <TabList scrollDebounceWait={200}>
+                {tabs.map((tab) => (
+                  <Tab key={tab.id}>
+                    {t(tab.labelKey, tab.defaultLabel)}
+                    {tab.id === 'awaiting-admission' && ` (${awaitingQueueDeceasedPatients?.length || 0})`}
+                    {tab.id === 'admitted' &&
+                      ` (${
+                        admissionLocation?.bedLayouts?.reduce((total, bed) => total + (bed.patients?.length || 0), 0) ||
+                        0
+                      })`}
+                    {tab.id === 'discharge' && ` (${dischargedPatients?.length || 0})`}
+                  </Tab>
+                ))}
+              </TabList>
+            </div>
+          )}
 
           <TabPanels>
             {tabs.map((_, index) => (

package/src/switcher/content-switcher.scss

@@ -28,3 +28,16 @@
 .tabsContainer {
   margin-top: layout.$spacing-04;
 }
+
+.tabSkeletonContainer {
+  padding: layout.$spacing-05;
+
+  .tabListSkeleton {
+    display: flex;
+    gap: layout.$spacing-03;
+    margin-top: layout.$spacing-03;
+  }
+}
+.searchSkeleton {
+  padding: layout.$spacing-04;
+}

package/src/types/index.ts

@@ -1,4 +1,9 @@
-import { type OpenmrsResourceStrict, type OpenmrsResource, Concept } from '@openmrs/esm-framework';
+import {
+  type OpenmrsResourceStrict,
+  type OpenmrsResource,
+  Concept,
+  type Visit as OpenmrsVisit,
+} from '@openmrs/esm-framework';
 
 export interface BaseEntity {
   uuid: string;
@@ -614,3 +619,40 @@ export interface Payment {
 interface PaymentInstanceType extends BaseEntity {
   name: string;
 }
+export interface EnhancedPatient {
+  uuid: string;
+  person: {
+    display: string;
+    gender: string;
+    age: number;
+    deathDate: string;
+    causeOfDeath?: {
+      display: string;
+    };
+  };
+  bedInfo?: {
+    bedNumber: string;
+    bedId: number;
+    bedType?: string;
+  };
+  visitInfo?: {
+    activeVisit?: OpenmrsVisit;
+    admissionDate?: string;
+  };
+  isDischarged?: boolean;
+  encounterDate?: string;
+  originalMortuaryPatient?: MortuaryPatient;
+  originalPatient?: Patient;
+}
+
+export interface PatientCardProps {
+  patient: EnhancedPatient;
+  showActions?: {
+    admit?: boolean;
+    discharge?: boolean;
+    postmortem?: boolean;
+    swapCompartment?: boolean;
+    printGatePass?: boolean;
+    viewDetails?: boolean;
+  };
+}

package/translations/am.json

@@ -9,14 +9,13 @@
   "admitted": "ገብቷል",
   "admittedHeader": "ገብቷል",
   "age": "ዕድሜ",
-  "allocation": "የምደባ እይታ",
   "attachements": "አባሪዎች",
   "attachments": "Attachments",
-  "autopsyDeleted": "Autopsy report deleted",
   "autopsyReport": "የአስከሬን ምርመራ ሪፖርት",
   "available": "ይገኛል",
   "awaiting": "በመጠባበቅ ላይ",
   "awaitingAdmissionHeader": "መግቢያ በመጠባበቅ ላይ",
+  "backToHome": "Back to Home",
   "bedType": "የአልጋ አይነት",
   "billingHistory": "የክፍያ ታሪክ",
   "cancel": "ይቅር",
@@ -41,8 +40,6 @@
   "dischargeDate": "Discharge Date",
   "dischargedHeader": "ተለቋል",
   "dischargeForm": "መልቀቅ",
-  "dispose": "አስወግድ",
-  "disposeForm": "አስወግድ",
   "dividerText": "የተጋራ",
   "durationOnWard": "በወረፋ የቆዩ ቀናት",
   "edit": "አስተካክል",
@@ -50,7 +47,6 @@
   "empty": "ባዶ",
   "emptyCompartment": "ባዶ ክፍል",
   "encounterType": "የግኝት አይነት",
-  "error": "Error",
   "errorLoadingPatients": "የተለቀቁ ታካሚዎችን በመጫን ላይ ስህተት",
   "errorMessage": "ስህተት",
   "formName": "የቅጽ ስም",
@@ -59,28 +55,41 @@
   "lengthofStay": "የቆይታ ጊዜ",
   "listView": "ዝርዝር",
   "loadData": "ማጠቃለያ ዳታ በመጫን ላይ...",
+  "loading": "Loading...",
   "loadingPatients": "ታካሚዎችን በመጫን ላይ...",
   "mortician": "የሬሳ ክፍል ባለሙያ ስም",
   "mortuary": "የሬሳ ክፍል",
   "mortuaryOperations": "የሬሳ ክፍል ስራዎች",
   "name": "ስም",
   "nextPage": "ቀጣይ ገጽ",
-  "noAdmittedPatients": "ምንም የገቡ ታካሚዎች አልተገኙም",
+  "noAdmittedPatient": "No deceased patients currently admitted",
   "noAdmittedPatientsDescription": "በአሁኑ ጊዜ ምንም የገቡ ታካሚዎች የሉም።",
   "noAwaitingPatients": "ምንም በመጠባበቅ ላይ ያሉ ታካሚዎች አልተገኙም",
   "noAwaitingPatientsDescription": "በአሁኑ ጊዜ ምንም በመጠባበቅ ላይ ያሉ ታካሚዎች የሉም።",
   "noDeceasedPatients": "መግቢያ በመጠባበቅ ላይ ያሉ የሞቱ ታካሚዎች የሉም",
+  "noDischargedPatient": "No deceased patients currently discharged",
   "noDischargedPatients": "ምንም የተለቀቁ ታካሚዎች አልተገኙም",
   "noDischargedPatientsDescription": "በአሁኑ ጊዜ ምንም የተለቀቁ ታካሚዎች የሉም።",
+  "noMatchingAwaitingPatients": "No matching awaiting patients found",
+  "noMatchingAwaitingPatientsDescription": "Try adjusting your search terms to find awaiting patients.",
+  "noMatchingDischargedPatients": "No matching discharged patients found",
+  "noMatchingDischargedPatientsDescription": "Try adjusting your search terms to find discharged patients.",
+  "noMatchingPatients": "No matching patients found",
+  "noMatchingPatientsDescription": "Try adjusting your search terms to find deceased patients.",
   "noObservationsFound": "ምንም ምልከታዎች አልተገኙም",
   "noPatientSelected": "No patient selected",
+  "noSearchDeceasedPatients": "Search deceased patients",
+  "noSearchResults": "We couldn’t find anything",
   "occupied": "ተይዟል",
   "patientName": "የታካሚ ስም",
+  "postmortem": "Postmortem",
   "postmortemForm": "የአስከሬን ምርመራ",
   "previousPage": "የቀደመ ገጽ",
   "printGatePass": "የበር ማለፊያ",
   "printPostMortemReport": "Postmortem Report",
+  "searchDeceasedPatients": "Search deceased patients",
   "searchPatients": "ታካሚዎችን ፈልግ",
+  "searchPatientsPlaceholder": "Search by name, ID number, gender, or cause of death...",
   "sharedCompartment_one": "{{count}} የሚጋራ",
   "sharedCompartment_other": "{{count}} የሚጋሩ",
   "singleOccupancy": "አንድ ተኮር",
@@ -88,6 +97,7 @@
   "swapCompartment": "ክፍል ቀይር",
   "timeSpent": "ያሳለፈው ጊዜ",
   "totalCount": "ጠቅላላ",
+  "tryAgain": "Try adjusting your search {{searchTerm}} and try again",
   "unknown": "የማይታወቅ",
   "viewDetails": "ዝርዝሮችን እይ",
   "visitType": "የጉብኝት አይነት",

package/translations/en.json

@@ -9,14 +9,13 @@
   "admitted": "Admitted",
   "admittedHeader": "Admitted",
   "age": "Age",
-  "allocation": "Allocation",
   "attachements": "Attachements",
   "attachments": "Attachments",
-  "autopsyDeleted": "Autopsy report deleted",
   "autopsyReport": "Autopsy report",
   "available": "Available",
   "awaiting": "Awaiting",
   "awaitingAdmissionHeader": "Awaiting Admission",
+  "backToHome": "Back to Home",
   "bedType": "Bed Type",
   "billingHistory": "Billing history",
   "cancel": "Cancel",
@@ -41,8 +40,6 @@
   "dischargeDate": "Discharge Date",
   "dischargedHeader": "Discharged",
   "dischargeForm": "Discharge form",
-  "dispose": "Dispose",
-  "disposeForm": "Dispose",
   "dividerText": "Shared",
   "durationOnWard": "Days In Queue",
   "edit": "Edit",
@@ -50,7 +47,6 @@
   "empty": "Empty",
   "emptyCompartment": "Empty compartment",
   "encounterType": "Encounter type",
-  "error": "Error",
   "errorLoadingPatients": "Error loading discharged patients",
   "errorMessage": "Error",
   "formName": "Form name",
@@ -59,28 +55,41 @@
   "lengthofStay": "Length of stay",
   "listView": "List",
   "loadData": "Loading summary data...",
+  "loading": "Loading...",
   "loadingPatients": "Loading patients...",
   "mortician": "Mortician name",
   "mortuary": "Mortuary",
   "mortuaryOperations": "Mortuary operations",
   "name": "Name",
   "nextPage": "Next page",
-  "noAdmittedPatients": "No admitted patients found",
+  "noAdmittedPatient": "No deceased patients currently admitted",
   "noAdmittedPatientsDescription": "There are currently no admitted patients to display.",
   "noAwaitingPatients": "No awaiting patients found",
   "noAwaitingPatientsDescription": "There are currently no awaiting patients to display.",
   "noDeceasedPatients": "No deceased patients awaiting admission",
+  "noDischargedPatient": "No deceased patients currently discharged",
   "noDischargedPatients": "No discharged patients found",
   "noDischargedPatientsDescription": "There are currently no discharged patients to display.",
+  "noMatchingAwaitingPatients": "No matching awaiting patients found",
+  "noMatchingAwaitingPatientsDescription": "Try adjusting your search terms to find awaiting patients.",
+  "noMatchingDischargedPatients": "No matching discharged patients found",
+  "noMatchingDischargedPatientsDescription": "Try adjusting your search terms to find discharged patients.",
+  "noMatchingPatients": "No matching patients found",
+  "noMatchingPatientsDescription": "Try adjusting your search terms to find deceased patients.",
   "noObservationsFound": "No observations found",
   "noPatientSelected": "No patient selected",
+  "noSearchDeceasedPatients": "Search deceased patients",
+  "noSearchResults": "We couldn’t find anything",
   "occupied": "Occupied",
   "patientName": "Patient Name",
+  "postmortem": "Postmortem",
   "postmortemForm": "Postmortem",
   "previousPage": "Previous page",
   "printGatePass": "Gate Pass",
   "printPostMortemReport": "Postmortem Report",
+  "searchDeceasedPatients": "Search deceased patients",
   "searchPatients": "Search Patients",
+  "searchPatientsPlaceholder": "Search by name, ID number, gender, or cause of death...",
   "sharedCompartment_one": "{{count}} sharing",
   "sharedCompartment_other": "{{count}} sharing",
   "singleOccupancy": "Single",
@@ -88,6 +97,7 @@
   "swapCompartment": "Swap compartment",
   "timeSpent": "Time spent",
   "totalCount": "total",
+  "tryAgain": "Try adjusting your search {{searchTerm}} and try again",
   "unknown": "Unknown",
   "viewDetails": "View details",
   "visitType": "Visit type",

package/translations/sw.json

@@ -9,14 +9,13 @@
   "admitted": "Admitted",
   "admittedHeader": "Admitted",
   "age": "Age",
-  "allocation": "Allocation View",
   "attachements": "Attachements",
   "attachments": "Attachments",
-  "autopsyDeleted": "Autopsy report deleted",
   "autopsyReport": "Autopsy report",
   "available": "Available",
   "awaiting": "Awaiting",
   "awaitingAdmissionHeader": "Awaiting Admission",
+  "backToHome": "Back to Home",
   "bedType": "Bed Type",
   "billingHistory": "Billing history",
   "cancel": "Cancel",
@@ -41,8 +40,6 @@
   "dischargeDate": "Discharge Date",
   "dischargedHeader": "Discharged",
   "dischargeForm": "Discharge",
-  "dispose": "Dispose",
-  "disposeForm": "Dispose",
   "dividerText": "Shared",
   "durationOnWard": "Days In Queue",
   "edit": "Edit",
@@ -50,7 +47,6 @@
   "empty": "Empty",
   "emptyCompartment": "Empty compartment",
   "encounterType": "Encounter type",
-  "error": "Error",
   "errorLoadingPatients": "Error loading discharged patients",
   "errorMessage": "Error",
   "formName": "Form name",
@@ -59,28 +55,41 @@
   "lengthofStay": "Length of stay",
   "listView": "List",
   "loadData": "Loading summary data...",
+  "loading": "Loading...",
   "loadingPatients": "Loading patients...",
   "mortician": "Mortician name",
   "mortuary": "Mortuary",
   "mortuaryOperations": "Mortuary operations",
   "name": "Name",
   "nextPage": "Next page",
-  "noAdmittedPatients": "No admitted patients found",
+  "noAdmittedPatient": "No deceased patients currently admitted",
   "noAdmittedPatientsDescription": "There are currently no admitted patients to display.",
   "noAwaitingPatients": "No awaiting patients found",
   "noAwaitingPatientsDescription": "There are currently no awaiting patients to display.",
   "noDeceasedPatients": "No deceased patients awaiting admission",
+  "noDischargedPatient": "No deceased patients currently discharged",
   "noDischargedPatients": "No discharged patients found",
   "noDischargedPatientsDescription": "There are currently no discharged patients to display.",
+  "noMatchingAwaitingPatients": "No matching awaiting patients found",
+  "noMatchingAwaitingPatientsDescription": "Try adjusting your search terms to find awaiting patients.",
+  "noMatchingDischargedPatients": "No matching discharged patients found",
+  "noMatchingDischargedPatientsDescription": "Try adjusting your search terms to find discharged patients.",
+  "noMatchingPatients": "No matching patients found",
+  "noMatchingPatientsDescription": "Try adjusting your search terms to find deceased patients.",
   "noObservationsFound": "No observations found",
   "noPatientSelected": "No patient selected",
+  "noSearchDeceasedPatients": "Search deceased patients",
+  "noSearchResults": "We couldn’t find anything",
   "occupied": "Occupied",
   "patientName": "Patient Name",
+  "postmortem": "Postmortem",
   "postmortemForm": "Postmortem",
   "previousPage": "Previous page",
   "printGatePass": "Gate Pass",
   "printPostMortemReport": "Postmortem Report",
+  "searchDeceasedPatients": "Search deceased patients",
   "searchPatients": "Search Patients",
+  "searchPatientsPlaceholder": "Search by name, ID number, gender, or cause of death...",
   "sharedCompartment_one": "{{count}} sharing",
   "sharedCompartment_other": "{{count}} sharing",
   "singleOccupancy": "Single",
@@ -88,6 +97,7 @@
   "swapCompartment": "Swap Compartment",
   "timeSpent": "Time spent",
   "totalCount": "total",
+  "tryAgain": "Try adjusting your search {{searchTerm}} and try again",
   "unknown": "Unknown",
   "viewDetails": "View details",
   "visitType": "Visit type",