Merge branch 'printpreviewlogoissuetab' into Develop-IPAD-MAC

Amrita Vishnoi
2 parents 05d6bb26 30854434
Showing 2 changed files with 59 additions and 20 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
400-SOURCECODE/AIAHTML5.Web/index.html
@@ -4926,10 +4926,20 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
     };
  
     $rootScope.ShowExportImageWindow = function () {
-        $(".export-image").modal("show").draggable({ handle: ".modal-header" });
  
-        $(".modal-backdrop").css("opacity", ".5");
-        $(".modal-backdrop").css("z-index", "1200001");
+        var $ua = navigator.userAgent;
+        if (($ua.match(/(iPod|iPhone|iPad|android)/i))) {
+            $(".export-image-ipad").modal("show").draggable({ handle: ".modal-header" });
+
+            $(".modal-backdrop").css("opacity", ".5");
+            $(".modal-backdrop").css("z-index", "1200001");
+        }
+        else {
+            $(".export-image").modal("show").draggable({ handle: ".modal-header" });
+
+            $(".modal-backdrop").css("opacity", ".5");
+            $(".modal-backdrop").css("z-index", "1200001");
+        }
     };
  
  
@@ -1076,7 +1076,36 @@
                     </div>
                 </div>
             </div>
+            <div class="modal fade export-image-ipad ui-draggable in" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
+                 style="z-index: 1200002;">
+                <div class="modal-dialog modal-sm" role="document">
+                    <div class="modal-content">
+                        <div class="modal-header annotation-modal-header ui-draggable-handle">
+                            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
+                            <h4 class="modal-title" id="">Download Export Image</h4>
+                        </div>
+                        <div class="modal-body">
+                            <div class="row paddTopbtm15">
+                                <div class="col-sm-12">
+                                    <div class="form-group">
+                                        <label for="filename">Exported image open in next Teb. Please download it</label>
+                                       
+                                    </div>
+                                </div>
+                            </div>
  
+                        </div>
+                        <div class="modal-footer">
+                            <div class="row">
+                                <input type="file" id="file1" style="display:none">
+                                <!--<a href="data:application/xml;charset=utf-8,your code here" download="filename.html">Save</a-->
+                                <div class="col-sm-12"><button id="btnPrintPreview" class="btn btn-primary" data-dismiss="modal" type="button">Ok</button></div> <!--onclick="makeScreenshot();"--><!--ng-click="dialogs.saveAs()"--><!--ng-click="ShowAlert()"-->
+                            </div>
+                        </div>
+
+                    </div>
+                </div>
+            </div>
             <!--Print Active Viewer-->
             <div class="print-box-active portrait-box-active" id="printBox" style="display: none;">
                 <div id="printDivContent">
@@ -1894,23 +1923,23 @@
     <!-- Export Image Save Click-->
     <script>
         $(function () {
+            $("#btnPrintPreview").click(function () {
+                $("#canvasDiv").append("<img id='exportlogo' class='img-responsive'  src='content/images/adam-logo-small.png'/>");
+                html2canvas($("#canvasDiv"), {
+                    onrendered: function (canvas) {
+                        var imgsrc = canvas.toDataURL("image/png");
+                        console.log(imgsrc);
+                        var html = '<div id="img"><img src="' + imgsrc + '" id="newimg" style="margin:auto;top:0px;left:0px;right:0px;position:absolute;border:1px solid #ccc;" /></div>';
+                        var w = window.open();
+                        $(w.document.body).html(html);
+                        $("#filename").val("");
+                        $("#exportlogo").remove();
+                    }
+                });
+
+            });
             $("#btnSaveEI").click(function () {
-                var $ua = navigator.userAgent;
-                if (($ua.match(/(iPod|iPhone|iPad|android)/i))) {
-                    $("#canvasDiv").append("<img id='exportlogo' class='img-responsive'  src='content/images/adam-logo-small.png'/>");
-                        html2canvas($("#canvasDiv"), {
-                            onrendered: function (canvas) {
-                                var imgsrc = canvas.toDataURL("image/png");
-                                console.log(imgsrc);
-                                var html = '<div id="img"><img src="' + imgsrc + '" id="newimg" style="margin:auto;top:0px;left:0px;right:0px;position:absolute;border:1px solid #ccc;" /></div>';
-                                var w = window.open();
-                                $(w.document.body).html(html);
-                                $("#filename").val("");
-                            }
-                        });
-                }
-                else {
-                    $("#canvasDiv").append("<img id='exportlogo' class='img-responsive'  src='content/images/adam-logo-small.png'/>");
+                 $("#canvasDiv").append("<img id='exportlogo' class='img-responsive'  src='content/images/adam-logo-small.png'/>");
                     html2canvas($("#canvasDiv"), {
                         onrendered: function (canvas) {
                             theCanvas = canvas;
@@ -1926,7 +1955,7 @@
                         }
                     });
                     $(".export-image").css("display", "none");
-                }
+                
             });
         });
         function dataURItoBlob(dataURI) {