@kenyaemr/esm-morgue-app 5.4.1-pre.1842 → 5.4.1-pre.1850

package/src/tabs/tabs.component.tsx

@@ -1,43 +1,53 @@
+import { Button, Layer, Tab, TabList, TabPanel, TabPanels, Tabs } from '@carbon/react';
+import { SearchAdvanced } from '@carbon/react/icons';
+import { launchWorkspace } from '@openmrs/esm-framework';
 import React from 'react';
-import { Tabs, Tab, TabList, TabPanel, TabPanels, InlineLoading, Layer } from '@carbon/react';
 import { useTranslation } from 'react-i18next';
-import styles from './tabs.scss';
-import { WaitingQueue } from '../tables/waiting-queue.component';
+import useEmrConfiguration from '../hook/useAdmitPatient';
+import { useDischargedPatient } from '../hook/useDischargedPatient';
+import { useAdmissionLocation } from '../hook/useMortuaryAdmissionLocation';
 import { AdmittedQueue } from '../tables/admitted-queue.component';
-import { useDeceasedPatient } from '../hook/useMorgue.resource';
 import { DischargedBodies } from '../tables/discharge-queue.component';
+import styles from './tabs.scss';
 
 export const MorgueTabs: React.FC = () => {
   const { t } = useTranslation();
-  const { data: deceasedPatients, error, isLoading } = useDeceasedPatient();
+  const { admissionLocation } = useAdmissionLocation();
+  const admittedCount = admissionLocation?.bedLayouts?.filter((bed) => bed.status === 'OCCUPIED').length || 0;
+  const { emrConfiguration, isLoadingEmrConfiguration, errorFetchingEmrConfiguration } = useEmrConfiguration();
 
-  const awaitingCount = deceasedPatients?.filter((p) => p.status === 'awaiting').length || 0;
-  const admittedCount = deceasedPatients?.filter((p) => p.status === 'admitted').length || 0;
-  const dischargedCount = deceasedPatients?.filter((p) => p.status === 'discharged').length || 0;
+  const dischargeEncounterTypeUuid = emrConfiguration?.exitFromInpatientEncounterType?.uuid;
+  const { dischargedPatientUuids, isLoading: isLoadingDischargedPatient } =
+    useDischargedPatient(dischargeEncounterTypeUuid);
+  const dischargedCount = dischargedPatientUuids?.length || 0;
 
   const getTabLabel = (baseLabel: string, count: number | null) => (
     <span className={styles.tabLabel}>
-      {baseLabel} {isLoading ? '' : `(${count})`}
+      {baseLabel} {count ? `(${count})` : ''}
     </span>
   );
 
   const tabPanels = [
-    {
-      name: getTabLabel(t('waitQueue', 'Waiting queue'), awaitingCount),
-      component: <WaitingQueue isLoading={isLoading} deceasedPatients={deceasedPatients} error={error} />,
-    },
     {
       name: getTabLabel(t('admitted', 'Admitted'), admittedCount),
       component: <AdmittedQueue />,
     },
     {
       name: getTabLabel(t('discharged', 'Discharged'), dischargedCount),
-      component: <DischargedBodies isLoading={isLoading} deceasedPatients={deceasedPatients} error={error} />,
+      component: (
+        <DischargedBodies
+          isLoading={isLoadingDischargedPatient || isLoadingEmrConfiguration}
+          error={errorFetchingEmrConfiguration}
+          dischargedPatientUuids={dischargedPatientUuids}
+        />
+      ),
     },
   ];
-
+  const handleAdmitBodyWorkspace = () => {
+    launchWorkspace('admit-body-form');
+  };
   return (
-    <div className={styles.referralsList} data-testid="referralsList-list">
+    <div className={styles.referralsList} data-testid="">
       <Tabs selected={0} role="navigation">
         <div className={styles.tabsContainer}>
           <TabList aria-label="Content Switcher as Tabs" contained>
@@ -45,6 +55,16 @@ export const MorgueTabs: React.FC = () => {
               <Tab key={index}>{tab.name}</Tab>
             ))}
           </TabList>
+          <div className={styles.actionBtn}>
+            <Button
+              kind="primary"
+              renderIcon={(props) => <SearchAdvanced size={40} {...props} />}
+              onClick={() => handleAdmitBodyWorkspace()}
+              className={styles.actionBtn}
+              disabled={isLoadingDischargedPatient}>
+              {t('admitBodies', 'Admit bodies')}
+            </Button>
+          </div>
         </div>
 
         <TabPanels>

package/src/tabs/tabs.scss

@@ -2,197 +2,14 @@
 @use '@carbon/type';
 @use '@carbon/colors';
 
-.container {
-  margin: 2rem 0;
-}
-
-.emptyStateContainer,
-.loaderContainer {
-  @extend .container;
-}
-
-.serviceContainer {
-  width: 100%;
-  margin: 0 auto;
-  max-width: 95vw;
-  padding-bottom: 0;
-
-  :has(.filterEmptyState) {
-    border-bottom: none;
-  }
-}
-
-.left-justified-items {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  cursor: pointer;
-  align-items: center;
-}
-
-.filterContainer {
-  flex: 1;
-
-  :global(.cds--dropdown__wrapper--inline) {
-    gap: 0;
-  }
-
-  :global(.cds--list-box__menu-icon) {
-    height: 1rem;
-  }
-
-  :global(.cds--list-box__menu) {
-    min-width: max-content;
-  }
-
-  :global(.cds--list-box) {
-    margin-left: layout.$spacing-03;
-  }
-}
-
-.menu {
-  margin-left: layout.$spacing-03;
-}
-
-.headerContainer {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: layout.$spacing-04 layout.$spacing-05;
-}
-
-.backgroundDataFetchingIndicator {
-  align-items: center;
+.tabsContainer {
   display: flex;
-  flex: 1;
   justify-content: space-between;
-
-  &:global(.cds--inline-loading) {
-    max-height: layout.$spacing-05;
-  }
-}
-
-.tableContainer section {
-  position: relative;
-}
-
-.tableContainer a {
-  text-decoration: none;
-}
-
-.pagination {
-  overflow: hidden;
-
-  &:global(.cds--pagination) {
-    border-top: none;
-  }
-}
-
-.hiddenRow {
-  display: none;
-}
-
-.emptyRow {
-  padding: 0 1rem;
-  display: flex;
   align-items: center;
-}
-
-.visitSummaryContainer {
-  width: 100%;
-  max-width: 768px;
-  margin: 1rem auto;
-}
-
-.expandedActiveVisitRow > td > div {
-  max-height: max-content !important;
-}
-
-.expandedActiveVisitRow td {
-  padding: 0 2rem;
-}
-
-.expandedActiveVisitRow th[colspan] td[colspan] > div:first-child {
-  padding: 0 1rem;
-}
-
-.action {
-  margin-bottom: layout.$spacing-03;
-}
-
-.illo {
-  margin-top: layout.$spacing-05;
-}
-
-.content {
-  @include type.type-style('heading-compact-01');
-  margin-top: layout.$spacing-05;
-  margin-bottom: layout.$spacing-03;
-}
-
-.desktopHeading,
-.tabletHeading {
-  text-align: left;
-  text-transform: capitalize;
-  flex: 1;
-
-  h4 {
-    @include type.type-style('heading-compact-02');
-
-    &:after {
-      content: '';
-      display: block;
-      width: 2rem;
-      padding-top: 3px;
-      border-bottom: 0.375rem solid;
-    }
-  }
-}
-
-.tile {
-  text-align: center;
-}
-
-.menuitem {
-  max-width: none;
-}
-
-.filterEmptyState {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  padding: layout.$spacing-05;
-  margin: layout.$spacing-09;
-  text-align: center;
-}
-
-.filterEmptyStateTile {
-  margin: auto;
-}
-
-.filterEmptyStateContent {
-  @include type.type-style('heading-compact-02');
-  margin-bottom: 0.5rem;
-}
-
-.filterEmptyStateHelper {
-  @include type.type-style('body-compact-01');
+  padding-left: layout.$spacing-05;
 }
 
 .actionBtn {
   display: flex;
-  gap: 0.5rem;
-  margin-right: layout.$spacing-07;
-}
-
-.mainSection {
-  display: grid;
-  grid-template-columns: 16rem 1fr;
-}
-
-.tabsContainer {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding-left: 1rem;
+  margin-right: layout.$spacing-03;
 }

package/src/types/index.ts

@@ -1,6 +1,4 @@
-import { OpenmrsResource } from '@openmrs/esm-framework';
-
-export interface Concept extends OpenmrsResource {}
+import { type OpenmrsResource, type Concept, type OpenmrsResourceStrict } from '@openmrs/esm-framework';
 export type QueuePriority = 'Emergency' | 'Not Urgent' | 'Priority' | 'Urgent';
 export type MappedQueuePriority = Omit<QueuePriority, 'Urgent'>;
 export type QueueService = 'Clinical consultation' | 'Triage';
@@ -9,13 +7,8 @@ export interface Patient {
   uuid: string;
   display: string;
   identifiers: Array<{
-    identifier: string;
     uuid: string;
-    preferred: boolean;
-    location: {
-      uuid: string;
-      name: string;
-    };
+    display: string;
   }>;
   person: {
     uuid: string;
@@ -35,6 +28,14 @@ export interface Patient {
       countyDistrict: string | null;
       address4: string | null;
     } | null;
+    attributes: {
+      uuid: string;
+      display: string;
+      value: string;
+      attributeType: {
+        uuid: string;
+      };
+    }[];
   };
 }
 export interface DeceasedInfo {
@@ -304,3 +305,284 @@ export interface PreferredAddress {
   countyDistrict: any;
   address4: any;
 }
+
+export interface MortuaryLocationFetchResponse {
+  totalBeds: number;
+  occupiedBeds: number;
+  ward: Location;
+  bedLayouts: Array<BedLayout>;
+}
+export interface BedLayout {
+  rowNumber: number;
+  columnNumber: number;
+  bedNumber: string;
+  bedId: number;
+  bedUuid: string;
+  status: BedStatus;
+  bedType: BedType;
+  location: string;
+  patients: Patient[];
+  bedTagMaps: BedTagMap[];
+}
+export interface BedType {
+  uuid: string;
+  name: string;
+  displayName: string;
+  description: string;
+  resourceVersion: string;
+}
+interface BedTagMap {
+  uuid: string;
+  bedTag: {
+    id: number;
+    name: string;
+    uuid: string;
+    resourceVersion: string;
+  };
+}
+export type BedStatus = 'AVAILABLE' | 'OCCUPIED';
+
+export interface BedDetail {
+  bedId: number;
+  bedNumber: string;
+  bedType: BedType;
+  physicalLocation: Location;
+  patients: Array<Patient>;
+}
+
+export interface LocationTag extends OpenmrsResource {
+  name: string;
+}
+
+export type DispositionType = 'ADMIT' | 'DISCHARGE' | 'TRANSFER';
+
+export interface ObsPayload {
+  concept: Concept | string;
+  value?: string | OpenmrsResource;
+  groupMembers?: Array<ObsPayload>;
+}
+
+export interface EmrApiConfigurationResponse {
+  admissionEncounterType: OpenmrsResource;
+  clinicianEncounterRole: OpenmrsResource;
+  consultFreeTextCommentsConcept: OpenmrsResource;
+  visitNoteEncounterType: OpenmrsResource;
+  inpatientNoteEncounterType: OpenmrsResource;
+  transferRequestEncounterType: OpenmrsResource;
+  transferWithinHospitalEncounterType: OpenmrsResource;
+  exitFromInpatientEncounterType: OpenmrsResource;
+  supportsTransferLocationTag: LocationTag;
+  supportsAdmissionLocationTag: LocationTag;
+  supportsLoginLocationTag: LocationTag;
+  supportsVisitsLocationTag: LocationTag;
+  dispositionDescriptor: {
+    admissionLocationConcept: OpenmrsResource;
+    dateOfDeathConcept: OpenmrsResource;
+    dispositionConcept: OpenmrsResource;
+    internalTransferLocationConcept: OpenmrsResource;
+    dispositionSetConcept: OpenmrsResource;
+  };
+  dispositions: Array<{
+    encounterTypes: null;
+    keepsVisitOpen: null;
+    additionalObs: null;
+    careSettingTypes: ['OUTPATIENT'];
+    name: string;
+    conceptCode: string;
+    type: DispositionType;
+    actions: [];
+    excludedEncounterTypes: Array<string>;
+    uuid: string;
+  }>;
+  bedAssignmentEncounterType: OpenmrsResource;
+  cancelADTRequestEncounterType: OpenmrsResource;
+  denyAdmissionConcept: OpenmrsResource;
+  admissionDecisionConcept: OpenmrsResource;
+}
+
+export const customRepProps = [
+  ['metadataSourceName', 'ref'],
+  ['orderingProviderEncounterRole', 'ref'],
+  ['supportsTransferLocationTag', '(uuid,display,name,links)'],
+  ['unknownLocation', 'ref'],
+  ['denyAdmissionConcept', 'ref'],
+  ['admissionForm', 'ref'],
+  ['exitFromInpatientEncounterType', 'ref'],
+  ['extraPatientIdentifierTypes', 'ref'],
+  ['consultFreeTextCommentsConcept', 'ref'],
+  ['sameAsConceptMapType', 'ref'],
+  ['testPatientPersonAttributeType', 'ref'],
+  ['admissionDecisionConcept', 'ref'],
+  ['supportsAdmissionLocationTag', '(uuid,display,name,links)'],
+  ['checkInEncounterType', 'ref'],
+  ['transferWithinHospitalEncounterType', 'ref'],
+  ['suppressedDiagnosisConcepts', 'ref'],
+  ['primaryIdentifierType', 'ref'],
+  ['nonDiagnosisConceptSets', 'ref'],
+  ['fullPrivilegeLevel', 'ref'],
+  ['unknownProvider', 'ref'],
+  ['diagnosisSets', 'ref'],
+  ['personImageDirectory', 'ref'],
+  ['visitNoteEncounterType', 'ref'],
+  ['inpatientNoteEncounterType', 'ref'],
+  ['transferRequestEncounterType', 'ref'],
+  ['consultEncounterType', 'ref'],
+  ['diagnosisMetadata', 'ref'],
+  ['narrowerThanConceptMapType', 'ref'],
+  ['clinicianEncounterRole', 'ref'],
+  ['conceptSourcesForDiagnosisSearch', 'ref'],
+  ['patientDiedConcept', 'ref'],
+  ['emrApiConceptSource', 'ref'],
+  ['lastViewedPatientSizeLimit', 'ref'],
+  ['identifierTypesToSearch', 'ref'],
+  ['telephoneAttributeType', 'ref'],
+  ['checkInClerkEncounterRole', 'ref'],
+  ['dischargeForm', 'ref'],
+  ['unknownCauseOfDeathConcept', 'ref'],
+  ['visitAssignmentHandlerAdjustEncounterTimeOfDayIfNecessary', 'ref'],
+  ['atFacilityVisitType', 'ref'],
+  ['visitExpireHours', 'ref'],
+  ['admissionEncounterType', 'ref'],
+  ['motherChildRelationshipType', 'ref'],
+  ['dispositions', 'ref'],
+  ['dispositionDescriptor', 'ref'],
+  ['highPrivilegeLevel', 'ref'],
+  ['supportsLoginLocationTag', '(uuid,display,name,links)'],
+  ['unknownPatientPersonAttributeType', 'ref'],
+  ['supportsVisitsLocationTag', '(uuid,display,name,links)'],
+  ['transferForm', 'ref'],
+  ['bedAssignmentEncounterType', 'ref'],
+  ['cancelADTRequestEncounterType', 'ref'],
+  ['admissionDecisionConcept', 'ref'],
+  ['denyAdmissionConcept', 'ref'],
+];
+
+export interface Encounter extends OpenmrsResourceStrict {
+  encounterDatetime?: string;
+  patient?: Patient;
+  location?: Location;
+  form?: OpenmrsResource;
+  encounterType?: EncounterType;
+  obs?: Array<Observation>;
+  orders?: any;
+  voided?: boolean;
+  visit?: Visit;
+  encounterProviders?: Array<EncounterProvider>;
+  diagnoses?: any;
+}
+export interface EncounterProvider extends OpenmrsResourceStrict {
+  provider?: OpenmrsResource;
+  encounterRole?: EncounterRole;
+  voided?: boolean;
+}
+
+export interface EncounterType extends OpenmrsResourceStrict {
+  name?: string;
+  description?: string;
+  retired?: boolean;
+}
+
+export interface EncounterRole extends OpenmrsResourceStrict {
+  name?: string;
+  description?: string;
+  retired?: boolean;
+}
+export interface Observation extends OpenmrsResourceStrict {
+  concept: OpenmrsResource;
+  person: Person;
+  obsDatetime: string;
+  accessionNumber: string;
+  obsGroup: Observation;
+  value: number | string | boolean | OpenmrsResource;
+  valueCodedName: OpenmrsResource;
+  groupMembers: Array<Observation>;
+  comment: string;
+  location: Location;
+  order: OpenmrsResource;
+  encounter: Encounter;
+  voided: boolean;
+}
+
+export interface CurrentLocationEncounterResponse {
+  results: {
+    visit: {
+      patient: {
+        uuid: string;
+        display: string;
+      };
+    };
+    encounterAssigningToCurrentInpatientLocation: {
+      encounterDatetime: string;
+    };
+  };
+}
+
+export interface PatientInfo {
+  person?: {
+    uuid: string;
+    display: string;
+    age: number;
+    causeOfDeath?: {
+      display: string;
+    };
+  };
+  uuid: string;
+  attributes: {
+    uuid: string;
+    display: string;
+  }[];
+}
+export interface FHIREncounter {
+  resourceType: string;
+  id: string;
+  meta?: {
+    versionId: string;
+    lastUpdated: string;
+    tag: {
+      system: string;
+      code: string;
+      display: string;
+    }[];
+  };
+  status: string;
+  class: {
+    system: string;
+    code: string;
+  };
+  type: {
+    coding: {
+      system: string;
+      code: string;
+      display: string;
+    }[];
+  }[];
+  subject: {
+    reference: string;
+    type?: string;
+    display?: string;
+  };
+  participant?: {
+    individual: {
+      reference: string;
+      type?: string;
+      identifier?: {
+        value: string;
+      };
+      display?: string;
+    };
+  }[];
+  period: {
+    start: string;
+  };
+  location: {
+    location: {
+      reference: string;
+      type?: string;
+      display?: string;
+    };
+  }[];
+  partOf?: {
+    reference: string;
+    type: string;
+  };
+}

package/src/utils/utils.ts

@@ -1,5 +1,6 @@
 import { makeUrl } from '@openmrs/esm-framework';
 import dayjs from 'dayjs';
+import { z } from 'zod';
 
 /**
  * Generates a URL based on the given path and the current location.
@@ -29,12 +30,22 @@ export const formatDeceasedName = (patient) => {
  * @param startDate - The starting date in string or Date format.
  * @returns The number of days from the start date to today.
  */
-export function convertDateToDays(startDate: string | Date): number {
-  const today = dayjs();
+export function convertDateToDays(startDate?: string | Date): number {
+  if (!startDate) {
+    return 0;
+  }
+
   const start = dayjs(startDate);
-  return today.diff(start, 'day');
-}
+  const today = dayjs();
+
+  const diff = today.diff(start, 'day', true);
 
+  if (Math.abs(diff) < 1 && diff !== 0) {
+    return 1;
+  }
+
+  return Math.abs(Math.round(diff));
+}
 /**
  * Formats a given date string into "DD-MMM-YYYY, hh:mm A" format.
  *
@@ -57,3 +68,43 @@ export const getCurrentTime = () => {
   const period = now.getHours() >= 12 ? 'PM' : 'AM';
   return { time: `${hours}:${minutes}`, period };
 };
+
+export const patientInfoSchema = z.object({
+  dateOfAdmission: z
+    .date({ coerce: true })
+    .refine((date) => !!date, 'Date of admission is required')
+    .refine((date) => date <= new Date(), 'Date of admission cannot be in the future'),
+  timeOfDeath: z.string().nonempty('Time of death is required'),
+  period: z
+    .string()
+    .nonempty('AM/PM is required')
+    .regex(/^(AM|PM)$/i, 'Invalid period'),
+  tagNumber: z.string().nonempty('Tag number is required'),
+  obNumber: z.string().optional(),
+  policeName: z.string().optional(),
+  policeIDNo: z.string().optional(),
+  dischargeArea: z.string().optional(),
+  visitType: z.string().uuid('invalid visit type'),
+  availableCompartment: z.number({ coerce: true }),
+  services: z.array(z.string().uuid('invalid service')).nonempty('Must select one service'),
+  paymentMethod: z.string().uuid('invalid payment method'),
+  insuranceScheme: z.string().optional(),
+  policyNumber: z.string().optional(),
+});
+
+export const dischargeSchema = z.object({
+  dateOfDischarge: z.date({ coerce: true }).refine((date) => !!date, 'Date of discharge is required'),
+  timeOfDischarge: z.string().nonempty('Time of discharge is required'),
+  period: z
+    .string()
+    .nonempty('AM/PM is required')
+    .regex(/^(AM|PM)$/i, 'Invalid period'),
+  burialPermitNumber: z.string().nonempty('Burial Permit Number is required'),
+  nextOfKinNames: z.string().nonempty('Next of kin names is required'),
+  relationshipType: z.string().nonempty('Next of kin relationship is required'),
+  nextOfKinAddress: z.string().nonempty('Next of kin address is required'),
+  nextOfKinContact: z
+    .string()
+    .regex(/^\d{10}$/, 'Phone number must be exactly 10 digits')
+    .nonempty('Next of kin phone number is required'),
+});