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

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}},{"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"}],"pages":[{"component":"root","route":"morgue"}],"version":"5.4.2-pre.2330"}
+{"$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.2344"}

package/package.json

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

package/src/bed/bed.component.tsx

@@ -6,7 +6,7 @@ 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 { useVisit } from '@openmrs/esm-framework';
+import { ExtensionSlot, useVisit } from '@openmrs/esm-framework';
 
 interface BedProps {
   bedNumber?: string;
@@ -23,7 +23,6 @@ interface BedProps {
   onSwapCompartment?: () => void;
   onDispose?: () => void;
   onPrintGatePass?: () => void;
-  onPrintPostmortem?: () => void;
   onViewDetails?: () => void;
   isDischarged?: boolean;
 }
@@ -43,7 +42,6 @@ const BedCard: React.FC<BedProps> = ({
   onSwapCompartment,
   onDispose,
   onPrintGatePass,
-  onPrintPostmortem,
   onViewDetails,
   isDischarged = false,
 }) => {
@@ -97,9 +95,16 @@ const BedCard: React.FC<BedProps> = ({
             <OverflowMenu flipped>
               {onAdmit && <OverflowMenuItem onClick={onAdmit} itemText={t('admit', 'Admit')} />}
               {onViewDetails && (
-                <OverflowMenuItem onClick={() => onViewDetails()} itemText={t('viewDetails', 'View details')} />
+                <OverflowMenuItem onClick={onViewDetails} itemText={t('viewDetails', 'View details')} />
+              )}
+              {isDischarged && (
+                <ExtensionSlot
+                  name="print-post-mortem-overflow-menu-item-slot"
+                  state={{
+                    patientUuid: patientUuid,
+                  }}
+                />
               )}
-              {onPostmortem && <OverflowMenuItem onClick={onPostmortem} itemText={t('postmortem', 'Postmortem')} />}
               {onDischarge && <OverflowMenuItem onClick={onDischarge} itemText={t('discharge', 'Discharge')} />}
               {onSwapCompartment && (
                 <OverflowMenuItem onClick={onSwapCompartment} itemText={t('swapCompartment', 'Swap Compartment')} />
@@ -108,12 +113,6 @@ const BedCard: React.FC<BedProps> = ({
               {onPrintGatePass && (
                 <OverflowMenuItem onClick={onPrintGatePass} itemText={t('printGatePass', 'Gate Pass')} />
               )}
-              {onPrintPostmortem && (
-                <OverflowMenuItem
-                  onClick={onPrintPostmortem}
-                  itemText={t('printPostmortemReport', 'Postmortem Report')}
-                />
-              )}
             </OverflowMenu>
           </div>
         </div>

package/src/bed-layout/discharged/discharged-bed-layout.component.tsx

@@ -1,9 +1,9 @@
 import React from 'react';
 import { useTranslation } from 'react-i18next';
+import { launchWorkspace, showModal, useConfig } from '@openmrs/esm-framework';
 import { DataTableSkeleton, InlineLoading, Pagination } from '@carbon/react';
-import { launchWorkspace, useConfig } from '@openmrs/esm-framework';
 import styles from '../bed-layout.scss';
-import { type MortuaryLocationResponse } from '../../types';
+import { Patient, type MortuaryLocationResponse } from '../../types';
 import { ConfigObject } from '../../config-schema';
 import { mutate as mutateSWR } from 'swr';
 import usePatients, { useMortuaryDischargeEncounter } from './discharged-bed-layout.resource';
@@ -12,7 +12,7 @@ import BedCard from '../../bed/bed.component';
 interface BedLayoutProps {
   AdmittedDeceasedPatient: MortuaryLocationResponse | null;
   isLoading: boolean;
-  onPrintGatePass?: (patientUuid: string) => void;
+  onPrintGatePass?: (patient: Patient, encounterDate?: string) => void;
   onPrintPostmortem?: (patientUuid: string) => void;
   mutate?: () => void;
 }
@@ -29,6 +29,7 @@ const DischargedBedLayout: React.FC<BedLayoutProps> = ({
 
   const {
     dischargedPatientUuids,
+    encounters,
     isLoading: encountersLoading,
     error: encountersError,
     currentPage,
@@ -44,9 +45,25 @@ const DischargedBedLayout: React.FC<BedLayoutProps> = ({
     error: patientsError,
   } = usePatients(dischargedPatientUuids || []);
 
-  const handlePrintGatePass = (patientUuid: string) => {
+  const getEncounterDateForPatient = (patientUuid: string): string | null => {
+    if (!encounters || encounters.length === 0) {
+      return null;
+    }
+
+    const patientEncounter = encounters.find((encounter) => encounter.patient?.uuid === patientUuid);
+
+    return patientEncounter?.encounterDateTime || null;
+  };
+
+  const handlePrintGatePass = (patient: Patient, encounterDate?: string) => {
     if (onPrintGatePass) {
-      onPrintGatePass(patientUuid);
+      onPrintGatePass(patient, encounterDate);
+    } else {
+      const dispose = showModal('print-confirmation-modal', {
+        onClose: () => dispose(),
+        patient: patient,
+        encounterDate: encounterDate,
+      });
     }
   };
 
@@ -97,6 +114,7 @@ const DischargedBedLayout: React.FC<BedLayoutProps> = ({
           const age = patient?.person?.age;
           const causeOfDeath = patient?.person?.causeOfDeath?.display;
           const dateOfDeath = patient?.person?.deathDate;
+          const encounterDate = getEncounterDateForPatient(patientUuid);
 
           return (
             <BedCard
@@ -107,8 +125,7 @@ const DischargedBedLayout: React.FC<BedLayoutProps> = ({
               causeOfDeath={causeOfDeath}
               dateOfDeath={dateOfDeath}
               patientUuid={patientUuid}
-              onPrintGatePass={() => handlePrintGatePass(patientUuid)}
-              onPrintPostmortem={() => handlePrintPostmortem(patientUuid)}
+              onPrintGatePass={() => handlePrintGatePass(patient, encounterDate)}
               isDischarged={true}
             />
           );

package/src/bed-linelist-view/discharged/discharged-bed-line-view.component.tsx

@@ -16,13 +16,14 @@ import {
   OverflowMenuItem,
   DataTableSkeleton,
 } from '@carbon/react';
-import { useConfig } from '@openmrs/esm-framework';
+import { ExtensionSlot, PrinterIcon, showModal, useConfig } from '@openmrs/esm-framework';
 import styles from '../bed-linelist-view.scss';
 import { formatDateTime } from '../../utils/utils';
-import { type MortuaryLocationResponse } from '../../types';
+import { type Patient, type MortuaryLocationResponse } from '../../types';
 import { ConfigObject } from '../../config-schema';
 import usePatients, { useMortuaryDischargeEncounter } from '../../bed-layout/discharged/discharged-bed-layout.resource';
 import { EmptyState } from '@openmrs/esm-patient-common-lib';
+import { Printer } from '@carbon/react/icons';
 
 interface DischargedBedLineListViewProps {
   AdmittedDeceasedPatient: MortuaryLocationResponse | null;
@@ -30,8 +31,7 @@ interface DischargedBedLineListViewProps {
   paginated?: boolean;
   initialPageSize?: number;
   pageSizes?: number[];
-  onPrintGatePass?: (patientUuid: string) => void;
-  onPrintPostmortem?: (patientUuid: string) => void;
+  onPrintGatePass?: (patient: any, encounterDate?: string) => void;
   mutate?: () => void;
 }
 
@@ -42,7 +42,6 @@ const DischargedBedLineListView: React.FC<DischargedBedLineListViewProps> = ({
   initialPageSize = 10,
   pageSizes = [10, 20, 30, 40, 50],
   onPrintGatePass,
-  onPrintPostmortem,
   mutate,
 }) => {
   const { t } = useTranslation();
@@ -53,6 +52,7 @@ const DischargedBedLineListView: React.FC<DischargedBedLineListViewProps> = ({
 
   const {
     dischargedPatientUuids,
+    encounters,
     isLoading: encountersLoading,
     error: encountersError,
   } = useMortuaryDischargeEncounter(morgueDischargeEncounterTypeUuid, AdmittedDeceasedPatient);
@@ -71,6 +71,7 @@ const DischargedBedLineListView: React.FC<DischargedBedLineListViewProps> = ({
     { key: 'causeOfDeath', header: t('causeOfDeath', 'Cause of Death') },
     { key: 'dateOfDeath', header: t('dateOfDeath', 'Date of Death') },
     { key: 'daysSinceDeath', header: t('daysSinceDeath', 'Days Since Death') },
+    { key: 'dischargeDate', header: t('dischargeDate', 'Discharge Date') },
     { key: 'action', header: t('action', 'Action') },
   ];
 
@@ -84,15 +85,25 @@ const DischargedBedLineListView: React.FC<DischargedBedLineListViewProps> = ({
     return Math.floor(timeDiff / (1000 * 3600 * 24));
   };
 
-  const handlePrintGatePass = (patientUuid: string) => {
-    if (onPrintGatePass) {
-      onPrintGatePass(patientUuid);
+  const getEncounterDateForPatient = (patientUuid: string): string | null => {
+    if (!encounters || encounters.length === 0) {
+      return null;
     }
+
+    const patientEncounter = encounters.find((encounter) => encounter.patient?.uuid === patientUuid);
+
+    return patientEncounter?.encounterDateTime || null;
   };
 
-  const handlePrintPostmortem = (patientUuid: string) => {
-    if (onPrintPostmortem) {
-      onPrintPostmortem(patientUuid);
+  const handlePrintGatePass = (patient: Patient, encounterDate?: string) => {
+    if (onPrintGatePass) {
+      onPrintGatePass(patient, encounterDate);
+    } else {
+      const dispose = showModal('print-confirmation-modal', {
+        onClose: () => dispose(),
+        patient: patient,
+        encounterDate: encounterDate,
+      });
     }
   };
 
@@ -109,9 +120,12 @@ const DischargedBedLineListView: React.FC<DischargedBedLineListViewProps> = ({
       const causeOfDeath = patient?.person?.causeOfDeath?.display || '-';
       const dateOfDeath = patient?.person?.deathDate;
       const daysSinceDeath = calculateDaysSinceDeath(dateOfDeath);
+      const encounterDate = getEncounterDateForPatient(patientUuid);
 
       return {
         id: patientUuid,
+        patient: patient,
+        encounterDate: encounterDate,
         idNumber:
           patient?.identifiers
             ?.find((id) => id.display?.includes('OpenMRS ID'))
@@ -123,12 +137,13 @@ const DischargedBedLineListView: React.FC<DischargedBedLineListViewProps> = ({
         causeOfDeath: causeOfDeath,
         dateOfDeath: formatDateTime(dateOfDeath),
         daysSinceDeath: daysSinceDeath.toString(),
+        dischargeDate: formatDateTime(encounterDate),
         action: patientUuid,
       };
     });
 
     return rows;
-  }, [dischargedPatients]);
+  }, [dischargedPatients, getEncounterDateForPatient]);
 
   const totalCount = allRows.length;
   const startIndex = (currentPage - 1) * currPageSize;
@@ -202,8 +217,9 @@ const DischargedBedLineListView: React.FC<DischargedBedLineListViewProps> = ({
               </TableHead>
               <TableBody>
                 {rows.map((row) => {
-                  const patientData = dischargedPatients.find((patient) => patient?.uuid === row.id);
-                  const patientName = patientData?.person?.display || '';
+                  const rowData = paginatedRows.find((r) => r.id === row.id);
+                  const patientData = rowData?.patient;
+                  const encounterDate = rowData?.encounterDate;
 
                   return (
                     <TableRow key={row.id} {...getRowProps({ row })}>
@@ -211,16 +227,15 @@ const DischargedBedLineListView: React.FC<DischargedBedLineListViewProps> = ({
                         <TableCell key={cell.id} {...getCellProps({ cell })}>
                           {cell.info.header === 'action' ? (
                             <div className={styles.actionButtons}>
-                              <OverflowMenu flipped>
+                              <OverflowMenu renderIcon={Printer} flipped>
                                 <OverflowMenuItem
-                                  onClick={() => handlePrintGatePass(row.id)}
+                                  onClick={() => handlePrintGatePass(patientData, encounterDate)}
                                   itemText={t('printGatePass', 'Gate Pass')}
                                   disabled={!patientData}
                                 />
-                                <OverflowMenuItem
-                                  onClick={() => handlePrintPostmortem(row.id)}
-                                  itemText={t('printPostmortem', 'Postmortem')}
-                                  disabled={!patientData}
+                                <ExtensionSlot
+                                  name="print-post-mortem-overflow-menu-item-slot"
+                                  state={{ patientUuid: row.id }}
                                 />
                               </OverflowMenu>
                             </div>

package/src/config-schema.ts

@@ -106,7 +106,7 @@ export const configSchema = {
   autopsyEncounterFormUuid: {
     _type: Type.String,
     _description: 'Encounter UUID for autopsy',
-    _default: '32b61a73-4971-4fc0-b20b-9a30176317e2',
+    _default: '465a92f2-baf8-42e9-9612-53064be868e8',
   },
   courtOrderCaseNumberUuid: {
     _type: Type.String,

package/src/extension/overflow-menu-item-postmortem/print-postmorterm-report.component.tsx

@@ -0,0 +1,39 @@
+import React from 'react';
+import { OverflowMenuItem } from '@carbon/react';
+import { useTranslation } from 'react-i18next';
+import { showModal, useConfig } from '@openmrs/esm-framework';
+import { ConfigObject } from '../../config-schema';
+import { useAutospyEncounter } from '../../view-details/view-details.resource';
+import { usePerson } from '../../deceased-patient-header/deceasedInfo/deceased-info.resource';
+
+interface PrintPostMortemOverflowMenuItemProps {
+  patientUuid?: string;
+}
+const PrintPostMortemOverflowMenuItem: React.FC<PrintPostMortemOverflowMenuItemProps> = ({ patientUuid }) => {
+  const { t } = useTranslation();
+  const { autopsyEncounterFormUuid } = useConfig<ConfigObject>();
+
+  const { encounters, isLoading, error, mutate, isValidating } = useAutospyEncounter(
+    patientUuid,
+    autopsyEncounterFormUuid,
+  );
+
+  const handlePrintPostmortem = () => {
+    const dispose = showModal('autopsy-report-modal', {
+      onClose: () => dispose(),
+      encounters: encounters,
+      patientUuid,
+    });
+  };
+  return (
+    <>
+      <OverflowMenuItem
+        onClick={() => handlePrintPostmortem()}
+        itemText={t('printPostMortemReport', 'Postmortem Report')}
+        disabled={isLoading || !encounters?.length}
+      />
+    </>
+  );
+};
+
+export default PrintPostMortemOverflowMenuItem;

package/src/index.ts

@@ -9,6 +9,7 @@ import { configSchema } from './config-schema';
 import { createLeftPanelLink } from './left-panel/morgue-left-panel-link.component';
 import FormEntryWorkspace from './forms/form-entry-workspace/form-entry-workspace.workspace';
 import DisposeForm from './forms/dispose-deceased-person-workspace/dispose-deceased-person.workspace';
+import PrintPostMortemOverflowMenuItem from './extension/overflow-menu-item-postmortem/print-postmorterm-report.component';
 const moduleName = '@kenyaemr/esm-morgue-app';
 
 const options = {
@@ -58,3 +59,13 @@ export const dischargeBodyForm = getAsyncLifecycle(
 export const mortuaryFormEntry = getSyncLifecycle(FormEntryWorkspace, options);
 export const disposeDeceasedPersonForm = getSyncLifecycle(DisposeForm, options);
 export const mortuaryChartView = getAsyncLifecycle(() => import('./view-details/main/main.component'), options);
+export const printConfirmationModal = getAsyncLifecycle(
+  () => import('./modals/mortuary-gate-pass/print-preview-confirmation.modal'),
+  options,
+);
+export const autopsyReportModal = getAsyncLifecycle(
+  () => import('./modals/autopsy-report/autopsy-print-preview-confirmation.modal'),
+  options,
+);
+
+export const printPostMortemOverflowMenuItem = getSyncLifecycle(PrintPostMortemOverflowMenuItem, options);