@kenyaemr/esm-morgue-app 5.4.2-pre.2333 → 5.4.2-pre.2347

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"fhir2":">=1.2","webservices.rest":"^2.24.0"},"extensions":[{"name":"action-buttons","component":"actionBarButtons","slot":"mortuary-action-buttons-slot","meta":{"fullWidth":false,"privileges":["o3 : View Mortuary Dashboard","o3 : Admit Body to Mortuary","o3 : Edit Mortuary Records","o3 : Discharge Body from Mortuary","o3 : View Mortuary Compartments","o3 : Swap Mortuary Compartments","o3 : View Mortuary Billing","o3 : Process Mortuary Payments","o3 : View Mortuary Reports","o3 : Generate Mortuary Reports"]}},{"name":"deceased-banner-info","component":"bannerInfo","slot":"deceased-banner-info-slot","meta":{"fullWidth":false}},{"name":"print-post-mortem-overflow-menu-item","component":"printPostMortemOverflowMenuItem","slot":"print-post-mortem-overflow-menu-item-slot"},{"component":"root","name":"morgue-dashboard-root","slot":"morgue-dashboard-slot","meta":{"privileges":["o3 : View Mortuary Dashboard"]}}],"workspaces":[{"name":"patient-additional-info-form","component":"patientAdditionalInfoForm","title":"add more details","type":"other-form"},{"name":"discharge-body-form","component":"dischargeBodyForm","title":"discharge body form","type":"other-form"},{"name":"admit-body-form","component":"admitBodyForm","title":"Admission form","type":"other-form"},{"name":"swap-unit-form","component":"swapForm","title":"Swap form","type":"other-form"},{"name":"admit-deceased-person-form","component":"admitDeceasedPersonForm","title":"Admit Deceased Person","type":"other-form"},{"name":"mortuary-form-entry","component":"mortuaryFormEntry","title":"Mortuary Form Entry","type":"form","width":"extra-wide","canMaximize":true,"canHide":true},{"name":"dispose-deceased-person-form","component":"disposeDeceasedPersonForm","title":"Dispose Deceased Person","type":"other-form"}],"modals":[{"name":"print-confirmation-modal","component":"printConfirmationModal"},{"name":"autopsy-report-modal","component":"autopsyReportModal"}],"pages":[{"component":"root","route":"morgue"}],"version":"5.4.2-pre.2333"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"fhir2":">=1.2","webservices.rest":"^2.24.0"},"extensions":[{"name":"action-buttons","component":"actionBarButtons","slot":"mortuary-action-buttons-slot","meta":{"fullWidth":false,"privileges":["o3 : View Mortuary Dashboard","o3 : Admit Body to Mortuary","o3 : Edit Mortuary Records","o3 : Discharge Body from Mortuary","o3 : View Mortuary Compartments","o3 : Swap Mortuary Compartments","o3 : View Mortuary Billing","o3 : Process Mortuary Payments","o3 : View Mortuary Reports","o3 : Generate Mortuary Reports"]}},{"name":"deceased-banner-info","component":"bannerInfo","slot":"deceased-banner-info-slot","meta":{"fullWidth":false}},{"name":"print-post-mortem-overflow-menu-item","component":"printPostMortemOverflowMenuItem","slot":"print-post-mortem-overflow-menu-item-slot"},{"component":"root","name":"morgue-dashboard-root","slot":"morgue-dashboard-slot","meta":{"privileges":["o3 : View Mortuary Dashboard"]}}],"workspaces":[{"name":"patient-additional-info-form","component":"patientAdditionalInfoForm","title":"add more details","type":"other-form"},{"name":"discharge-body-form","component":"dischargeBodyForm","title":"discharge body form","type":"other-form"},{"name":"admit-body-form","component":"admitBodyForm","title":"Admission form","type":"other-form"},{"name":"swap-unit-form","component":"swapForm","title":"Swap form","type":"other-form"},{"name":"admit-deceased-person-form","component":"admitDeceasedPersonForm","title":"Admit Deceased Person","type":"other-form"},{"name":"mortuary-form-entry","component":"mortuaryFormEntry","title":"Mortuary Form Entry","type":"form","width":"extra-wide","canMaximize":true,"canHide":true}],"modals":[{"name":"print-confirmation-modal","component":"printConfirmationModal"},{"name":"autopsy-report-modal","component":"autopsyReportModal"}],"pages":[{"component":"root","route":"morgue"}],"version":"5.4.2-pre.2347"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kenyaemr/esm-morgue-app",
-  "version": "5.4.2-pre.2333",
+  "version": "5.4.2-pre.2347",
   "description": "morgue app for KenyaEMR",
   "browser": "dist/kenyaemr-esm-morgue-app.js",
   "main": "src/index.ts",

package/src/bed/bed.component.tsx

@@ -1,59 +1,37 @@
 import React from 'react';
-import { Layer, OverflowMenu, OverflowMenuItem, Tag, Tile } from '@carbon/react';
-import styles from './bed.scss';
+import { Layer, Tile } from '@carbon/react';
 import { useTranslation } from 'react-i18next';
-import { Tag as TagIcon } from '@carbon/react/icons';
-import capitalize from 'lodash-es/capitalize';
-import startCase from 'lodash-es/startCase';
-import { formatDateTime, convertDateToDays } from '../utils/utils';
-import { ExtensionSlot, useVisit } from '@openmrs/esm-framework';
-
-interface BedProps {
-  bedNumber?: string;
-  patientName: string;
-  gender: string;
-  age: number;
-  bedType?: string;
-  causeOfDeath: string;
-  dateOfDeath: string;
-  patientUuid: string;
-  onAdmit?: () => void;
-  onPostmortem?: () => void;
-  onDischarge?: () => void;
-  onSwapCompartment?: () => void;
-  onDispose?: () => void;
-  onPrintGatePass?: () => void;
-  onViewDetails?: () => void;
-  isDischarged?: boolean;
-}
-
-const BedCard: React.FC<BedProps> = ({
-  bedNumber,
-  patientName,
-  gender,
-  age,
-  causeOfDeath,
-  bedType,
-  dateOfDeath,
-  patientUuid,
-  onAdmit,
-  onPostmortem,
-  onDischarge,
-  onSwapCompartment,
-  onDispose,
-  onPrintGatePass,
-  onViewDetails,
-  isDischarged = false,
+import { convertDateToDays } from '../utils/utils';
+import { useVisit } from '@openmrs/esm-framework';
+import styles from './bed.scss';
+import { PatientCardProps } from '../types';
+import { usePatientContext } from '../context/deceased-person-context';
+import DeceasedPatientCardHeader from './components/deceased-patient-card-header.component';
+import DeceasedPatientInfo from './components/deceased-patient-info.component';
+import DeceasedPatientStatusFooter from './components/deceased-patient-status-footer.component';
+import { getOriginalPatient } from '../helpers/expression-helper';
+const BedCard: React.FC<PatientCardProps> = ({
+  patient,
+  showActions = {
+    admit: false,
+    discharge: false,
+    postmortem: false,
+    swapCompartment: false,
+    printGatePass: false,
+    viewDetails: false,
+  },
 }) => {
   const { t } = useTranslation();
-  const { activeVisit } = useVisit(patientUuid);
+  const { activeVisit } = useVisit(patient.uuid);
+  const { onAdmit, onPostmortem, onDischarge, onSwapCompartment, onPrintGatePass, onViewDetails } = usePatientContext();
 
   const lengthOfStay = activeVisit?.startDatetime
     ? convertDateToDays(activeVisit.startDatetime)
-    : calculateDaysInMortuary(dateOfDeath);
+    : calculateDaysInMortuary(patient.person.deathDate);
 
   const isAdmitted = !!activeVisit;
-  const timeSpentTagType = lengthOfStay > 7 ? 'red' : lengthOfStay > 3 ? 'magenta' : 'green';
+  const timeSpentTagType: 'red' | 'magenta' | 'green' =
+    lengthOfStay > 7 ? 'red' : lengthOfStay > 3 ? 'magenta' : 'green';
 
   function calculateDaysInMortuary(dateOfDeath: string): number {
     if (!dateOfDeath) {
@@ -65,96 +43,47 @@ const BedCard: React.FC<BedProps> = ({
     return Math.floor(timeDiff / (1000 * 3600 * 24));
   }
 
+  const handleAction = (actionType: string) => {
+    switch (actionType) {
+      case 'admit':
+        // For admit action, we need to pass the original MortuaryPatient if available
+        const originalPatient = getOriginalPatient(patient);
+        if (originalPatient) {
+          onAdmit?.(originalPatient);
+        } else {
+          onAdmit?.(patient);
+        }
+        break;
+      case 'postmortem':
+        onPostmortem?.(patient.uuid);
+        break;
+      case 'discharge':
+        onDischarge?.(patient.uuid, patient.bedInfo?.bedId);
+        break;
+      case 'swapCompartment':
+        onSwapCompartment?.(patient.uuid, patient.bedInfo?.bedId);
+        break;
+      case 'printGatePass':
+        onPrintGatePass?.(patient, patient.encounterDate);
+        break;
+      case 'viewDetails':
+        onViewDetails?.(patient.uuid, patient.bedInfo);
+        break;
+    }
+  };
+
   return (
     <Layer className={`${styles.cardWithChildren} ${styles.container}`}>
       <Tile className={styles.tileContainer}>
-        <div className={styles.tileHeader}>
-          <div className={styles.tagContainer}>
-            <div className={styles.tagContainer}>
-              {bedNumber ? (
-                <Tag type="cool-gray" className={styles.bedNumberTag}>
-                  {bedNumber}
-                </Tag>
-              ) : (
-                !isDischarged && (
-                  <Tag type="cool-gray" className={styles.bedNumberTag}>
-                    {t('awaiting', 'Awaiting')}
-                  </Tag>
-                )
-              )}
-              {isDischarged && (
-                <Tag type="blue" className={styles.statusTag}>
-                  {t('discharged', 'Discharged')}
-                </Tag>
-              )}
-              <TagIcon className={styles.tagIcon} />
-            </div>
-          </div>
-          <div>
-            {bedType ? <Tag type="green">{startCase(bedType)}</Tag> : null}
-            <OverflowMenu flipped>
-              {onAdmit && <OverflowMenuItem onClick={onAdmit} itemText={t('admit', 'Admit')} />}
-              {onViewDetails && (
-                <OverflowMenuItem onClick={onViewDetails} itemText={t('viewDetails', 'View details')} />
-              )}
-              {isDischarged && (
-                <ExtensionSlot
-                  name="print-post-mortem-overflow-menu-item-slot"
-                  state={{
-                    patientUuid: patientUuid,
-                  }}
-                />
-              )}
-              {onDischarge && <OverflowMenuItem onClick={onDischarge} itemText={t('discharge', 'Discharge')} />}
-              {onSwapCompartment && (
-                <OverflowMenuItem onClick={onSwapCompartment} itemText={t('swapCompartment', 'Swap Compartment')} />
-              )}
-              {onDispose && <OverflowMenuItem onClick={onDispose} itemText={t('dispose', 'Dispose')} />}
-              {onPrintGatePass && (
-                <OverflowMenuItem onClick={onPrintGatePass} itemText={t('printGatePass', 'Gate Pass')} />
-              )}
-            </OverflowMenu>
-          </div>
-        </div>
-
-        <div className={styles.patientInfoRow}>
-          <span className={styles.patientName}>{capitalize(patientName)}</span>
-          <span className={styles.middot}>•</span>
-          <span className={styles.gender}>{gender}</span>
-          <span className={styles.middot}>•</span>
-          <span className={styles.age}>{age}</span>
-          <span className={styles.ageUnit}>{t('yearsOld', 'Yrs old')}</span>
-        </div>
-
-        <div className={styles.causeOfDeathRow}>
-          <span className={styles.causeLabel}>{t('causeOfDeath', 'Cause of death')}</span>
-          <span className={styles.causeValue}>{startCase(causeOfDeath)}</span>
-        </div>
-        <div className={styles.patientInfoRow}>
-          <span className={styles.causeLabel}>{t('dateOfDeath', 'Date of death')}</span>
-          <span className={styles.causeValue}>{formatDateTime(dateOfDeath)}</span>
-        </div>
-        {isAdmitted && (
-          <div className={styles.patientInfoRow}>
-            <span className={styles.causeLabel}>{t('admissionDate', 'Admission Date')}</span>
-            <span className={styles.causeValue}>
-              {activeVisit?.startDatetime ? formatDateTime(activeVisit.startDatetime) : '-'}
-            </span>
-          </div>
-        )}
-        <div className={styles.borderLine}></div>
-        <div className={styles.cardRow}>
-          <span className={styles.causeLabel}>
-            {isAdmitted ? t('timeSpent', 'Time spent') : t('daysInMortuary', 'Days in mortuary')}
-          </span>
-          <div className={styles.tagsContainer}>
-            <Tag size="md" type={timeSpentTagType}>
-              <span className={styles.causeLabel}>{lengthOfStay}</span>{' '}
-              {lengthOfStay === 1 ? t('day', 'Day') : t('days', 'Days')}
-            </Tag>
-            {isAdmitted && !isDischarged && <Tag type="green">{t('admitted', 'Admitted')}</Tag>}
-          </div>
-        </div>
+        <DeceasedPatientCardHeader patient={patient} showActions={showActions} onAction={handleAction} />
+        <DeceasedPatientInfo patient={patient} />
+        <DeceasedPatientStatusFooter
+          patient={patient}
+          isAdmitted={isAdmitted}
+          lengthOfStay={lengthOfStay}
+          timeSpentTagType={timeSpentTagType}
+          activeVisit={activeVisit}
+        />
       </Tile>
     </Layer>
   );

package/src/bed/components/deceased-patient-card-header.component.tsx

@@ -0,0 +1,73 @@
+import React from 'react';
+import { Tag, OverflowMenu, OverflowMenuItem } from '@carbon/react';
+import startCase from 'lodash-es/startCase';
+import { useTranslation } from 'react-i18next';
+import { type EnhancedPatient, PatientCardProps } from '../../types';
+import { ExtensionSlot } from '@openmrs/esm-framework';
+import styles from '../bed.scss';
+import { Tag as TagIcon } from '@carbon/react/icons';
+
+interface PatientCardHeaderProps {
+  patient: EnhancedPatient;
+  showActions: PatientCardProps['showActions'];
+  onAction: (actionType: string) => void;
+}
+
+const DeceasedPatientCardHeader: React.FC<PatientCardHeaderProps> = ({ patient, showActions, onAction }) => {
+  const { t } = useTranslation();
+
+  return (
+    <div className={styles.tileHeader}>
+      <div className={styles.tagContainer}>
+        {patient.bedInfo?.bedNumber ? (
+          <Tag type="cool-gray" className={styles.bedNumberTag}>
+            {patient.bedInfo.bedNumber}
+          </Tag>
+        ) : (
+          !patient.isDischarged && (
+            <Tag type="cool-gray" className={styles.bedNumberTag}>
+              {t('awaiting', 'Awaiting')}
+            </Tag>
+          )
+        )}
+        {patient.isDischarged && (
+          <Tag type="blue" className={styles.statusTag}>
+            {t('discharged', 'Discharged')}
+          </Tag>
+        )}
+        <TagIcon className={styles.tagIcon} />
+      </div>
+
+      <div>
+        {patient.bedInfo?.bedType && <Tag type="green">{startCase(patient.bedInfo.bedType)}</Tag>}
+
+        <OverflowMenu flipped>
+          {showActions.admit && <OverflowMenuItem onClick={() => onAction('admit')} itemText={t('admit', 'Admit')} />}
+          {showActions.viewDetails && (
+            <OverflowMenuItem onClick={() => onAction('viewDetails')} itemText={t('viewDetails', 'View details')} />
+          )}
+          {patient.isDischarged && (
+            <ExtensionSlot name="print-post-mortem-overflow-menu-item-slot" state={{ patientUuid: patient.uuid }} />
+          )}
+          {showActions.discharge && (
+            <OverflowMenuItem onClick={() => onAction('discharge')} itemText={t('discharge', 'Discharge')} />
+          )}
+          {showActions.swapCompartment && (
+            <OverflowMenuItem
+              onClick={() => onAction('swapCompartment')}
+              itemText={t('swapCompartment', 'Swap Compartment')}
+            />
+          )}
+          {showActions.postmortem && (
+            <OverflowMenuItem onClick={() => onAction('postmortem')} itemText={t('postmortem', 'Postmortem')} />
+          )}
+          {showActions.printGatePass && (
+            <OverflowMenuItem onClick={() => onAction('printGatePass')} itemText={t('printGatePass', 'Gate Pass')} />
+          )}
+        </OverflowMenu>
+      </div>
+    </div>
+  );
+};
+
+export default DeceasedPatientCardHeader;

package/src/bed/components/deceased-patient-info.component.tsx

@@ -0,0 +1,47 @@
+import React from 'react';
+import { useTranslation } from 'react-i18next';
+import { type EnhancedPatient } from '../../types';
+import capitalize from 'lodash-es/capitalize';
+import startCase from 'lodash-es/startCase';
+import { formatDateTime } from '../../utils/utils';
+import styles from '../bed.scss';
+
+interface PatientInfoProps {
+  patient: EnhancedPatient;
+}
+
+const DeceasedPatientInfo: React.FC<PatientInfoProps> = ({ patient }) => {
+  const { t } = useTranslation();
+
+  return (
+    <>
+      <div className={styles.patientInfoRow}>
+        <span className={styles.patientName}>{capitalize(patient.person.display)}</span>
+        <span className={styles.middot}>•</span>
+        <span className={styles.gender}>{patient.person.gender}</span>
+        <span className={styles.middot}>•</span>
+        <span className={styles.age}>{patient.person.age}</span>
+        <span className={styles.ageUnit}>{t('yearsOld', 'Yrs old')}</span>
+      </div>
+
+      <div className={styles.causeOfDeathRow}>
+        <span className={styles.causeLabel}>{t('causeOfDeath', 'Cause of death')}</span>
+        <span className={styles.causeValue}>{startCase(patient.person.causeOfDeath?.display || '')}</span>
+      </div>
+
+      <div className={styles.patientInfoRow}>
+        <span className={styles.causeLabel}>{t('dateOfDeath', 'Date of death')}</span>
+        <span className={styles.causeValue}>{formatDateTime(patient.person.deathDate)}</span>
+      </div>
+
+      {patient.visitInfo?.admissionDate && (
+        <div className={styles.patientInfoRow}>
+          <span className={styles.causeLabel}>{t('admissionDate', 'Admission Date')}</span>
+          <span className={styles.causeValue}>{formatDateTime(patient.visitInfo.admissionDate)}</span>
+        </div>
+      )}
+    </>
+  );
+};
+
+export default DeceasedPatientInfo;

package/src/bed/components/deceased-patient-status-footer.component.tsx

@@ -0,0 +1,43 @@
+import React from 'react';
+import { Tag } from '@carbon/react';
+import styles from '../bed.scss';
+import { useTranslation } from 'react-i18next';
+import { type EnhancedPatient } from '../../types';
+import { type Visit } from '@openmrs/esm-framework/src';
+interface PatientStatusFooterProps {
+  patient: EnhancedPatient;
+  isAdmitted: boolean;
+  lengthOfStay: number;
+  timeSpentTagType: 'red' | 'magenta' | 'green';
+  activeVisit: Visit;
+}
+
+const DeceasedPatientStatusFooter: React.FC<PatientStatusFooterProps> = ({
+  patient,
+  isAdmitted,
+  lengthOfStay,
+  timeSpentTagType,
+  activeVisit,
+}) => {
+  const { t } = useTranslation();
+
+  return (
+    <>
+      <div className={styles.borderLine}></div>
+      <div className={styles.cardRow}>
+        <span className={styles.causeLabel}>
+          {isAdmitted ? t('timeSpent', 'Time spent') : t('daysInMortuary', 'Days in mortuary')}
+        </span>
+        <div className={styles.tagsContainer}>
+          <Tag size="md" type={timeSpentTagType}>
+            <span className={styles.causeLabel}>{lengthOfStay}</span>{' '}
+            {lengthOfStay === 1 ? t('day', 'Day') : t('days', 'Days')}
+          </Tag>
+          {isAdmitted && !patient.isDischarged && <Tag type="green">{t('admitted', 'Admitted')}</Tag>}
+        </div>
+      </div>
+    </>
+  );
+};
+
+export default DeceasedPatientStatusFooter;