diff --git a/omod/src/main/webapp/resources/scripts/visit/visit.js b/omod/src/main/webapp/resources/scripts/visit/visit.js index a8a0d546d..1982e8960 100644 --- a/omod/src/main/webapp/resources/scripts/visit/visit.js +++ b/omod/src/main/webapp/resources/scripts/visit/visit.js @@ -338,7 +338,23 @@ angular.module("visit", [ "filters", "constants", "encounterTypeConfig", "visitS doc.write(''); doc.close(); + // When the visit page is embedded in the ward app (O2VisitSummaryWorkspace + // iframe), a discharge form's "Save & Print" leaves the patient discharged. + // The parent defers removing the patient from the ward until printing has + // finished, so notify it here (guarded so it fires at most once). + var printedNotified = false; + var notifyParentPrinted = function() { + if (printedNotified) { + return; + } + printedNotified = true; + if (window.parent !== window) { + window.parent.postMessage({ type: 'o2IframeFormPrinted' }, '*'); + } + }; + var removeIframe = function() { + notifyParentPrinted(); if (iframe.parentNode) { iframe.parentNode.removeChild(iframe); } diff --git a/pom.xml b/pom.xml index 0de2d8d75..08196e397 100644 --- a/pom.xml +++ b/pom.xml @@ -69,7 +69,7 @@ 4.2.0 2.1.0 7.3.0-SNAPSHOT - 3.2.0 + 3.3.0-SNAPSHOT 2.0.1 5.0.4 2.12.0