@kenyaemr/esm-morgue-app 5.4.2-pre.2372 → 5.4.2-pre.2375

package/src/deceased-banner/deceased-banner.scss

@@ -0,0 +1,71 @@
+@use '@carbon/layout';
+@use '@carbon/type';
+@use '@carbon/colors';
+
+.container {
+  border-top: 0.063rem solid colors.$gray-20;
+  border-bottom: 0.063rem solid colors.$gray-20;
+  background-color: colors.$white-0;
+}
+
+.activePatientContainer,
+.deceasedPatientContainer {
+  background-color: colors.$white-0;
+}
+
+.buttonCol {
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  align-items: flex-end;
+}
+
+.patientBanner {
+  display: flex;
+}
+
+.patientAvatar {
+  width: 3.5rem;
+  height: 3.5rem;
+  margin: layout.$spacing-05;
+  border-radius: 1px;
+}
+
+.patientAvatarButton {
+  cursor: pointer;
+  border: none;
+  padding: 0px;
+  background: none;
+}
+
+.contactDetails {
+  width: 100%;
+  display: flex;
+
+  a {
+    @include type.type-style('body-compact-01');
+    text-decoration: none;
+  }
+}
+
+.tabletContactDetails {
+  display: block;
+
+  .row {
+    &:first-child {
+      border-bottom: 1px solid colors.$gray-20;
+    }
+  }
+
+  .row > .col {
+    &:nth-of-type(2n + 1) {
+      border-right: 1px solid colors.$gray-20;
+    }
+  }
+}
+
+.toggleContactDetailsButton {
+  > svg {
+    fill: colors.$blue-60 !important;
+  }
+}

package/src/empty-state/empty-morgue-admission.component.tsx

@@ -3,20 +3,25 @@ import { useTranslation } from 'react-i18next';
 import styles from './empty-morgue-admission.scss';
 import { EmptyDataIllustration } from '@openmrs/esm-patient-common-lib';
 import { DocumentUnknown, IbmWatsonKnowledgeStudio } from '@carbon/react/icons';
+import { Tile } from '@carbon/react';
 
 interface EmptyDeceasedSearchProps {
   title: string;
-  subTitle: string;
 }
 
-const EmptyMorgueAdmission: React.FC<EmptyDeceasedSearchProps> = ({ title, subTitle }) => {
+const EmptyMorgueAdmission: React.FC<EmptyDeceasedSearchProps> = ({ title }) => {
   const { t } = useTranslation();
 
   return (
-    <div className={styles.emptyStateContainer}>
-      <IbmWatsonKnowledgeStudio className={styles.iconOverrides} />
-      <p className={styles.title}>{title}</p>
-      <p className={styles.subTitle}>{subTitle}</p>
+    <div className={styles.tileContainer}>
+      <Tile className={styles.tile}>
+        <div className={styles.tileContent}>
+          <p className={styles.content}>{title}</p>
+          <p className={styles.emptyStateHelperText}>
+            {t('checkFilters', 'Please check the filters above and try again')}
+          </p>
+        </div>
+      </Tile>
     </div>
   );
 };

package/src/empty-state/empty-morgue-admission.scss

@@ -2,31 +2,33 @@
 @use '@carbon/layout';
 @use '@carbon/type';
 
-.emptyStateContainer {
+.actionButtons {
   display: flex;
-  flex-direction: column;
+  gap: 0.5rem;
   align-items: center;
-  justify-content: center;
-  min-height: 300px;
+}
+.tileContainer {
   background-color: colors.$white;
-  row-gap: layout.$spacing-02;
+  border-top: 1px solid colors.$gray-20;
+  padding: 3rem 0;
+}
 
-  & form {
-    border: none;
-  }
+.tile {
+  margin: auto;
+  width: fit-content;
+}
 
-  .title {
-    @include type.type-style('heading-01');
-    color: colors.$cool-gray-70;
-  }
-  .subTitle {
-    @include type.type-style('body-compact-01');
-    color: colors.$cool-gray-70;
-  }
+.tileContent {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
 }
 
-svg.iconOverrides {
-  width: layout.$spacing-11;
-  height: layout.$spacing-11;
-  fill: var(--brand-03);
+.content {
+  @include type.type-style('heading-compact-02');
+  color: colors.$gray-70;
+  margin-bottom: layout.$spacing-03;
+}
+.emptyStateHelperText {
+  @include type.type-style('helper-text-02');
 }

package/src/modals/mortuary-gate-pass/print-preview-confirmation.modal.tsx

@@ -4,7 +4,7 @@ import { useReactToPrint } from 'react-to-print';
 import { formatDate, formatDatetime, parseDate, useSession } from '@openmrs/esm-framework';
 import styles from './print-preview-confirmation.scss';
 import { type Patient } from '../../types';
-import { formatDateTime, documentId } from '../../utils/utils';
+import { formatDateTime, documentId, getAbsoluteDateTime } from '../../utils/utils';
 import { useTranslation } from 'react-i18next';
 
 type PrintPreviewModalProps = {
@@ -47,19 +47,7 @@ const PrintPreviewModal: React.FC<PrintPreviewModalProps> = ({ onClose, patient,
     return openMRSId;
   };
 
-  const getCurrentDateTime = () => {
-    const now = new Date();
-    return {
-      date: formatDate(now, { mode: 'standard' }),
-      time: now.toLocaleTimeString('en-US', {
-        hour12: false,
-        hour: '2-digit',
-        minute: '2-digit',
-      }),
-    };
-  };
-
-  const currentDateTime = getCurrentDateTime();
+  const currentDateTime = getAbsoluteDateTime();
 
   return (
     <>
@@ -215,8 +203,8 @@ const PrintPreviewModal: React.FC<PrintPreviewModalProps> = ({ onClose, patient,
                 <div className={styles.noteText}>
                   <strong>{t('nb', 'N/B:')}</strong>{' '}
                   {t(
-                    'formDuplicateNote',
-                    'This form should be filled in duplicate, one copy to be retained in the ward and the other to be left at the main gate',
+                    'formDuplicateNotes',
+                    'This form should be filled in duplicate, one copy to be retained in the mortuary and the other to be left at the main gate',
                   )}
                 </div>
               </div>

package/src/utils/utils.ts

@@ -116,3 +116,47 @@ export const documentId = () => {
   const random = Math.random().toString(36).substr(2, 9);
   return `PM-${timestamp}-${random}`.toUpperCase();
 };
+
+/**
+ * Returns an object with the current date and time in the format "DD-MMM-YYYY, hh:mm A".
+ * If the current date and time cannot be retrieved, it returns the current date and time in the format "DD-MMM-YYYY, HH:mm".
+ *
+ * @return {Object} An object with `date` and `time` properties.
+ * @property {string} date - The current date in the format "DD-MMM-YYYY".
+ * @property {string} time - The current time in the format "hh:mm A" or "HH:mm".
+ */
+export const getAbsoluteDateTime = () => {
+  const now = new Date();
+  const formatted = formatDateTime(now);
+  if (formatted && formatted !== '--') {
+    const parts = formatted.split(', ');
+    return {
+      date:
+        parts[0] ||
+        now.toLocaleDateString('en-GB', {
+          day: '2-digit',
+          month: 'short',
+          year: 'numeric',
+        }),
+      time:
+        parts[1] ||
+        now.toLocaleTimeString('en-US', {
+          hour12: false,
+          hour: '2-digit',
+          minute: '2-digit',
+        }),
+    };
+  }
+  return {
+    date: now.toLocaleDateString('en-GB', {
+      day: '2-digit',
+      month: 'short',
+      year: 'numeric',
+    }),
+    time: now.toLocaleTimeString('en-US', {
+      hour12: false,
+      hour: '2-digit',
+      minute: '2-digit',
+    }),
+  };
+};

package/src/view-details/main/main.component.tsx

@@ -1,18 +1,27 @@
 import React from 'react';
 import { useParams } from 'react-router-dom';
-import { Layer, Tile } from '@carbon/react';
-import { ExtensionSlot } from '@openmrs/esm-framework';
+import { InlineLoading, Layer, Tile } from '@carbon/react';
+import { ExtensionSlot, usePatient } from '@openmrs/esm-framework';
 import styles from './main.scss';
 import MortuarySummary from '../view-details.component';
 import Header from '../../header/header.component';
+import PatientBanner from '../../deceased-banner/deceased-banner.component';
 
 const DeceasedDetailsView: React.FC = () => {
   const { patientUuid, bedNumber } = useParams<{ patientUuid: string; bedNumber?: string }>();
+  const { patient, isLoading, error } = usePatient(patientUuid);
+  if (isLoading) {
+    return (
+      <div>
+        <InlineLoading description="Loading patient data..." />
+      </div>
+    );
+  }
 
   return (
     <>
-      <Header title="Mortuary chart" />
       <div className={styles.deceasedDetailsContainer}>
+        <PatientBanner patientUuid={patientUuid} patient={patient} />
         <Layer className={styles.container}>
           <Tile>
             <div className={styles.headingContainer}>

package/translations/am.json

@@ -21,6 +21,7 @@
   "cancel": "ይቅር",
   "cardView": "ካርድ",
   "causeOfDeath": "የሞት መንስኤ:",
+  "checkFilters": "Please check the filters above and try again",
   "chooseOptions": "አማራጮችን ምረጥ",
   "compartment": "ክፍል",
   "compartmentNumber": "የክፍል ቁጥር",
@@ -63,19 +64,14 @@
   "name": "ስም",
   "nextPage": "ቀጣይ ገጽ",
   "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",
@@ -97,7 +93,6 @@
   "swapCompartment": "ክፍል ቀይር",
   "timeSpent": "ያሳለፈው ጊዜ",
   "totalCount": "ጠቅላላ",
-  "tryAgain": "Try adjusting your search {{searchTerm}} and try again",
   "unknown": "የማይታወቅ",
   "viewDetails": "ዝርዝሮችን እይ",
   "visitType": "የጉብኝት አይነት",

package/translations/en.json

@@ -21,6 +21,7 @@
   "cancel": "Cancel",
   "cardView": "Card",
   "causeOfDeath": "Cause of death: ",
+  "checkFilters": "Please check the filters above and try again",
   "chooseOptions": "Choose options",
   "compartment": "Compartment",
   "compartmentNumber": "Compartment Number",
@@ -63,19 +64,14 @@
   "name": "Name",
   "nextPage": "Next page",
   "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",
@@ -97,7 +93,6 @@
   "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

@@ -21,6 +21,7 @@
   "cancel": "Cancel",
   "cardView": "Card",
   "causeOfDeath": "Cause of death: ",
+  "checkFilters": "Please check the filters above and try again",
   "chooseOptions": "Choose options",
   "compartment": "Compartment",
   "compartmentNumber": "Compartment Number",
@@ -63,19 +64,14 @@
   "name": "Name",
   "nextPage": "Next page",
   "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",
@@ -97,7 +93,6 @@
   "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",