ADAM / AIAHTML5

Commit e01888390a3d4d2b4f63bb489cd3ac3e7ccce34e

Authored by Amrita Vishnoi
2 parents 222969cc b80fdc83

Merge branch 'PrintPreviewDelay' into Develop

Inline Side-by-side
Showing 1 changed file with 4 additions and 19 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @e018883
... ... @@ -3109,9 +3109,9 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
3109 3109 $('#snipImage').attr('src', dataURL);
3110 3110  
3111 3111 $('#spnModule').text($rootScope.currentActiveModuleTitle);
3112   - $('#spnPosture').text(localStorage.getItem('currentViewTitle'));
  3112 + $('#spnBodyViewTitle').text(localStorage.getItem('currentViewTitle'));
3113 3113  
3114   - PrintDIVContent('printBox'); // Open Print Window
  3114 + PrintDivContentByID('printBox'); // Open Print Window
3115 3115 }
3116 3116 });
3117 3117 };
... ... @@ -3144,7 +3144,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
3144 3144 document.getElementById('spnBodyViewTitlePor').innerHTML = curPosture;
3145 3145 document.getElementById('spnModuleLan').innerHTML = curModule;
3146 3146 document.getElementById('spnBodyViewTitleLan').innerHTML = curPosture;
3147   - }, 100);
  3147 + }, 320);
3148 3148 }
3149 3149  
3150 3150 $('#fileMenuAnchor').addClass('disableMenuannotation');
... ... @@ -3260,7 +3260,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
3260 3260 window.frames["frame1"].focus();
3261 3261 window.frames["frame1"].print();
3262 3262 frame1.remove();
3263   - }, 250);
  3263 + }, 320);
3264 3264  
3265 3265 console.log('close')
3266 3266 }
... ... @@ -3272,21 +3272,6 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
3272 3272 console.log('close')
3273 3273 });
3274 3274  
3275   - $rootScope.ShowPrintWindow = function () { // Print Active Viewer
3276   - html2canvas($("#canvasDiv"), {
3277   - onrendered: function (canvas) {
3278   - var dataURL = canvas.toDataURL("image/jpeg");
3279   - var imageToPrint = new Image();
3280   - imageToPrint.src = dataURL;
3281   - $('#snipImage').attr('src', dataURL);
3282   -
3283   - $('#spnModule').text($rootScope.currentActiveModuleTitle);
3284   - $('#spnBodyViewTitle').text(localStorage.getItem('currentViewTitle'));
3285   -
3286   - PrintDivContentByID('printBox'); // Open Print Window
3287   - }
3288   - });
3289   - };
3290 3275 $rootScope.restrictBodySystemList = function () {
3291 3276 var RestrictListDiv = document.getElementById("restrictListDiv");
3292 3277 if (RestrictListDiv.style.display == 'block') {
... ...