@ampath/esm-dha-workflow-app 4.0.0-next.53 → 4.0.0-next.55

package/dist/esm-dha-workflow-app.js.buildmanifest.json

@@ -382,9 +382,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 54316,
+      "size": 54378,
       "sizes": {
-        "javascript": 54316
+        "javascript": 54378
       },
       "names": [],
       "idHints": [],
@@ -398,7 +398,7 @@
       "auxiliaryFiles": [
         "264.js.map"
       ],
-      "hash": "56904c737a0a1fbe",
+      "hash": "afe713bc3cf61c8e",
       "childrenByOrder": {}
     },
     {
@@ -434,9 +434,9 @@
       "entry": false,
       "recorded": false,
       "reason": "split chunk (cache group: default)",
-      "size": 192742,
+      "size": 194476,
       "sizes": {
-        "javascript": 192742
+        "javascript": 194476
       },
       "names": [],
       "idHints": [],
@@ -450,7 +450,7 @@
       "auxiliaryFiles": [
         "294.js.map"
       ],
-      "hash": "cccd22420dc11303",
+      "hash": "9f2076ca1de85824",
       "childrenByOrder": {}
     },
     {
@@ -866,9 +866,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 124720,
+      "size": 124782,
       "sizes": {
-        "javascript": 124720
+        "javascript": 124782
       },
       "names": [],
       "idHints": [],
@@ -882,7 +882,7 @@
       "auxiliaryFiles": [
         "826.js.map"
       ],
-      "hash": "7aca1ad866da76a8",
+      "hash": "283e5ddfb9c5fd09",
       "childrenByOrder": {}
     },
     {

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{},"pages":[{"component":"root","route":"dha-workflow","online":true,"offline":true}],"extensions":[{"component":"workflowRegistryLink","name":"workflow-registry-link","slot":"app-menu-slot","online":true,"offline":true},{"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","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"},{"name":"triage-dashboard-link","component":"triageDashboardLink","slot":"homepage-dashboard-slot","meta":{"name":"triage","slot":"triage-queue-dashboard-slot","title":"Triage"},"online":true,"offline":false},{"component":"triageQueueExtension","name":"triage","slot":"triage-queue-dashboard-slot"},{"name":"consultation-dashboard-link","component":"consultationDashboardLink","slot":"homepage-dashboard-slot","meta":{"name":"consultation","slot":"consultation-dashboard-slot","title":"Consultation"},"online":true,"offline":false},{"component":"consultationQueue","name":"consultation","slot":"consultation-dashboard-slot"},{"name":"mnch-dashboard-link","component":"mnchQueueDashboardLink","slot":"homepage-dashboard-slot","meta":{"name":"mnch","slot":"mnch-dashboard-slot","title":"MNCH"},"online":true,"offline":true},{"component":"mnchQueueDashboard","name":"mnch","slot":"mnch-dashboard-slot"},{"name":"pharmacy-dashboard-link","component":"pharmacyDashboardLink","slot":"homepage-dashboard-slot","meta":{"name":"dispensing","slot":"dispensing-dashboard-slot","title":"Pharmacy"},"online":true,"offline":true},{"name":"accounting-dashboard-link","component":"accountingDashboardLink","slot":"homepage-dashboard-slot","meta":{"name":"accounting","slot":"accounting-dashboard-slot","title":"Accounting"},"online":true,"offline":false},{"component":"accountingDashboard","name":"accounting","slot":"accounting-dashboard-slot"},{"name":"registers-dashboard-link","component":"registersDashboardLink","slot":"homepage-dashboard-slot","meta":{"name":"registers","slot":"registers-dashboard-slot","title":"Registers"},"online":true,"offline":false},{"component":"registers","name":"registers","slot":"registers-dashboard-slot"},{"name":"reports-dashboard-link","component":"reportsDashboardLink","slot":"homepage-dashboard-slot","meta":{"name":"reports","slot":"reports-dashboard-slot","title":"Reports"},"online":true,"offline":false},{"component":"reports","name":"Reports","slot":"reports-dashboard-slot"},{"name":"bookings-dashboard-link","component":"bookingsDashboardLink","slot":"homepage-dashboard-slot","meta":{"name":"bookings","slot":"bookings-dashboard-slot","title":"Bookings"},"online":true,"offline":true},{"component":"bookings","name":"bookings","slot":"bookings-dashboard-slot"}],"modals":[{"name":"sign-off-queue-entry-modal","component":"signOffModal"}],"version":"4.0.0-next.53"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{},"pages":[{"component":"root","route":"dha-workflow","online":true,"offline":true}],"extensions":[{"component":"workflowRegistryLink","name":"workflow-registry-link","slot":"app-menu-slot","online":true,"offline":true},{"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","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"},{"name":"triage-dashboard-link","component":"triageDashboardLink","slot":"homepage-dashboard-slot","meta":{"name":"triage","slot":"triage-queue-dashboard-slot","title":"Triage"},"online":true,"offline":false},{"component":"triageQueueExtension","name":"triage","slot":"triage-queue-dashboard-slot"},{"name":"consultation-dashboard-link","component":"consultationDashboardLink","slot":"homepage-dashboard-slot","meta":{"name":"consultation","slot":"consultation-dashboard-slot","title":"Consultation"},"online":true,"offline":false},{"component":"consultationQueue","name":"consultation","slot":"consultation-dashboard-slot"},{"name":"mnch-dashboard-link","component":"mnchQueueDashboardLink","slot":"homepage-dashboard-slot","meta":{"name":"mnch","slot":"mnch-dashboard-slot","title":"MNCH"},"online":true,"offline":true},{"component":"mnchQueueDashboard","name":"mnch","slot":"mnch-dashboard-slot"},{"name":"pharmacy-dashboard-link","component":"pharmacyDashboardLink","slot":"homepage-dashboard-slot","meta":{"name":"dispensing","slot":"dispensing-dashboard-slot","title":"Pharmacy"},"online":true,"offline":true},{"name":"accounting-dashboard-link","component":"accountingDashboardLink","slot":"homepage-dashboard-slot","meta":{"name":"accounting","slot":"accounting-dashboard-slot","title":"Accounting"},"online":true,"offline":false},{"component":"accountingDashboard","name":"accounting","slot":"accounting-dashboard-slot"},{"name":"registers-dashboard-link","component":"registersDashboardLink","slot":"homepage-dashboard-slot","meta":{"name":"registers","slot":"registers-dashboard-slot","title":"Registers"},"online":true,"offline":false},{"component":"registers","name":"registers","slot":"registers-dashboard-slot"},{"name":"reports-dashboard-link","component":"reportsDashboardLink","slot":"homepage-dashboard-slot","meta":{"name":"reports","slot":"reports-dashboard-slot","title":"Reports"},"online":true,"offline":false},{"component":"reports","name":"Reports","slot":"reports-dashboard-slot"},{"name":"bookings-dashboard-link","component":"bookingsDashboardLink","slot":"homepage-dashboard-slot","meta":{"name":"bookings","slot":"bookings-dashboard-slot","title":"Bookings"},"online":true,"offline":true},{"component":"bookings","name":"bookings","slot":"bookings-dashboard-slot"}],"modals":[{"name":"sign-off-queue-entry-modal","component":"signOffModal"}],"version":"4.0.0-next.55"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ampath/esm-dha-workflow-app",
-  "version": "4.0.0-next.53",
+  "version": "4.0.0-next.55",
   "license": "MPL-2.0",
   "description": "An OpenMRS seed application for building microfrontends",
   "browser": "dist/esm-dha-workflow-app.js",

package/src/bookings/daily/daily-bookings.resource.ts

@@ -1,3 +1,4 @@
+import { openmrsFetch } from '@openmrs/esm-framework';
 import { getEtlBaseUrl } from '../../shared/utils/get-base-url';
 import {
   type BookingFilter,
@@ -21,7 +22,7 @@ export async function getDailyBookings(
   };
   const queryString = new URLSearchParams(params).toString();
   const dailyAppUrl = `${etlBaseUrl}/${bookingType}/${bookingFilter.startDate}?&${queryString}`;
-  const resp = await fetch(dailyAppUrl);
+  const resp = await openmrsFetch(dailyAppUrl);
   const data: DailyBookingsReponse = await resp.json();
   return data.result ?? [];
 }

package/src/registry/modal/send-to-triage/send-to-triage.modal.tsx

@@ -108,8 +108,23 @@ const SendToTriageModal: React.FC<SendToTriageModalProps> = ({
     window.open('https://afyayangu.go.ke/', '_blank');
   };
   const sendToTriage = async () => {
+    if (!validateVisitQueueBill()) return;
     setLoading(true);
     try {
+      // add bill if it was a paying client
+      let createBillResp = null;
+      if (selectedPaymentDetail === PaymentDetail.Paying) {
+        const createBillDto = generateCreateBillDto();
+        if (isValidCreateBillDto(createBillDto)) {
+          createBillResp = await createBill(createBillDto);
+          if (createBillResp) {
+            showAlert('success', 'Bill succesfully created', '');
+          }
+        } else {
+          return false;
+        }
+      }
+
       const newVisit = await createPatientVisit();
       if (newVisit) {
         const addToTriageQueueDto: QueueEntryDto = generateAddToTriageDto(newVisit.uuid);
@@ -119,21 +134,7 @@ const SendToTriageModal: React.FC<SendToTriageModalProps> = ({
           showAlert('success', 'Patient has succesfully been moved to the Triage queue', '');
         }
 
-        // add bill if it was a paying client
-        let createBillResp = null;
-        if (selectedPaymentDetail === PaymentDetail.Paying && selectedBillableService) {
-          const createBillDto = generateCreateBillDto();
-          if (isValidCreateBillDto(createBillDto)) {
-            createBillResp = await createBill(createBillDto);
-            if (createBillResp) {
-              showAlert('success', 'Bill succesfully created', '');
-            }
-          }
-        } else {
-          createBillResp = true;
-        }
-
-        if (queueEntryResp && createBillResp) {
+        if ((queueEntryResp && PaymentDetail.Paying && createBillResp) || (queueEntryResp && PaymentDetail.NonPaying)) {
           onModalClose({ success: true });
         }
       }
@@ -143,6 +144,50 @@ const SendToTriageModal: React.FC<SendToTriageModalProps> = ({
       setLoading(false);
     }
   };
+  function validateVisitQueueBill(): boolean {
+    if (!selectedPatient) {
+      showAlert('error', 'Please select a patient', '');
+      return false;
+    }
+    if (!selectedPaymentDetail) {
+      showAlert('error', 'Please select a paying or non paying option', '');
+      return false;
+    }
+
+    if (selectedPaymentDetail === PaymentDetail.Paying) {
+      if (!selectedPaymentMode) {
+        showAlert('error', 'Please select a payment method', '');
+        return false;
+      }
+      if (!selectedBillableService) {
+        showAlert('error', 'Please select a billable service', '');
+        return false;
+      }
+      if (!selectedCashPoint) {
+        showAlert('error', 'Please select a cashpoint', '');
+        return false;
+      }
+    }
+    if (selectedPaymentDetail === PaymentDetail.NonPaying) {
+      if (!selectedPatientCategory) {
+        showAlert('error', 'Please select a patient category', '');
+        return false;
+      }
+    }
+    if (!selectedVisitType) {
+      showAlert('error', 'Please select a visit type', '');
+      return false;
+    }
+    if (!selectedServiceQueue) {
+      showAlert('error', 'Please select a service queue', '');
+      return false;
+    }
+    if (!selectedPriority) {
+      showAlert('error', 'Please select a service queue priority', '');
+      return false;
+    }
+    return true;
+  }
   const generateAddToTriageDto = (newVisitUuid: string): QueueEntryDto => {
     const payload: QueueEntryDto = {
       visit: {
@@ -391,11 +436,11 @@ const SendToTriageModal: React.FC<SendToTriageModalProps> = ({
       return false;
     }
     if (!createBillDto.cashPoint) {
-      showAlert('error', 'Please select a cashpoint', '');
+      showAlert('error', 'Please select a valid cashpoint', '');
       return false;
     }
     if (!createBillDto.lineItems || createBillDto.lineItems.length === 0) {
-      showAlert('error', 'Please select a valid cashpoint', '');
+      showAlert('error', 'Please select a valid billable service', '');
       return false;
     }
     return true;