@ampath/esm-dha-workflow-app 4.0.0-next.15 → 4.0.0-next.151

package/src/resources/visit.resource.ts

@@ -1,5 +1,5 @@
 import { openmrsFetch, restBaseUrl } from '@openmrs/esm-framework';
-import { type CreateVisitDto } from '../registry/types';
+import { type EndVisitDto, type CreateVisitDto } from '../registry/types';
 
 export async function createVisit(createVisitDto: CreateVisitDto) {
   const url = `${restBaseUrl}/visit`;
@@ -18,3 +18,21 @@ export async function createVisit(createVisitDto: CreateVisitDto) {
 
   return response.json();
 }
+
+export async function endVisit(visitUuid: string, endVisitDto: EndVisitDto) {
+  const url = `${restBaseUrl}/visit/${visitUuid}`;
+  const response = await openmrsFetch(url, {
+    method: 'POST',
+    headers: {
+      'content-type': 'application/json',
+    },
+    body: JSON.stringify(endVisitDto),
+  });
+
+  if (!response.ok) {
+    const errorText = await response.text();
+    throw new Error(`Request failed with ${response.status}: ${errorText}`);
+  }
+
+  return response.json();
+}

package/src/root.component.tsx

@@ -1,22 +1,43 @@
 import React from 'react';
 import styles from './root.scss';
-import { WorkspaceContainer } from '@openmrs/esm-framework';
+import { useLeftNav, WorkspaceContainer } from '@openmrs/esm-framework';
 import { BrowserRouter, Route, Routes } from 'react-router-dom';
 import RegistryComponent from './registry/registry.component';
 import LeftPanel from './left-panel/left-panel.component';
-import Consultation from './consultation/consultation';
+import Triage from './triage/triage.component';
+import LaboratoryComponent from './laboratory/laboratory.component';
+import AppointmentsComponent from './appointments/appointments.component';
+import PharmacyComponent from './pharmacy/pharmacy.component';
+import Consultation from './service-queues/consultation/consultation.component';
+import Dashboard from './dashboard/dashboard.component';
+import DailyBookings from './bookings/daily/daily-bookings.component';
+import Mortuary from './mortuary/mortuary.component';
+import ServiceQueueAdminDashboard from './service-queues/admin/service-queue-admin-dashboard.component';
+import AdmissionsDashboard from './admissions/admissions-dashboard.component';
 
 const Root: React.FC = () => {
+  const spaBasePath = window.spaBase;
+  useLeftNav({
+    name: 'dha-workflow-slot',
+    basePath: spaBasePath,
+    mode: 'normal',
+  });
   return (
-    <BrowserRouter basename={`${window.spaBase}/home`}>
+    <BrowserRouter basename={`${window.spaBase}/dha-workflow`}>
       <LeftPanel />
       <main className={styles.container}>
         <Routes>
-          <Route path="" element={<RegistryComponent />} />
+          <Route path="dashboard" element={<Dashboard />} />
           <Route path="registry" element={<RegistryComponent />} />
-          <Route path="triage" element={<Consultation />} />
           <Route path="consultation" element={<Consultation />} />
-          <Route path="*" element={<RegistryComponent />} />
+          <Route path="triage" element={<Triage />} />
+          <Route path="laboratory" element={<LaboratoryComponent />} />
+          <Route path="pharmacy" element={<PharmacyComponent />} />
+          <Route path="appointments" element={<AppointmentsComponent />} />
+          <Route path="bookings/daily" element={<DailyBookings />} />
+          <Route path="mortuary" element={<Mortuary />} />
+          <Route path="service-queue-admin" element={<ServiceQueueAdminDashboard />} />
+          <Route path="admissions-dashboard" element={<AdmissionsDashboard />} />
         </Routes>
       </main>
       <WorkspaceContainer contextKey="home" />

package/src/routes.json

@@ -4,37 +4,244 @@
   "pages": [
     {
       "component": "root",
-      "route": "home",
+      "route": "dha-workflow",
       "online": true,
       "offline": true
     }
   ],
   "extensions": [
     {
-      "component": "workflowRegistryLink",
-      "name": "workflow-registry-link",
+      "component": "navLinks",
+      "name": "side-nav-workflow-links",
+      "slot": "dha-workflow-slot",
+      "online": true,
+      "offline": true
+    },
+    {
+      "name": "dha-workflow-dashboard-link",
+      "component": "dhaWorkflowDashboardLink",
+      "slot": "homepage-dashboard-slot",
+      "meta": {
+        "name": "dashboard",
+        "slot": "dha-workflow-dashboard-slot",
+        "title": "Dashboard"
+      },
+      "online": true,
+      "offline": true,
+      "order": 0
+    },
+    {
+      "component": "dhaWorkflowDashboard",
+      "name": "dashboardExt",
+      "slot": "dha-workflow-dashboard-slot"
+    },
+    {
+      "name": "registry-dashboard-link",
+      "component": "registryDashboardLink",
+      "slot": "homepage-dashboard-slot",
+      "privileges": ["O3 View Client Registry Dashboard"],
+      "meta": {
+        "name": "registry",
+        "slot": "client-registry-dashboard-slot",
+        "title": "Registry"
+      },
+      "online": true,
+      "offline": true,
+      "order": 1
+    },
+    {
+      "component": "registryExtension",
+      "name": "registry",
+      "slot": "client-registry-dashboard-slot",
+      "privileges": ["O3 View Client Registry Dashboard"]
+    },
+    {
+      "name": "triage-dashboard-link",
+      "component": "triageDashboardLink",
+      "slot": "homepage-dashboard-slot",
+      "privileges": ["O3 View Triage Dashboard"],
+      "meta": {
+        "name": "triage",
+        "slot": "triage-queue-dashboard-slot",
+        "title": "Triage"
+      },
+      "online": true,
+      "offline": false
+    },
+    {
+      "component": "triageQueueExtension",
+      "name": "triage",
+      "slot": "triage-queue-dashboard-slot",
+      "privileges": ["O3 View Triage Dashboard"]
+    },
+    {
+      "name": "consultation-dashboard-link",
+      "component": "consultationDashboardLink",
+      "slot": "homepage-dashboard-slot",
+      "privileges": ["O3 View Consultation Dashboard"],
+      "meta": {
+        "name": "consultation",
+        "slot": "consultation-dashboard-slot",
+        "title": "Consultation"
+      },
+      "online": true,
+      "offline": false
+    },
+    {
+      "component": "consultationQueue",
+      "name": "consultation",
+      "slot": "consultation-dashboard-slot",
+      "privileges": ["O3 View Consultation Dashboard"]
+    },
+    {
+      "name": "mnch-dashboard-link",
+      "component": "mnchQueueDashboardLink",
+      "slot": "homepage-dashboard-slot",
+      "privileges": ["O3 View MNCH Dashboard"],
+      "meta": {
+        "name": "mnch",
+        "slot": "mnch-dashboard-slot",
+        "title": "MNCH"
+      },
+      "online": true,
+      "offline": true
+    },
+    {
+      "component": "MNCHRoot",
+      "name": "mnch",
+      "slot": "mnch-dashboard-slot",
+      "privileges": ["O3 View MNCH Dashboard"]
+    },
+    {
+      "name": "pharmacy-dashboard-link",
+      "component": "pharmacyDashboardLink",
+      "slot": "homepage-dashboard-slot",
+      "privileges": ["O3 View Pharmacy Dashboard"],
+      "meta": {
+        "name": "dispensing",
+        "slot": "dispensing-dashboard-slot",
+        "title": "Pharmacy"
+      },
+      "online": true,
+      "offline": true
+    },
+    {
+      "name": "bookings-dashboard-link",
+      "component": "bookingsDashboardLink",
+      "slot": "homepage-dashboard-slot",
+      "privileges": ["O3 View Bookings Dashboard"],
+      "meta": {
+        "name": "bookings",
+        "slot": "bookings-dashboard-slot",
+        "title": "Bookings"
+      },
+      "online": true,
+      "offline": true
+    },
+    {
+      "component": "bookings",
+      "name": "bookings",
+      "slot": "bookings-dashboard-slot",
+      "privileges": ["O3 View Bookings Dashboard"]
+    },
+    {
+      "name": "service-queue-admin-dashboard-link",
+      "component": "serviceQueuesAdminLink",
+      "privileges": ["O3 View Service Queue Admin Panel"],
       "slot": "app-menu-slot",
+      "meta": {
+        "name": "service-queue-admin",
+        "slot": "service-queue-admin-dashboard-slot",
+        "title": "Service Queue Admin"
+      },
       "online": true,
       "offline": true
     },
     {
-      "component": "navLinks",
-      "name": "side-nav-workflow-links",
-      "slot": "dha-workflow-slot",
+      "component": "serviceQueueAdmin",
+      "name": "service-queue-admin",
+      "slot": "service-queue-admin-dashboard-slot",
+      "privileges": ["O3 View Service Queue Admin Panel"]
+    },
+    {
+      "name": "admissions-dashboard-link",
+      "component": "admissionsDashboardLink",
+      "slot": "homepage-dashboard-slot",
+      "privileges": ["O3 View Admissions Dashboard"],
+      "meta": {
+        "name": "admissions-dashboard",
+        "slot": "admissions-dashboard-slot",
+        "title": "Admissions Dashboard"
+      },
       "online": true,
       "offline": true
     },
     {
-      "name": "metrics-card-patients-in-waiting",
-      "component": "waitingPatientsExtension",
-      "slot": "clinic-metrics-slot",
-      "order": 1
+      "component": "admissionsDashboard",
+      "name": "admissions-dashboard",
+      "slot": "admissions-dashboard-slot",
+      "privileges": ["O3 View Admissions Dashboard"]
+    },
+    {
+      "component": "serviceQueueBannerComponent",
+      "name": "service-queue-banne",
+      "slot": "patient-banner-tags-slot"
+    },
+    {
+      "name": "admissions-summary-dashboard",
+      "slot": "patient-chart-dashboard-slot",
+      "component": "patientChartAdmissionsLink",
+      "meta": {
+        "slot": "patient-chart-admissions-summary-dashboard-slot",
+        "path": "Admissions",
+        "layoutMode": "anchored"
+      },
+      "online": true,
+      "offline": true
+    },
+    {
+      "name": "admission-details",
+      "slot": "patient-chart-admissions-summary-dashboard-slot",
+      "component": "patientAdmissionSummary",
+      "order": 1,
+      "meta": {
+        "title": "Admissions",
+        "view": "admissions"
+      },
+      "online": true,
+      "offline": true
     },
     {
-      "name": "metrics-card-patients-attended-to",
-      "component": "attendedToPatientsExtension",
-      "slot": "clinic-metrics-slot",
-      "order": 2
+      "name": "ampath-billing-dashboard-link",
+      "component": "billingDashboardLink",
+      "slot": "homepage-dashboard-slot",
+      "privileges": ["O3 View Accounting Dashboard"],
+      "meta": {
+        "name": "billing",
+        "slot": "ampath-billing-dashboard-slot",
+        "title": "Accounting"
+      },
+      "online": true,
+      "offline": true
+    },
+    {
+      "component": "billingRoot",
+      "name": "billing",
+      "slot": "ampath-billing-dashboard-slot",
+      "privileges": ["O3 View Accounting Dashboard"]
+    },
+     {
+      "name": "ampath-billing-checkin-form",
+      "slot": "extra-visit-attribute-slot",
+      "component": "visitBillingForm"
+    }
+  ],
+  "workspaces": [
+    {
+      "name": "create-order-bill-form-workspace",
+      "component": "createOrderBillFormWorkspace",
+      "title": "Create order Bill",
+      "type": "other-form"
     }
   ],
   "modals": [
@@ -43,4 +250,4 @@
       "component": "signOffModal"
     }
   ]
-}
+}

package/src/{consultation → service-queues}/action-button.component.tsx

@@ -1,10 +1,10 @@
 import { Button } from "@carbon/react";
 import { useLayoutType, isDesktop } from "@openmrs/esm-framework";
 import { useTranslation } from "react-i18next";
-import { type QueueEntryAction } from "../config-schema";
+import React from "react";
 import { useActionPropsByKey } from "../hooks/useActions";
+import { type QueueEntryAction } from "../config-schema";
 import { type QueueEntry } from "../types/types";
-import React from "react";
 
 export function ActionButton({ actionKey, queueEntry }: { actionKey: QueueEntryAction; queueEntry: QueueEntry }) {
   const { t } = useTranslation();

package/src/{consultation → service-queues}/action-overflow-menu-item.component.tsx

@@ -1,10 +1,10 @@
 import { OverflowMenuItem } from "@carbon/react";
 import { useTranslation } from "react-i18next";
+import React from "react";
 import { type QueueEntryAction } from "../config-schema";
 import { useActionPropsByKey } from "../hooks/useActions";
 import { type QueueEntry } from "../types/types";
-import styles from './consultation.scss';
-import React, { useEffect } from "react";
+import styles from './service-queue.scss';
 
 export function ActionOverflowMenuItem({ actionKey, queueEntry }: { actionKey: QueueEntryAction; queueEntry: QueueEntry }) {
   const { t } = useTranslation();

package/src/service-queues/admin/queue/modal/create-queue/create-queue.modal.scss

@@ -0,0 +1,31 @@
+.createQueueModalLayout{
+    display: flex;
+    flex-direction: column;
+    width: 100%;
+    row-gap: 10px;
+    padding: 15px 15px;
+    .sectionHeader{
+        display: flex;
+        flex-direction: column;
+        row-gap: 15px;
+        width: 100%;
+        padding-bottom: 15px;
+    }
+    .createQueueModalContentSection{
+        display: flex;
+        flex-direction: column;
+        width: 100%;
+        row-gap: 10px;
+    }
+    .createQueueModalFormRow{
+        display: flex;
+        flex-direction: row;
+        width: 100%;
+        column-gap: 10px;
+    }
+    .createQueueModalFormControl{
+        display: flex;
+        flex-direction: column;
+        width: 100%;
+    }
+}

package/src/service-queues/admin/queue/modal/create-queue/create-queue.modal.tsx

@@ -0,0 +1,143 @@
+import { Modal, ModalBody, SelectItem, Select, TextInput, Button } from '@carbon/react';
+import React, { useState } from 'react';
+import styles from './create-queue.modal.scss';
+import { useSession, showSnackbar } from '@openmrs/esm-framework';
+import { QUEUE_SERVICE_UUIDS } from '../../../../../shared/constants/concepts';
+import { type CreateQueueDto } from '../../../../../types/types';
+import { createQueue } from '../../../../service-queues.resource';
+interface CreateQueueModalProps {
+  open: boolean;
+  onModalClose: () => void;
+}
+
+const CreateQueueModal: React.FC<CreateQueueModalProps> = ({ open, onModalClose }) => {
+  const session = useSession();
+  const location = session.sessionLocation;
+  const [queueName, setQueueName] = useState<string>();
+  const [description, setDescription] = useState<string>();
+  const [queueService, setQueueService] = useState<string>();
+  const handleQueueName = (queueName: string) => {
+    setQueueName(queueName);
+  };
+  const handleQueueDescription = (queueDescription: string) => {
+    setDescription(queueDescription);
+  };
+  const handleQueueService = (queueServiceUuid: string) => {
+    setQueueService(queueServiceUuid);
+  };
+  const handleCreateQueue = async () => {
+    const payload = generateCreateQueuePayload();
+    if (isValidateCreateQueueDto(payload)) {
+      const resp = await createQueue(payload);
+      if (resp) {
+        showAlert('Queue created successfully!', 'success');
+        onModalClose();
+      }
+    }
+  };
+  const generateCreateQueuePayload = (): CreateQueueDto => {
+    return {
+      name: queueName,
+      description: description,
+      service: {
+        uuid: queueService,
+      },
+      location: {
+        uuid: location.uuid,
+      },
+    };
+  };
+  const isValidateCreateQueueDto = (payload: CreateQueueDto): boolean => {
+    if (!payload.name) {
+      showAlert('Please add the queue name', 'error');
+      return false;
+    }
+    if (!payload.description) {
+      showAlert('Please add the queue description', 'error');
+      return false;
+    }
+    if (!payload.service) {
+      showAlert('Please add the queue service', 'error');
+      return false;
+    } else {
+      if (!payload.service.uuid) {
+        showAlert('Please select as service', 'error');
+        return false;
+      }
+    }
+    return true;
+  };
+  const showAlert = (message: string, alertType: 'success' | 'error') => {
+    showSnackbar({
+      kind: alertType,
+      title: 'Queue Deleted',
+      subtitle: message,
+    });
+  };
+  return (
+    <>
+      <Modal
+        open={open}
+        size="md"
+        onSecondarySubmit={() => onModalClose()}
+        onRequestClose={() => onModalClose()}
+        onRequestSubmit={handleCreateQueue}
+        primaryButtonText="Create Queue"
+        secondaryButtonText="Cancel"
+      >
+        <ModalBody>
+          <div className={styles.createQueueModalLayout}>
+            <div className={styles.sectionHeader}>
+              <h4 className={styles.sectionTitle}>Create Service Queue</h4>
+            </div>
+            <div className={styles.createQueueModalContentSection}>
+              <div className={styles.createQueueModalFormRow}>
+                <div className={styles.createQueueModalFormControl}>
+                  <TextInput
+                    id="queue-name"
+                    labelText="Queue Name"
+                    onChange={(e) => handleQueueName(e.target.value)}
+                    type="text"
+                  />
+                </div>
+              </div>
+              <div className={styles.createQueueModalFormRow}>
+                <div className={styles.createQueueModalFormControl}>
+                  <TextInput
+                    id="description"
+                    labelText="Description"
+                    onChange={(e) => handleQueueDescription(e.target.value)}
+                    type="text"
+                  />
+                </div>
+              </div>
+              <div className={styles.createQueueModalFormRow}>
+                <div className={styles.createQueueModalFormControl}>
+                  <Select id="service" labelText="Service" onChange={(e) => handleQueueService(e.target.value)}>
+                    <SelectItem value="" text="Select Service" />
+                    <SelectItem value={QUEUE_SERVICE_UUIDS.TRIAGE_SERVICE_UUID} text="Triage Service" />
+                    <SelectItem
+                      value={QUEUE_SERVICE_UUIDS.CLINICAL_CONSULTATION_SERVICE_UUID}
+                      text="Clinical Consultation Service"
+                    />
+                    <SelectItem
+                      value={QUEUE_SERVICE_UUIDS.MCH_TRIAGE_SERVICE_UUID}
+                      text="Maternal Child Health Triage Service"
+                    />
+                    <SelectItem
+                      value={QUEUE_SERVICE_UUIDS.MCH_CLINICAL_CONSULTATION_SERVICE_UUID}
+                      text="Maternal Child Health Consultation Service"
+                    />
+                    <SelectItem value={QUEUE_SERVICE_UUIDS.MATERNITY_TRIAGE_SERVICE_UUID} text="Maternity Triage" />
+                  </Select>
+                </div>
+              </div>
+            </div>
+          </div>
+        </ModalBody>
+      </Modal>
+    </>
+  );
+};
+
+export default CreateQueueModal;