@kenyaemr/esm-morgue-app 5.4.4-pre.98 → 5.4.5-pre.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kenyaemr/esm-morgue-app",
-  "version": "5.4.4-pre.98",
+  "version": "5.4.5-pre.16",
   "description": "morgue app for KenyaEMR",
   "keywords": [
     "openmrs"
@@ -22,7 +22,7 @@
     "build": "rspack --mode=production",
     "coverage": "echo \"Jest has been removed; no unit test runner is configured\" && exit 0",
     "debug": "npm run serve",
-    "extract-translations": "i18next 'src/**/*.component.tsx' 'src/index.ts' --config ../../tools/i18next-parser.config.js",
+    "extract-translations": "i18next 'src/**/*.{ts,tsx}' --config ../../tools/i18next-parser.config.js",
     "lint": "eslint src --ext ts,tsx",
     "serve": "rspack serve --mode=development",
     "start": "openmrs develop",
@@ -46,5 +46,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "stableVersion": "5.4.3"
+  "stableVersion": "5.4.4"
 }

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

@@ -3,7 +3,7 @@ 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';
+import { type Visit } from '@openmrs/esm-framework';
 interface PatientStatusFooterProps {
   patient: EnhancedPatient;
   isAdmitted: boolean;

package/src/bed-linelist-view/awaiting/awaiting-bed-linelist-view.component.tsx

@@ -159,6 +159,7 @@ const AwaitingBedLineListView: React.FC<AwaitingBedLineListViewProps> = ({
           });
 
           mutated?.();
+          dispose();
         } catch (error) {
           showSnackbar({
             kind: 'error',

package/src/config-schema.ts

@@ -100,12 +100,12 @@ export const configSchema = {
   autopsyFormUuid: {
     _type: Type.String,
     _description: 'UUID for autopsy form',
-    _default: '2b61a73-4971-4fc0-b20b-9a30176317e2',
+    _default: '016beec1-edff-4293-b3ed-817c7dddaa93',
   },
   autopsyEncounterFormUuid: {
     _type: Type.String,
     _description: 'Encounter UUID for autopsy',
-    _default: '465a92f2-baf8-42e9-9612-53064be868e8',
+    _default: '32b61a73-4971-4fc0-b20b-9a30176317e2',
   },
   courtOrderCaseNumberUuid: {
     _type: Type.String,
@@ -289,6 +289,11 @@ export const configSchema = {
     _default: 'dfacd928-0370-4315-99d7-6ec1c9f7ae76',
     _description: 'UUID for the patient Opennmrs identifier type to display',
   },
+  paymentMethods: {
+    _type: Type.Array,
+    _description: 'List of payment methods used when printing gatepass',
+    _default: ['Cash', 'Cheque', 'SHA', 'Scheme', 'M.R.M'],
+  },
 };
 
 export interface BillingConfig {
@@ -362,4 +367,5 @@ export type ConfigObject = {
   mortuaryNotUrgentPriorityUuid: string;
   mortalityEncounterTypeUuid: string;
   patientIdentifierTypeUuid: string;
+  paymentMethods: Array<string>;
 };

package/src/dashboard.meta.ts

@@ -1,5 +1,5 @@
 export const mortuaryDashboardMeta = {
   name: 'mortuary',
-  title: 'Mortuary',
+  title: 'mortuary',
   path: 'mortuary',
 };

package/src/forms/admit-deceased-person-workspace/admit-deceased-person.scss

@@ -27,6 +27,25 @@
 .buttonContainer {
   max-width: 50%;
 }
+.buttonSet {
+  display: grid;
+  grid-template-columns: 1fr 1fr;
+  width: 100%;
+  margin-top: auto;
+
+  :global(.cds--btn) {
+    max-width: none;
+    width: 100%;
+    display: inline-flex;
+    justify-content: center;
+    align-items: center;
+  }
+
+  &.tablet {
+    padding: layout.$spacing-04 layout.$spacing-05;
+    background-color: colors.$white;
+  }
+}
 .inlineLoading {
   display: flex;
   align-items: center;

package/src/forms/admit-deceased-person-workspace/admit-deceased-person.workspace.tsx

@@ -1,4 +1,4 @@
-import React, { useEffect, useMemo, useState } from 'react';
+import React, { useMemo, useState } from 'react';
 import {
   Button,
   ButtonSet,
@@ -71,7 +71,6 @@ const AdmitDeceasedPerson: React.FC<Workspace2DefinitionProps<AdmitDeceasedPerso
   const { t } = useTranslation();
   const isTablet = useLayoutType() === 'tablet';
   const [searchTerm, setSearchTerm] = useState('');
-  const [hasUnsavedChanges, setHasUnsavedChanges] = useState(false);
   const { time: defaultTime, period: defaultPeriod } = getCurrentTime();
   const config = useConfig<ConfigObject>();
 
@@ -141,6 +140,10 @@ const AdmitDeceasedPerson: React.FC<Workspace2DefinitionProps<AdmitDeceasedPerso
     },
   });
 
+  const closeWorkspaceWithSavedChanges = () => {
+    closeWorkspace({ discardUnsavedChanges: true });
+  };
+
   const placeOfDeath = watch('placeOfDeath');
   const deadBodyPreservation = watch('deadBodyPreservation');
   const paymentMethodObservable = watch('paymentMethod');
@@ -189,6 +192,7 @@ const AdmitDeceasedPerson: React.FC<Workspace2DefinitionProps<AdmitDeceasedPerso
       if (isSubmitting) {
         return;
       }
+
       const { admissionEncounter, compartment } = await admitBody(patientUuid, data);
 
       if (admissionEncounter && compartment) {
@@ -215,7 +219,7 @@ const AdmitDeceasedPerson: React.FC<Workspace2DefinitionProps<AdmitDeceasedPerso
         kind: 'success',
       });
       mutated();
-      closeWorkspace();
+      closeWorkspaceWithSavedChanges();
     } catch (error) {
       showSnackbar({
         title: t('error', 'Error'),
@@ -225,12 +229,8 @@ const AdmitDeceasedPerson: React.FC<Workspace2DefinitionProps<AdmitDeceasedPerso
     }
   };
 
-  useEffect(() => {
-    setHasUnsavedChanges(isDirty);
-  }, [isDirty, setHasUnsavedChanges]);
-
   return (
-    <Workspace2 title={t('admitDeceasedPerson', 'Admit deceased person')} hasUnsavedChanges={hasUnsavedChanges}>
+    <Workspace2 title={t('admitDeceasedPerson', 'Admit deceased person')} hasUnsavedChanges={isDirty}>
       <Form onSubmit={handleSubmit(onSubmit)} className={styles.form}>
         <div className={styles.formContainer}>
           <Stack gap={3}>
@@ -394,9 +394,7 @@ const AdmitDeceasedPerson: React.FC<Workspace2DefinitionProps<AdmitDeceasedPerso
                             titleText={t('searchServices', 'Search services *')}
                             items={availableServices.map((service) => service.uuid)}
                             itemToString={(item) => availableServices.find((i) => i.uuid === item)?.name ?? ''}
-                            onChange={({ selectedItems }) => {
-                              field.onChange(selectedItems);
-                            }}
+                            onChange={({ selectedItems }) => field.onChange(selectedItems)}
                             placeholder={t('Service', 'Service')}
                             initialSelectedItems={field.value}
                             invalid={!!errors.services}
@@ -418,6 +416,7 @@ const AdmitDeceasedPerson: React.FC<Workspace2DefinitionProps<AdmitDeceasedPerso
                 />
               </Column>
             )}
+
             <ResponsiveWrapper>
               <Controller
                 name="placeOfDeath"
@@ -498,18 +497,16 @@ const AdmitDeceasedPerson: React.FC<Workspace2DefinitionProps<AdmitDeceasedPerso
                           <Controller
                             name="timeOfDeath"
                             control={control}
-                            render={({ field }) => {
-                              return (
-                                <TimePicker
-                                  {...field}
-                                  id="time-of-death-picker"
-                                  labelText={t('timeAdmission', 'Time of admission *')}
-                                  className={styles.formAdmissionTimepicker}
-                                  invalid={!!errors.timeOfDeath}
-                                  invalidText={errors.timeOfDeath?.message}
-                                />
-                              );
-                            }}
+                            render={({ field }) => (
+                              <TimePicker
+                                {...field}
+                                id="time-of-death-picker"
+                                labelText={t('timeAdmission', 'Time of admission *')}
+                                className={styles.formAdmissionTimepicker}
+                                invalid={!!errors.timeOfDeath}
+                                invalidText={errors.timeOfDeath?.message}
+                              />
+                            )}
                           />
                           <Controller
                             name="period"
@@ -540,7 +537,6 @@ const AdmitDeceasedPerson: React.FC<Workspace2DefinitionProps<AdmitDeceasedPerso
                   render={({ field }) => {
                     const yesOption = deathConfirmationTypes.find((type) => type.label === 'Yes');
                     const noOption = deathConfirmationTypes.find((type) => type.label === 'No');
-
                     return (
                       <RadioButtonGroup
                         name="deathConfirmed"
@@ -603,7 +599,6 @@ const AdmitDeceasedPerson: React.FC<Workspace2DefinitionProps<AdmitDeceasedPerso
                     </Column>
                   </FormGroup>
                 </ResponsiveWrapper>
-
                 <ResponsiveWrapper>
                   <FormGroup legendText="">
                     <Column>
@@ -654,7 +649,6 @@ const AdmitDeceasedPerson: React.FC<Workspace2DefinitionProps<AdmitDeceasedPerso
                   render={({ field }) => {
                     const yesOption = deathConfirmationTypes.find((type) => type.label === 'Yes');
                     const noOption = deathConfirmationTypes.find((type) => type.label === 'No');
-
                     return (
                       <RadioButtonGroup
                         name="autopsyPermission"
@@ -757,7 +751,6 @@ const AdmitDeceasedPerson: React.FC<Workspace2DefinitionProps<AdmitDeceasedPerso
                     </Column>
                   </FormGroup>
                 </ResponsiveWrapper>
-
                 <ResponsiveWrapper>
                   <FormGroup legendText="">
                     <Column>
@@ -777,7 +770,6 @@ const AdmitDeceasedPerson: React.FC<Workspace2DefinitionProps<AdmitDeceasedPerso
                     </Column>
                   </FormGroup>
                 </ResponsiveWrapper>
-
                 <ResponsiveWrapper>
                   <FormGroup legendText="">
                     <Column>
@@ -800,6 +792,7 @@ const AdmitDeceasedPerson: React.FC<Workspace2DefinitionProps<AdmitDeceasedPerso
                 </ResponsiveWrapper>
               </>
             )}
+
             <FormGroup
               className={styles.supportingDocuments}
               legendText={t('supportingDocuments', 'Supporting Documents')}>

package/src/forms/discharge-deceased-person-workspace/discharge-body.scss

@@ -21,6 +21,26 @@
   background-color: colors.$white;
 }
 
+.buttonSet {
+  display: grid;
+  grid-template-columns: 1fr 1fr;
+  width: 100%;
+  margin-top: auto;
+
+  :global(.cds--btn) {
+    max-width: none;
+    width: 100%;
+    display: inline-flex;
+    justify-content: center;
+    align-items: center;
+  }
+
+  &.tablet {
+    padding: layout.$spacing-04 layout.$spacing-05;
+    background-color: colors.$white;
+  }
+}
+
 .desktop {
   padding: 0;
   padding: layout.$spacing-01 layout.$spacing-04;

package/src/forms/discharge-deceased-person-workspace/discharge-body.workspace.tsx

@@ -61,7 +61,7 @@ const DischargeForm: React.FC<Workspace2DefinitionProps<DischargeFormProps, obje
   const { t } = useTranslation();
   const isTablet = useLayoutType() === 'tablet';
   const [submissionError, setSubmissionError] = useState<string | null>(null);
-  const [hasUnsavedChanges, setHasUnsavedChanges] = useState(false);
+
   const { activeVisit, currentVisitIsRetrospective } = useVisit(patientUuid);
   const { queueEntry } = useVisitQueueEntry(patientUuid, activeVisit?.uuid);
   const { dischargeBody } = useMortuaryOperation();
@@ -108,8 +108,24 @@ const DischargeForm: React.FC<Workspace2DefinitionProps<DischargeFormProps, obje
     },
   });
 
+  const closeWorkspaceWithSavedChanges = () => {
+    closeWorkspace({ discardUnsavedChanges: true });
+  };
+
   const selectedDischargeType = watch('dischargeType');
 
+  const getAttributeValue = useCallback(
+    (attributeTypeUuid: string) =>
+      personAttributes?.find((attr) => attr.attributeType.uuid === attributeTypeUuid)?.value || '',
+    [personAttributes],
+  );
+
+  const getExistingAttributeUuid = useCallback(
+    (attributeTypeUuid: string) =>
+      personAttributes?.find((attr) => attr.attributeType.uuid === attributeTypeUuid)?.uuid || null,
+    [personAttributes],
+  );
+
   useEffect(() => {
     if (personAttributes?.length) {
       setValue('nextOfKinNames', getAttributeValue(nextOfKinNameUuid));
@@ -120,30 +136,19 @@ const DischargeForm: React.FC<Workspace2DefinitionProps<DischargeFormProps, obje
   }, [
     personAttributes,
     setValue,
+    getAttributeValue,
     nextOfKinNameUuid,
     nextOfKinRelationshipUuid,
     nextOfKinPhoneUuid,
     nextOfKinNationalIdUuid,
   ]);
 
-  const getAttributeValue = useCallback(
-    (attributeTypeUuid: string) =>
-      personAttributes?.find((attr) => attr.attributeType.uuid === attributeTypeUuid)?.value || '',
-    [personAttributes],
-  );
-
-  const getExistingAttributeUuid = useCallback(
-    (attributeTypeUuid: string) =>
-      personAttributes?.find((attr) => attr.attributeType.uuid === attributeTypeUuid)?.uuid || null,
-    [personAttributes],
-  );
-
   const onSubmit = async (data) => {
     setSubmissionError(null);
 
     if (currentVisitIsRetrospective) {
       setCurrentVisit(null, null);
-      closeWorkspace();
+      closeWorkspaceWithSavedChanges();
       return;
     }
 
@@ -180,15 +185,10 @@ const DischargeForm: React.FC<Workspace2DefinitionProps<DischargeFormProps, obje
 
       for (const attr of attributeUpdates) {
         try {
-          const attributeData: any = {
-            attributeType: attr.uuid,
-            value: attr.value,
-          };
-
+          const attributeData: any = { attributeType: attr.uuid, value: attr.value };
           if (attr.existingUuid) {
             attributeData.uuid = attr.existingUuid;
           }
-
           await createOrUpdatePersonAttribute(patientUuid, attributeData, patientInfo);
         } catch (error) {
           showSnackbar({
@@ -214,7 +214,7 @@ const DischargeForm: React.FC<Workspace2DefinitionProps<DischargeFormProps, obje
       });
 
       mutate();
-      closeWorkspace();
+      closeWorkspaceWithSavedChanges();
     } catch (error) {
       let errorMessage = t('dischargeUnknownError', 'An unknown error occurred');
       if (error?.message) {
@@ -224,7 +224,6 @@ const DischargeForm: React.FC<Workspace2DefinitionProps<DischargeFormProps, obje
       } else if (error?.responseBody?.error?.globalErrors) {
         errorMessage = error.responseBody.error.globalErrors[0]?.message || errorMessage;
       }
-
       setSubmissionError(errorMessage);
       showSnackbar({
         title: t('dischargeError', 'Discharge Error'),
@@ -235,12 +234,8 @@ const DischargeForm: React.FC<Workspace2DefinitionProps<DischargeFormProps, obje
     }
   };
 
-  useEffect(() => {
-    setHasUnsavedChanges(isDirty);
-  }, [isDirty, setHasUnsavedChanges]);
-
   return (
-    <Workspace2 title={t('dischargeForm', 'Discharge form')} hasUnsavedChanges={hasUnsavedChanges}>
+    <Workspace2 title={t('dischargeForm', 'Discharge form')} hasUnsavedChanges={isDirty}>
       <Form onSubmit={handleSubmit(onSubmit)} className={styles.form}>
         <div className={styles.formContainer}>
           {isLoadingBills && <InlineLoading description={t('loadingBills', 'Loading bills...')} />}

package/src/forms/swap-compartment-workspace/swap-unit.scss

@@ -142,3 +142,23 @@
 .sectionField {
   padding-top: layout.$spacing-03;
 }
+
+.buttonSet {
+  display: grid;
+  grid-template-columns: 1fr 1fr;
+  width: 100%;
+  margin-top: auto;
+
+  :global(.cds--btn) {
+    max-width: none;
+    width: 100%;
+    display: inline-flex;
+    justify-content: center;
+    align-items: center;
+  }
+
+  &.tablet {
+    padding: layout.$spacing-04 layout.$spacing-05;
+    background-color: colors.$white;
+  }
+}

package/src/forms/swap-compartment-workspace/swap-unit.workspace.tsx

@@ -13,7 +13,7 @@ import {
   Tile,
   FormGroup,
 } from '@carbon/react';
-import React, { useState, useMemo, useEffect } from 'react';
+import React, { useState, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import DeceasedInfo from '../../deceased-patient-header/deceasedInfo/deceased-info.component';
 import styles from './swap-unit.scss';
@@ -62,7 +62,6 @@ const SwapForm: React.FC<Workspace2DefinitionProps<SwapFormProps, object, object
   const { currentVisit } = useVisit(patientUuid);
   const { assignDeceasedToCompartment, removeDeceasedFromCompartment, createEncounterForCompartmentSwap } =
     useMortuaryOperation();
-  const [hasUnsavedChanges, setHasUnsavedChanges] = useState(false);
   const [searchTerm, setSearchTerm] = useState('');
 
   const {
@@ -76,6 +75,10 @@ const SwapForm: React.FC<Workspace2DefinitionProps<SwapFormProps, object, object
     },
   });
 
+  const closeWorkspaceWithSavedChanges = () => {
+    closeWorkspace({ discardUnsavedChanges: true });
+  };
+
   const currentBed = mortuaryLocation?.bedLayouts?.find((bed) =>
     bed.patients?.some((patient) => patient.uuid === patientUuid),
   );
@@ -150,7 +153,7 @@ const SwapForm: React.FC<Workspace2DefinitionProps<SwapFormProps, object, object
 
         mutate();
         navigate({ to: window.getOpenmrsSpaBase() + `home/mortuary` });
-        closeWorkspace();
+        closeWorkspaceWithSavedChanges();
       } else {
         showSnackbar({
           kind: 'error',
@@ -167,12 +170,8 @@ const SwapForm: React.FC<Workspace2DefinitionProps<SwapFormProps, object, object
     }
   };
 
-  useEffect(() => {
-    setHasUnsavedChanges(isDirty);
-  }, [isDirty, setHasUnsavedChanges]);
-
   return (
-    <Workspace2 title={t('swapCompartment', 'Swap compartment')} hasUnsavedChanges={hasUnsavedChanges}>
+    <Workspace2 title={t('swapCompartment', 'Swap compartment')} hasUnsavedChanges={isDirty}>
       <Form onSubmit={handleSubmit(onSubmit)} className={styles.form}>
         <div className={styles.formContainer}>
           <Stack gap={3}>
@@ -262,15 +261,11 @@ const SwapForm: React.FC<Workspace2DefinitionProps<SwapFormProps, object, object
             </ResponsiveWrapper>
           </Stack>
         </div>
-        <ButtonSet
-          className={classNames({
-            [styles.tablet]: isTablet,
-            [styles.desktop]: !isTablet,
-          })}>
-          <Button className={styles.buttonContainer} kind="secondary" onClick={() => closeWorkspace()}>
+        <ButtonSet className={classNames(styles.buttonSet, { [styles.tablet]: isTablet })}>
+          <Button kind="secondary" onClick={() => closeWorkspace()}>
             {t('cancel', 'Cancel')}
           </Button>
-          <Button className={styles.buttonContainer} disabled={isSubmitting || !isDirty} kind="primary" type="submit">
+          <Button disabled={isSubmitting || !isDirty} kind="primary" type="submit">
             {isSubmitting ? (
               <span className={styles.inlineLoading}>
                 {t('submitting', 'Submitting' + '...')}

package/src/index.ts

@@ -32,13 +32,13 @@ export function startupApp() {
 }
 
 export const root = getAsyncLifecycle(() => import('./root.component'), options);
-
+// t("mortuary", "Morgue")
 export const morgueDashboardLink = getAsyncLifecycle(
   () =>
     import('./left-panel/morgue-left-panel-link.component').then((m) => ({
       default: m.createLeftPanelLink({
         name: 'morgue',
-        title: 'Mortuary',
+        title: 'mortuary',
       }),
     })),
   options,

package/src/left-panel/morgue-left-panel-link.component.tsx

@@ -2,6 +2,7 @@ import React, { useMemo } from 'react';
 import last from 'lodash-es/last';
 import { BrowserRouter, useLocation } from 'react-router-dom';
 import { ConfigurableLink } from '@openmrs/esm-framework';
+import { useTranslation } from 'react-i18next';
 
 export interface LinkConfig {
   name: string;
@@ -9,6 +10,7 @@ export interface LinkConfig {
 }
 
 export function LinkExtension({ config }: { config: LinkConfig }) {
+  const { t } = useTranslation();
   const { name, title } = config;
   const location = useLocation();
   const spaBasePath = window.getOpenmrsSpaBase() + 'home';
@@ -28,7 +30,7 @@ export function LinkExtension({ config }: { config: LinkConfig }) {
     <ConfigurableLink
       to={spaBasePath + '/' + name}
       className={`cds--side-nav__link ${name === urlSegment && 'active-left-nav-link'}`}>
-      {title}
+      {t(title)}
     </ConfigurableLink>
   );
 }

package/src/mark-patient-deceased-extension/overflow-menu-item/mark-patient-deceased-overflow.extension.tsx

@@ -2,6 +2,7 @@ import React, { useCallback } from 'react';
 import { OverflowMenuItem } from '@carbon/react';
 import { useTranslation } from 'react-i18next';
 import { launchWorkspace2 } from '@openmrs/esm-framework';
+import { usePatientChartStore } from '@openmrs/esm-patient-common-lib';
 
 import styles from './mark-patient-deceased-overflow.scss';
 
@@ -15,11 +16,18 @@ const MarkPatientDeceasedOverflowMenuItem: React.FC<MarkPatientDeceasedOverflowM
   patientUuid,
 }) => {
   const { t } = useTranslation();
+  const { visitContext, mutateVisitContext } = usePatientChartStore(patientUuid);
   const isDead = patient.deceasedBoolean ?? Boolean(patient.deceasedDateTime);
 
   const handleLaunchModal = useCallback(
-    () => launchWorkspace2('mortuary-mark-patient-deceased-workspace-form', { patientUuid }),
-    [],
+    () =>
+      launchWorkspace2(
+        'mortuary-mark-patient-deceased-workspace-form',
+        { patientUuid },
+        {},
+        { patient, patientUuid, visitContext, mutateVisitContext },
+      ),
+    [patient, patientUuid, visitContext, mutateVisitContext],
   );
 
   return (

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

@@ -1,11 +1,12 @@
 import React, { useRef, useState, useMemo } from 'react';
 import { Button, ButtonSet, ModalBody, ModalFooter, InlineNotification } from '@carbon/react';
 import { useReactToPrint } from 'react-to-print';
-import { formatDate, formatDatetime, parseDate, useSession } from '@openmrs/esm-framework';
+import { formatDate, formatDatetime, parseDate, useConfig, useSession } from '@openmrs/esm-framework';
 import styles from './print-preview-confirmation.scss';
 import { type Patient } from '../../types';
 import { formatDateTime, documentId, getAbsoluteDateTime } from '../../utils/utils';
 import { useTranslation } from 'react-i18next';
+import { ConfigObject } from '../../config-schema';
 
 type PrintPreviewModalProps = {
   onClose: () => void;
@@ -15,6 +16,7 @@ type PrintPreviewModalProps = {
 
 const PrintPreviewModal: React.FC<PrintPreviewModalProps> = ({ onClose, patient, encounterDate }) => {
   const { t } = useTranslation();
+  const { paymentMethods } = useConfig<ConfigObject>();
   const [printError, setPrintError] = useState<string | null>(null);
   const printRef = useRef<HTMLDivElement>(null);
   const { sessionLocation, user } = useSession();
@@ -28,7 +30,7 @@ const PrintPreviewModal: React.FC<PrintPreviewModalProps> = ({ onClose, patient,
       setPrintError(null);
     },
     onPrintError: (_, error) => {
-      setPrintError(error?.message || 'An error occurred while printing');
+      setPrintError(error?.message || t('errorOccurredWhilePrinting', 'An error occurred while printing'));
     },
     pageStyle: `
       @page {
@@ -108,26 +110,12 @@ const PrintPreviewModal: React.FC<PrintPreviewModalProps> = ({ onClose, patient,
                   {t('methodOfPayment', 'Method of payment (tick as appropriate)')}
                 </div>
                 <div className={styles.paymentGrid}>
-                  <div className={styles.paymentOption}>
-                    <span className={styles.checkbox}></span>
-                    <span className={styles.optionLabel}>{t('cash', 'Cash')}</span>
-                  </div>
-                  <div className={styles.paymentOption}>
-                    <span className={styles.checkbox}></span>
-                    <span className={styles.optionLabel}>{t('cheque', 'Cheque')}</span>
-                  </div>
-                  <div className={styles.paymentOption}>
-                    <span className={styles.checkbox}></span>
-                    <span className={styles.optionLabel}>{t('sha', 'SHA')}</span>
-                  </div>
-                  <div className={styles.paymentOption}>
-                    <span className={styles.checkbox}></span>
-                    <span className={styles.optionLabel}>{t('scheme', 'Scheme')}</span>
-                  </div>
-                  <div className={styles.paymentOption}>
-                    <span className={styles.checkbox}></span>
-                    <span className={styles.optionLabel}>{t('mrM', 'M.R.M')}</span>
-                  </div>
+                  {paymentMethods.map((method, i) => (
+                    <div className={styles.paymentOption} key={i}>
+                      <span className={styles.checkbox}></span>
+                      <span className={styles.optionLabel}>{t(method)}</span>
+                    </div>
+                  ))}
                   <div className={styles.paymentOption}>
                     <span className={styles.checkbox}></span>
                     <span className={styles.optionLabel}>

package/src/routes.json

@@ -75,7 +75,7 @@
     {
       "name": "mortuary-mark-patient-deceased-workspace-form",
       "component": "markPatientDeceasedForm",
-      "window": "morgue-workspace-window"
+      "window": "patient-chart-workspace-window"
     },
     {
       "name": "discharge-body-form",
@@ -100,6 +100,10 @@
     "canHide": true,
     "group": "morgue-workspace-group",
     "width": "wider"
+  },
+  {
+    "name": "patient-chart-workspace-window",
+    "group": "patient-chart"
   }
 ],
   "workspaceGroups2": [