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

package/src/view-details/panels/autopsy.component.tsx

@@ -9,13 +9,7 @@ import {
   useLayoutType,
   usePagination,
 } from '@openmrs/esm-framework';
-import {
-  CardHeader,
-  EmptyState,
-  ErrorState,
-  getPatientUuidFromStore,
-  usePaginationInfo,
-} from '@openmrs/esm-patient-common-lib';
+import { CardHeader, EmptyState, ErrorState, usePaginationInfo } from '@openmrs/esm-patient-common-lib';
 import {
   Button,
   DataTable,
@@ -40,15 +34,24 @@ import { ConfigObject } from '../../config-schema';
 import EncounterObservations from './observations/observation.component';
 import { Observation } from '../../types';
 import { useAutospyEncounter } from '../view-details.resource';
+import { useParams } from 'react-router-dom';
+
+interface RouteParams {
+  patientUuid: string;
+  [key: string]: string | undefined;
+}
 
 const AutopsyView: React.FC = () => {
   const { t } = useTranslation();
-  const patientUuid = getPatientUuidFromStore();
+  const { patientUuid } = useParams<RouteParams>();
+
   const { autopsyFormUuid, autopsyEncounterFormUuid } = useConfig<ConfigObject>();
+
   const { encounters, isLoading, error, mutate, isValidating } = useAutospyEncounter(
     patientUuid,
     autopsyEncounterFormUuid,
   );
+
   const headerTitle = t('autopsyReport', 'Autopsy report');
   const layout = useLayoutType();
   const [pageSize, setPageSize] = React.useState(10);
@@ -57,16 +60,20 @@ const AutopsyView: React.FC = () => {
   const { pageSizes } = usePaginationInfo(pageSize, encounters?.length, currentPage, results?.length);
 
   const handleLaunchAutopsyForm = (encounterUUID = '') => {
+    const workspaceTitle = encounterUUID
+      ? t('editAutopsyReport', 'Edit Autopsy Report')
+      : t('addAutopsyReport', 'Add Autopsy Report');
+
     launchWorkspace('mortuary-form-entry', {
-      workspaceTitle: t('autopsyReport', 'Autopsy report'),
-      mutateForm: () => mutate(),
-      formInfo: {
-        encounterUuid: encounterUUID,
-        formUuid: autopsyFormUuid,
-        patientUuid,
-        visitTypeUuid: '',
-        visitUuid: '',
+      workspaceTitle,
+      mutateForm: () => {
+        mutate();
       },
+      formUuid: autopsyFormUuid,
+      encounterUuid: encounterUUID,
+      patientUuid,
+      visitTypeUuid: '',
+      visitUuid: '',
     });
   };
 
@@ -109,20 +116,23 @@ const AutopsyView: React.FC = () => {
     return <EmptyState displayText={headerTitle} headerTitle={headerTitle} launchForm={handleLaunchAutopsyForm} />;
   }
 
-  const tableRows = encounters.map((encounter) => ({
-    id: `${encounter.uuid}`,
-    date: formatDate(parseDate(encounter?.encounterDatetime)),
-    visitType: encounter?.visit?.visitType?.display,
-    encounterType: encounter?.encounterType?.display,
-    formName: encounter?.form?.name,
-    mortician: encounter?.encounterProviders[0]?.provider?.name,
-    action: (
-      <OverflowMenu aria-label="overflow-menu" flipped={false}>
-        <OverflowMenuItem onClick={() => handleLaunchAutopsyForm(encounter.uuid)} itemText={t('edit', 'Edit')} />
-      </OverflowMenu>
-    ),
-    obs: encounter?.obs,
-  }));
+  const tableRows = encounters.map((encounter) => {
+    const row = {
+      id: `${encounter.uuid}`,
+      date: formatDate(parseDate(encounter?.encounterDatetime)),
+      visitType: encounter?.visit?.visitType?.display ?? '--',
+      encounterType: encounter?.encounterType?.display ?? '--',
+      formName: encounter?.form?.name ?? '--',
+      mortician: encounter?.encounterProviders?.[0]?.provider?.name ?? '--',
+      action: (
+        <OverflowMenu aria-label="autopsy-actions" flipped={false}>
+          <OverflowMenuItem onClick={() => handleLaunchAutopsyForm(encounter.uuid)} itemText={t('edit', 'Edit')} />
+        </OverflowMenu>
+      ),
+      obs: encounter?.obs,
+    };
+    return row;
+  });
 
   return (
     <div className={styles.widgetCard}>
@@ -132,10 +142,11 @@ const AutopsyView: React.FC = () => {
           kind="ghost"
           onClick={() => handleLaunchAutopsyForm()}
           renderIcon={(props) => <Add size={24} {...props} />}
-          iconDescription={t('add', 'Add')}>
+          iconDescription={t('addAutopsyReport', 'Add Autopsy Report')}>
           {t('add', 'Add')}
         </Button>
       </CardHeader>
+
       <DataTable isSortable rows={tableRows} headers={tableHeader} size={responsiveSize} useZebraStyles>
         {({
           rows,
@@ -145,51 +156,54 @@ const AutopsyView: React.FC = () => {
           getTableContainerProps,
           getHeaderProps,
           getRowProps,
-        }) => (
-          <TableContainer {...getTableContainerProps}>
-            <Table className={styles.table} {...getTableProps()} aria-label="Bill list">
-              <TableHead>
-                <TableRow>
-                  <TableExpandHeader enableToggle {...getExpandHeaderProps()} />
-                  {headers.map((header, i) => (
-                    <TableHeader
-                      key={i}
-                      {...getHeaderProps({
-                        header,
-                      })}>
-                      {header.header}
-                    </TableHeader>
-                  ))}
-                </TableRow>
-              </TableHead>
-              <TableBody>
-                {rows.map((row, i) => {
-                  const encounter = encounters.find((enc) => enc.uuid === row.id);
-
-                  return (
-                    <React.Fragment key={row.id}>
-                      <TableExpandRow {...getRowProps({ row })}>
-                        {row.cells.map((cell, index) => (
-                          <TableCell key={cell.id}>{cell.value}</TableCell>
-                        ))}
-                      </TableExpandRow>
-                      {row.isExpanded && encounter ? (
-                        <TableExpandedRow className={styles.expandedRow} colSpan={headers.length + 1}>
-                          <div className={styles.container} key={i}>
-                            <EncounterObservations observations={encounter.obs as Observation[]} />
-                          </div>
-                        </TableExpandedRow>
-                      ) : (
-                        <TableExpandedRow className={styles.hiddenRow} colSpan={headers.length + 2} />
-                      )}
-                    </React.Fragment>
-                  );
-                })}
-              </TableBody>
-            </Table>
-          </TableContainer>
-        )}
+        }) => {
+          return (
+            <TableContainer {...getTableContainerProps}>
+              <Table className={styles.table} {...getTableProps()} aria-label="Autopsy reports list">
+                <TableHead>
+                  <TableRow>
+                    <TableExpandHeader enableToggle {...getExpandHeaderProps()} />
+                    {headers.map((header, i) => (
+                      <TableHeader
+                        key={i}
+                        {...getHeaderProps({
+                          header,
+                        })}>
+                        {header.header}
+                      </TableHeader>
+                    ))}
+                  </TableRow>
+                </TableHead>
+                <TableBody>
+                  {rows.map((row, i) => {
+                    const encounter = encounters.find((enc) => enc.uuid === row.id);
+
+                    return (
+                      <React.Fragment key={row.id}>
+                        <TableExpandRow {...getRowProps({ row })}>
+                          {row.cells.map((cell) => (
+                            <TableCell key={cell.id}>{cell.value}</TableCell>
+                          ))}
+                        </TableExpandRow>
+                        {row.isExpanded && encounter ? (
+                          <TableExpandedRow className={styles.expandedRow} colSpan={headers.length + 1}>
+                            <div className={styles.container} key={i}>
+                              <EncounterObservations observations={encounter.obs as Observation[]} />
+                            </div>
+                          </TableExpandedRow>
+                        ) : (
+                          <TableExpandedRow className={styles.hiddenRow} colSpan={headers.length + 2} />
+                        )}
+                      </React.Fragment>
+                    );
+                  })}
+                </TableBody>
+              </Table>
+            </TableContainer>
+          );
+        }}
       </DataTable>
+
       {paginated && (
         <Pagination
           forwardText={t('nextPage', 'Next page')}

package/src/view-details/panels/billing-history.component.tsx

@@ -3,10 +3,17 @@ import { ExtensionSlot, navigate, usePatient } from '@openmrs/esm-framework';
 import { useTranslation } from 'react-i18next';
 import { EmptyState, getPatientUuidFromStore } from '@openmrs/esm-patient-common-lib';
 import styles from './panels.scss';
+import { useParams } from 'react-router-dom';
+
+interface RouteParams {
+  patientUuid: string;
+  [key: string]: string | undefined;
+}
 
 const BillingHistoryView: React.FC = () => {
   const { t } = useTranslation();
-  const patientUuid = getPatientUuidFromStore();
+  const { patientUuid } = useParams<RouteParams>();
+
   return <ExtensionSlot name="patient-chart-billing-dashboard-slot" state={{ patientUuid }} />;
 };
 

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

@@ -12,14 +12,18 @@ import AutopsyView from './panels/autopsy.component';
 import AttachmentView from './panels/attachement.component';
 import { useActiveMorgueVisit } from './view-details.resource';
 import BannerInfo from '../extension/deceasedInfoBanner.component';
+import { useParams } from 'react-router-dom';
 
 interface MortuarySummaryProps {
   bedNumber?: string;
 }
-
+interface RouteParams {
+  patientUuid: string;
+  [key: string]: string | undefined;
+}
 const MortuarySummary: React.FC<MortuarySummaryProps> = ({ bedNumber }) => {
   const { t } = useTranslation();
-  const patientUuid = getPatientUuidFromStore();
+  const { patientUuid } = useParams<RouteParams>();
   const { isLoading } = usePerson(patientUuid);
   const { activeVisit, isLoading: isActiveLoading } = useActiveMorgueVisit(patientUuid);
 

package/translations/am.json

@@ -1,6 +1,7 @@
 {
   "action": "ድርጊት",
   "add": "ጨምር",
+  "addAutopsyReport": "Add Autopsy Report",
   "admissionDate": "የመግቢያ ቀን",
   "admissionForm": "የመግቢያ ቅጽ",
   "admit": "አስገባ",
@@ -10,6 +11,8 @@
   "age": "ዕድሜ",
   "allocation": "የምደባ እይታ",
   "attachements": "አባሪዎች",
+  "attachments": "Attachments",
+  "autopsyDeleted": "Autopsy report deleted",
   "autopsyReport": "የአስከሬን ምርመራ ሪፖርት",
   "available": "ይገኛል",
   "awaiting": "በመጠባበቅ ላይ",
@@ -35,6 +38,7 @@
   "daysSinceDeath": "ከሞቱ በኋላ ያለፉ ቀናት",
   "discharge": "መልቀቅ",
   "discharged": "ተለቋል",
+  "dischargeDate": "Discharge Date",
   "dischargedHeader": "ተለቋል",
   "dischargeForm": "መልቀቅ",
   "dispose": "አስወግድ",
@@ -42,9 +46,11 @@
   "dividerText": "የተጋራ",
   "durationOnWard": "በወረፋ የቆዩ ቀናት",
   "edit": "አስተካክል",
+  "editAutopsyReport": "Edit Autopsy Report",
   "empty": "ባዶ",
   "emptyCompartment": "ባዶ ክፍል",
   "encounterType": "የግኝት አይነት",
+  "error": "Error",
   "errorLoadingPatients": "የተለቀቁ ታካሚዎችን በመጫን ላይ ስህተት",
   "errorMessage": "ስህተት",
   "formName": "የቅጽ ስም",
@@ -67,14 +73,13 @@
   "noDischargedPatients": "ምንም የተለቀቁ ታካሚዎች አልተገኙም",
   "noDischargedPatientsDescription": "በአሁኑ ጊዜ ምንም የተለቀቁ ታካሚዎች የሉም።",
   "noObservationsFound": "ምንም ምልከታዎች አልተገኙም",
+  "noPatientSelected": "No patient selected",
   "occupied": "ተይዟል",
   "patientName": "የታካሚ ስም",
-  "postmortem": "የአስከሬን ምርመራ",
   "postmortemForm": "የአስከሬን ምርመራ",
   "previousPage": "የቀደመ ገጽ",
   "printGatePass": "የበር ማለፊያ",
-  "printPostmortem": "የአስከሬን ምርመራ",
-  "printPostmortemReport": "የአስከሬን ምርመራ ሪፖርት",
+  "printPostMortemReport": "Postmortem Report",
   "searchPatients": "ታካሚዎችን ፈልግ",
   "sharedCompartment_one": "{{count}} የሚጋራ",
   "sharedCompartment_other": "{{count}} የሚጋሩ",

package/translations/en.json

@@ -1,6 +1,7 @@
 {
   "action": "Action",
   "add": "Add",
+  "addAutopsyReport": "Add Autopsy Report",
   "admissionDate": "Admission Date",
   "admissionForm": "Admission form",
   "admit": "Admit",
@@ -10,6 +11,8 @@
   "age": "Age",
   "allocation": "Allocation",
   "attachements": "Attachements",
+  "attachments": "Attachments",
+  "autopsyDeleted": "Autopsy report deleted",
   "autopsyReport": "Autopsy report",
   "available": "Available",
   "awaiting": "Awaiting",
@@ -35,6 +38,7 @@
   "daysSinceDeath": "Days Since Death",
   "discharge": "Discharge body",
   "discharged": "Discharged",
+  "dischargeDate": "Discharge Date",
   "dischargedHeader": "Discharged",
   "dischargeForm": "Discharge form",
   "dispose": "Dispose",
@@ -42,9 +46,11 @@
   "dividerText": "Shared",
   "durationOnWard": "Days In Queue",
   "edit": "Edit",
+  "editAutopsyReport": "Edit Autopsy Report",
   "empty": "Empty",
   "emptyCompartment": "Empty compartment",
   "encounterType": "Encounter type",
+  "error": "Error",
   "errorLoadingPatients": "Error loading discharged patients",
   "errorMessage": "Error",
   "formName": "Form name",
@@ -67,14 +73,13 @@
   "noDischargedPatients": "No discharged patients found",
   "noDischargedPatientsDescription": "There are currently no discharged patients to display.",
   "noObservationsFound": "No observations found",
+  "noPatientSelected": "No patient selected",
   "occupied": "Occupied",
   "patientName": "Patient Name",
-  "postmortem": "Postmortem",
   "postmortemForm": "Postmortem",
   "previousPage": "Previous page",
   "printGatePass": "Gate Pass",
-  "printPostmortem": "Postmortem",
-  "printPostmortemReport": "Postmortem Report",
+  "printPostMortemReport": "Postmortem Report",
   "searchPatients": "Search Patients",
   "sharedCompartment_one": "{{count}} sharing",
   "sharedCompartment_other": "{{count}} sharing",

package/translations/sw.json

@@ -1,6 +1,7 @@
 {
   "action": "Action",
   "add": "Add",
+  "addAutopsyReport": "Add Autopsy Report",
   "admissionDate": "Admission Date",
   "admissionForm": "Admission form",
   "admit": "Admit",
@@ -10,6 +11,8 @@
   "age": "Age",
   "allocation": "Allocation View",
   "attachements": "Attachements",
+  "attachments": "Attachments",
+  "autopsyDeleted": "Autopsy report deleted",
   "autopsyReport": "Autopsy report",
   "available": "Available",
   "awaiting": "Awaiting",
@@ -35,6 +38,7 @@
   "daysSinceDeath": "Days Since Death",
   "discharge": "Discharge",
   "discharged": "Discharged",
+  "dischargeDate": "Discharge Date",
   "dischargedHeader": "Discharged",
   "dischargeForm": "Discharge",
   "dispose": "Dispose",
@@ -42,9 +46,11 @@
   "dividerText": "Shared",
   "durationOnWard": "Days In Queue",
   "edit": "Edit",
+  "editAutopsyReport": "Edit Autopsy Report",
   "empty": "Empty",
   "emptyCompartment": "Empty compartment",
   "encounterType": "Encounter type",
+  "error": "Error",
   "errorLoadingPatients": "Error loading discharged patients",
   "errorMessage": "Error",
   "formName": "Form name",
@@ -67,14 +73,13 @@
   "noDischargedPatients": "No discharged patients found",
   "noDischargedPatientsDescription": "There are currently no discharged patients to display.",
   "noObservationsFound": "No observations found",
+  "noPatientSelected": "No patient selected",
   "occupied": "Occupied",
   "patientName": "Patient Name",
-  "postmortem": "Postmortem",
   "postmortemForm": "Postmortem",
   "previousPage": "Previous page",
   "printGatePass": "Gate Pass",
-  "printPostmortem": "Postmortem",
-  "printPostmortemReport": "Postmortem Report",
+  "printPostMortemReport": "Postmortem Report",
   "searchPatients": "Search Patients",
   "sharedCompartment_one": "{{count}} sharing",
   "sharedCompartment_other": "{{count}} sharing",