Merge branch 'jspannelheightissue' into Develop

Amrita Vishnoi
2 parents 6aceb76b bf715664
Showing 2 changed files with 6 additions and 2 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
400-SOURCECODE/AIAHTML5.Web/app/views/Home/printPreview.html
@@ -3341,6 +3341,10 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
                         document.getElementById('spnBodyViewTitlePor').innerHTML = curPosture;
                         document.getElementById('spnModuleLan').innerHTML = curModule;
                         document.getElementById('spnBodyViewTitleLan').innerHTML = curPosture;
+                        if ($('#printcontainer').length > 0) {
+                            $("#printcontainer").css('width', $(window).outerWidth());
+                            $("#printcontainer").css('height', $(window).outerHeight());
+                        }
                     }, 320);
                 }
@@ -3369,7 +3373,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
                 top: 70,
                 left: 1,
             },
-            size: { width: $(window).outerWidth() - 10, height: $(window).outerHeight() - 110 },
+            size: { width: $(window).outerWidth(), height: $(window).outerHeight() + 60},
         });
     }
@@ -30,7 +30,7 @@
                             </div>
                             <div class="clearfix"></div>
                         </div>
-                        <div class="pp-col-sm-12 well" align="center" style="overflow-y: auto; width: 100%; height: 490px;">
+                        <div class="pp-col-sm-12 well" align="center" id="printcontainer" style="overflow-y: auto;">
                             <div class="print-paper" id="dvPP">
                                 <div class="print-box portrait-box" id="printBoxPor">
                                     <div id="printDivContent">