@openmrs/esm-dispensing-app 1.9.2-pre.1376 → 1.9.2-pre.1380

package/dist/openmrs-esm-dispensing-app.js.buildmanifest.json

@@ -191,9 +191,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 12597,
+      "size": 21037,
       "sizes": {
-        "javascript": 12597
+        "javascript": 21037
       },
       "names": [],
       "idHints": [],
@@ -207,7 +207,7 @@
       "auxiliaryFiles": [
         "1043.js.map"
       ],
-      "hash": "245f441c1ef14399",
+      "hash": "747c31492c00307e",
       "childrenByOrder": {}
     },
     {
@@ -1489,10 +1489,10 @@
       "initial": true,
       "entry": true,
       "recorded": false,
-      "size": 3635038,
+      "size": 3635040,
       "sizes": {
         "consume-shared": 210,
-        "javascript": 3612062,
+        "javascript": 3612064,
         "share-init": 378,
         "runtime": 22388
       },
@@ -1509,7 +1509,7 @@
       "auxiliaryFiles": [
         "main.js.map"
       ],
-      "hash": "03fb81334cb3839c",
+      "hash": "e185f21a9eb6fd0a",
       "childrenByOrder": {}
     },
     {
@@ -1517,9 +1517,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 319725,
+      "size": 319727,
       "sizes": {
-        "javascript": 319725
+        "javascript": 319727
       },
       "names": [],
       "idHints": [],
@@ -1532,7 +1532,7 @@
       "auxiliaryFiles": [
         "8885.js.map"
       ],
-      "hash": "012ab41e039957de",
+      "hash": "7a309675fad43064",
       "childrenByOrder": {}
     },
     {

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"fhir2":">=1.2","webservices.rest":">=2.2.0"},"pages":[{"component":"dispensing","route":"dispensing","online":true,"offline":true}],"extensions":[{"name":"dispensing-link","slot":"app-menu-slot","component":"dispensingLink","online":true,"offline":true},{"name":"patient-diagnoses","component":"patientDiagnoses","slot":"dispensing-condition-and-diagnoses","online":true,"offline":true},{"name":"patient-conditions","component":"patientConditions","slot":"dispensing-condition-and-diagnoses","online":true,"offline":true},{"name":"dispensing-dashboard","slot":"dispensing-dashboard-slot","component":"dispensingDashboard","online":true,"offline":true},{"name":"dispensing-dashboard-link","component":"dispensingDashboardLink","meta":{"name":"dispensing","slot":"dispensing-dashboard-slot","title":"Dispensing"}},{"name":"dispense-action-button","slot":"prescription-action-button-slot","component":"dispenseActionButton"},{"name":"pause-action-button","slot":"prescription-action-button-slot","component":"pauseActionButton"},{"name":"close-action-button","slot":"prescription-action-button-slot","component":"closeActionButton"}],"workspaces2":[{"name":"close-dispense-workspace","component":"closeDispenseWorkspace","window":"dispensing-window"},{"name":"pause-dispense-workspace","component":"pauseDispenseWorkspace","window":"dispensing-window"},{"name":"dispense-workspace","component":"dispenseWorkspace","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":"dispensing-window","group":"dispensing-group"},{"name":"fill-prescription-window","group":"dispensing-group"}],"workspaceGroups2":[{"name":"dispensing-group","overlay":true}],"modals":[{"name":"prescription-print-preview-modal","component":"printPrescriptionPreviewModal"},{"name":"delete-confirm-modal","component":"deleteConfirmModal"},{"name":"on-prescription-filled-modal","component":"onPrescriptionFilledModal"}],"version":"1.9.2-pre.1376"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"fhir2":">=1.2","webservices.rest":">=2.2.0"},"pages":[{"component":"dispensing","route":"dispensing","online":true,"offline":true}],"extensions":[{"name":"dispensing-link","slot":"app-menu-slot","component":"dispensingLink","online":true,"offline":true},{"name":"patient-diagnoses","component":"patientDiagnoses","slot":"dispensing-condition-and-diagnoses","online":true,"offline":true},{"name":"patient-conditions","component":"patientConditions","slot":"dispensing-condition-and-diagnoses","online":true,"offline":true},{"name":"dispensing-dashboard","slot":"dispensing-dashboard-slot","component":"dispensingDashboard","online":true,"offline":true},{"name":"dispensing-dashboard-link","component":"dispensingDashboardLink","meta":{"name":"dispensing","slot":"dispensing-dashboard-slot","title":"Dispensing"}},{"name":"dispense-action-button","slot":"prescription-action-button-slot","component":"dispenseActionButton"},{"name":"pause-action-button","slot":"prescription-action-button-slot","component":"pauseActionButton"},{"name":"close-action-button","slot":"prescription-action-button-slot","component":"closeActionButton"}],"workspaces2":[{"name":"close-dispense-workspace","component":"closeDispenseWorkspace","window":"dispensing-window"},{"name":"pause-dispense-workspace","component":"pauseDispenseWorkspace","window":"dispensing-window"},{"name":"dispense-workspace","component":"dispenseWorkspace","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":"dispensing-window","group":"dispensing-group"},{"name":"fill-prescription-window","group":"dispensing-group"}],"workspaceGroups2":[{"name":"dispensing-group","overlay":true}],"modals":[{"name":"prescription-print-preview-modal","component":"printPrescriptionPreviewModal"},{"name":"delete-confirm-modal","component":"deleteConfirmModal"},{"name":"on-prescription-filled-modal","component":"onPrescriptionFilledModal"}],"version":"1.9.2-pre.1380"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-dispensing-app",
-  "version": "1.9.2-pre.1376",
+  "version": "1.9.2-pre.1380",
   "license": "MPL-2.0",
   "description": "Medication dispensing application",
   "browser": "dist/openmrs-esm-dispensing-app.js",

package/src/fill-prescription/fill-prescription-button.component.tsx

@@ -66,7 +66,7 @@ const FillPrescriptionButton: React.FC<{}> = () => {
         },
       },
       {
-        startVisitWorkspaceName: 'ward-app-start-visit-workspace',
+        startVisitWorkspaceName: 'dispensing-start-visit-workspace',
       },
     );
   };

package/src/fill-prescription/on-prescription-filled.modal.tsx

@@ -2,10 +2,14 @@ import React from 'react';
 import { Button, ModalBody, ModalFooter, ModalHeader, Tile } from '@carbon/react';
 import { Trans, useTranslation } from 'react-i18next';
 import { getPatientName, showSnackbar, useConfig, useSession } from '@openmrs/esm-framework';
-import { usePrescriptionDetails } from '../medication-request/medication-request.resource';
+import {
+  updateMedicationRequestFulfillerStatus,
+  usePrescriptionDetails,
+} from '../medication-request/medication-request.resource';
 import {
   getMedicationDisplay,
   getMedicationReferenceOrCodeableConcept,
+  getUuidFromReference,
   markEncounterAsStale,
   revalidate,
 } from '../utils';
@@ -16,7 +20,7 @@ import {
 } from '../medication-dispense/medication-dispense.resource';
 import { type PharmacyConfig } from '../config-schema';
 import MedicationEvent from '../components/medication-event.component';
-import { MedicationDispenseStatus } from '../types';
+import { MedicationDispenseStatus, MedicationRequestFulfillerStatus } from '../types';
 import styles from './on-prescription-filled.scss';
 
 interface OnPrescriptionFilledModalProps {
@@ -45,7 +49,7 @@ const OnPrescriptionFilledModal: React.FC<OnPrescriptionFilledModalProps> = ({ p
   const { medicationRequestBundles } = usePrescriptionDetails(encounterUuid);
   const { t } = useTranslation();
 
-  const onConfirm = () => {
+  const onConfirm = async () => {
     markEncounterAsStale(encounterUuid);
     for (const medicationRequestBundle of medicationRequestBundles) {
       const medicationDispensePayload = initiateMedicationDispenseBody(
@@ -57,7 +61,21 @@ const OnPrescriptionFilledModal: React.FC<OnPrescriptionFilledModalProps> = ({ p
       const medicationDisplay = getMedicationDisplay(
         getMedicationReferenceOrCodeableConcept(medicationRequestBundle.request),
       );
-      saveMedicationDispense(medicationDispensePayload, MedicationDispenseStatus.completed)
+
+      await saveMedicationDispense(medicationDispensePayload, MedicationDispenseStatus.completed)
+        .then((response) => {
+          const hasNoRefills = medicationRequestBundle.request.dispenseRequest.numberOfRepeatsAllowed == 0;
+          if (response.ok && hasNoRefills) {
+            return updateMedicationRequestFulfillerStatus(
+              getUuidFromReference(
+                medicationDispensePayload.authorizingPrescription[0].reference, // assumes authorizing prescription exist
+              ),
+              MedicationRequestFulfillerStatus.completed,
+            ).then(() => response);
+          } else {
+            return response;
+          }
+        })
         .then(() => {
           showSnackbar({
             title: t('stockDispensed', 'Stock dispensed'),
@@ -87,9 +105,9 @@ const OnPrescriptionFilledModal: React.FC<OnPrescriptionFilledModalProps> = ({ p
       <ModalHeader>{t('dispenseAllPrescriptions', 'Dispense prescriptions')}</ModalHeader>
       <ModalBody>
         <p className={styles.modalDescription}>
-          <Trans i18nKey="confirmRemovePatientFromQueue">
-            Would you like to mark prescriptions ordered for <strong>{{ patientName } as any}</strong> as dispensed and
-            completed?
+          <Trans i18nKey="dispenseAllPrescriptionsConfirmation">
+            Would you like to mark prescriptions ordered for <strong>{{ patientName } as any}</strong> as dispensed?
+            Orders with no refills will be marked as completed.
           </Trans>
         </p>
         {medicationRequestBundles.map((bundle) => (
@@ -102,7 +120,12 @@ const OnPrescriptionFilledModal: React.FC<OnPrescriptionFilledModalProps> = ({ p
         <Button kind="secondary" onClick={close}>
           {t('cancel', 'Cancel')}
         </Button>
-        <Button onClick={onConfirm}>{t('dispenseAllPrescriptions', 'Dispense all prescriptions')}</Button>
+        <Button
+          onClick={() => {
+            onConfirm();
+          }}>
+          {t('dispenseAllPrescriptions', 'Dispense all prescriptions')}
+        </Button>
       </ModalFooter>
     </>
   );

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

@@ -11,7 +11,7 @@
   justify-content: space-between;
   width: 100%;
   margin: layout.$spacing-01 0 layout.$spacing-03;
-  padding: 0;
+  padding: 0 0 0 layout.$spacing-03;
   background-color: #fff;
   border-left: layout.$spacing-03 solid var(--brand-03);
   color: $text-02;

package/src/utils.ts

@@ -270,7 +270,7 @@ export function computePrescriptionStatusMessageCode(
   return null;
 }
 
-export function computeQuantityRemaining(medicationRequestBundle): number {
+export function computeQuantityRemaining(medicationRequestBundle: MedicationRequestBundle): number {
   if (medicationRequestBundle) {
     // hard protect against quantity type mistmatch
     if (!getQuantityUnitsMatch([medicationRequestBundle.request, ...medicationRequestBundle.dispenses])) {

package/.turbo/cache/3019568427d147c1-meta.json

@@ -1 +0,0 @@
-{"hash":"3019568427d147c1","duration":43603}