Fix open of CCD in new window

IsantePlus · May 23, 2018 · 89fc589 · 89fc589
1 parent ed07d8c
commit 89fc589
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/omod/src/main/webapp/fragments/summary/continuityOfCare.gsp b/omod/src/main/webapp/fragments/summary/continuityOfCare.gsp
@@ -22,10 +22,6 @@
                 <button type="button" class="confirm" onclick="viewCCD(${ config.patientId })">
                     ${ ui.message("registrationapp.continuityOfCare.document.view") }
                 </button>
-                <button class="submitButton right" onclick="importCCD(${ config.patientId })")>
-                    <i class="icon-download"></i>
-                    ${ ui.message("registrationapp.continuityOfCare.document.import") }
-                </button>
             </div>
         </div>
 

diff --git a/omod/src/main/webapp/resources/scripts/summary/continuityOfCare.js b/omod/src/main/webapp/resources/scripts/summary/continuityOfCare.js
@@ -1,11 +1,11 @@
 function viewCCD(patientId) {
-    jq.getJSON(
+  var newWindow = window.open();
+  jq.getJSON(
         '/' + OPENMRS_CONTEXT_PATH + '/registrationapp/summary/continuityOfCare/viewCCD.action',
         {patientId: patientId},
         function(ccdContent) {
-            var x = window.open();
-            x.document.write('<title>Ccd document</title>' + ccdContent);
-            x.document.close();
+            newWindow.document.write('<title>Ccd document</title>' + ccdContent);
+            newWindow.document.close();
         }
     );
 }