@openmrs/esm-dispensing-app 1.9.2-pre.1358 → 1.9.2-pre.1361

package/src/fill-prescription/on-prescription-filled.scss

@@ -0,0 +1,19 @@
+@use '@carbon/layout';
+@use '@carbon/type';
+@use '@openmrs/esm-styleguide/src/vars' as *;
+
+.modalDescription {
+  margin-bottom: layout.$spacing-05;
+}
+
+.prescriptionTile {
+  display: flex;
+  justify-content: space-between;
+  width: 100%;
+  margin: layout.$spacing-01 0 layout.$spacing-03;
+  padding: 0;
+  background-color: #fff;
+  border-left: layout.$spacing-03 solid var(--brand-03);
+  color: $text-02;
+  margin-bottom: layout.$spacing-05 !important;
+}

package/src/history/history-and-comments.scss

@@ -29,6 +29,8 @@
   }
 
   .requestTile {
+    display: flex;
+    justify-content: space-between;
     width: 100%;
     margin: layout.$spacing-01 0 layout.$spacing-03;
     padding: 0 layout.$spacing-03 0 layout.$spacing-03;

package/src/index.ts

@@ -7,7 +7,6 @@ import DispensingDashboardComponent from './dashboard/dispensing-dashboard.compo
 import DispensingLinkComponent from './dispensing-link.component';
 import DispensingLinkHomepageComponent from './dashboard/dispensing-dashboard-link.component';
 import PauseActionButton from './components/prescription-actions/pause-action-button.component';
-import PrescriptionPrintPreviewModal from './print-prescription/prescription-print-preview.modal';
 
 export const importTranslation = require.context('../translations', false, /.json$/, 'lazy');
 
@@ -43,8 +42,16 @@ export const dispenseWorkspace = getAsyncLifecycle(() => import('./forms/dispens
 // t('pausePrescription', 'Pause prescription')
 export const pauseDispenseWorkspace = getAsyncLifecycle(() => import('./forms/pause-dispense-form.workspace'), options);
 
-export const printPrescriptionPreviewModal = getSyncLifecycle(PrescriptionPrintPreviewModal, options);
+export const printPrescriptionPreviewModal = getAsyncLifecycle(
+  () => import('./print-prescription/prescription-print-preview.modal'),
+  options,
+);
 export const deleteConfirmModal = getAsyncLifecycle(() => import('./history/delete-confirm.modal'), options);
 
 export const patientDiagnoses = getAsyncLifecycle(() => import('./diagnoses/diagnoses.component'), options);
 export const patientConditions = getAsyncLifecycle(() => import('./conditions/conditions.component'), options);
+
+export const onPrescriptionFilledModal = getAsyncLifecycle(
+  () => import('./fill-prescription/on-prescription-filled.modal'),
+  options,
+);

package/src/medication-dispense/medication-dispense.resource.tsx

@@ -14,7 +14,7 @@ import {
 export function saveMedicationDispense(
   medicationDispense: MedicationDispense,
   medicationDispenseStatus: MedicationDispenseStatus,
-  abortController: AbortController,
+  abortController?: AbortController,
 ) {
   // if we have an id, this is an update, otherwise it's a create
   const url = medicationDispense.id
@@ -30,7 +30,7 @@ export function saveMedicationDispense(
 
   return openmrsFetch(url, {
     method: method,
-    signal: abortController.signal,
+    signal: abortController?.signal,
     headers: {
       'Content-Type': 'application/json',
     },

package/src/prescriptions/prescription-details.scss

@@ -3,11 +3,13 @@
 @use '@openmrs/esm-styleguide/src/vars' as *;
 
 .prescriptionTile {
+  display: flex;
+  justify-content: space-between;
   width: 100%;
   margin: layout.$spacing-01 0 layout.$spacing-03;
   padding: 0;
   background-color: #fff;
-  border-left: layout.$spacing-02 solid var(--brand-03);
+  border-left: layout.$spacing-03 solid var(--brand-03);
   color: $text-02;
   margin-bottom: layout.$spacing-05 !important;
 }

package/src/routes.json

@@ -70,30 +70,46 @@
     {
       "name": "close-dispense-workspace",
       "component": "closeDispenseWorkspace",
-      "window": "close-dispense-window"
+      "window": "dispensing-window"
     },
     {
       "name": "pause-dispense-workspace",
       "component": "pauseDispenseWorkspace",
-      "window": "pause-dispense-window"
+      "window": "dispensing-window"
     },
     {
       "name": "dispense-workspace",
       "component": "dispenseWorkspace",
-      "window": "dispense-workspace-window"
+      "window": "dispensing-window"
+    },
+    {
+      "name": "dispensing-patient-search-workspace",
+      "component": "@openmrs/esm-patient-search-app#patientSearchWorkspace2",
+      "window": "fill-prescription-window"
+    },
+    {
+      "name": "dispensing-start-visit-workspace",
+      "component": "@openmrs/esm-patient-chart-app#exportedVisitForm",
+      "window": "fill-prescription-window"
+    },
+    {
+      "name": "dispensing-order-basket-workspace",
+      "component": "@openmrs/esm-patient-orders-app#exportedOrderBasketWorkspace",
+      "window": "fill-prescription-window"
+    },
+    {
+      "name": "dispensing-order-basket-add-drug-order-workspace",
+      "component": "@openmrs/esm-patient-medications-app#exportedAddDrugOrderWorkspace",
+      "window": "fill-prescription-window"
     }
   ],
   "workspaceWindows2": [
     {
-      "name": "close-dispense-window",
-      "group": "dispensing-group"
-    },
-    {
-      "name": "pause-dispense-window",
+      "name": "dispensing-window",
       "group": "dispensing-group"
     },
     {
-      "name": "dispense-workspace-window",
+      "name": "fill-prescription-window",
       "group": "dispensing-group"
     }
   ],
@@ -112,6 +128,10 @@
       "name": "delete-confirm-modal",
       "component": "deleteConfirmModal"
 
+    },
+    {
+      "name": "on-prescription-filled-modal",
+      "component": "onPrescriptionFilledModal"
     }
   ]
 }

package/translations/en.json

@@ -49,9 +49,9 @@
   "editRecord": "Edit Record",
   "error": "Error",
   "errorLoadingInventoryItems": "Error fetching inventory items",
-  "errorLoadingPrescriptionDetails": "Error loading prescription details",
   "expired": "Expired",
   "fillPrescription": "Fill prescription",
+  "fillPrescriptionForPatient": "Fill prescription for patient",
   "filterByLocations": "Filter by locations",
   "finalDiagnoses": "Final Diagnoses",
   "for": "for",
@@ -117,8 +117,9 @@
   "success": "Success",
   "tabList": "Tab List",
   "today": "Today",
-  "tryRefreshingThePage": "Try refreshing the page.",
   "updateStatusFailed": "Update Status Failed",
   "view": "View",
-  "visitFinalDiagnoses": "Visit final diagnoses"
+  "visitFinalDiagnoses": "Visit final diagnoses",
+  "visitRequired": "Visit required",
+  "visitRequiredForPatientToFillPrescription": "Visit required for patient to fill prescription"
 }

package/.turbo/cache/385f44ce66cfe6ac-meta.json

@@ -1 +0,0 @@
-{"hash":"385f44ce66cfe6ac","duration":44869}