ADAM / AIAHTML5

Commit 716861f24d02ef1a32abc0a322ed838753858077

Authored by Birendra
1 parent 1dace96c

fix panel min,max issue

Inline Side-by-side
Showing 13 changed files with 207 additions and 256 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js
  View file @716861f
... ... @@ -17,7 +17,7 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location
17 17 'width': 0,
18 18 'height': 0,
19 19 'minimised': false,
20   - 'maximised': false,
  20 + 'maximised': true,
21 21 'minmaxAutoEvent':true,
22 22  
23 23 };
... ... @@ -356,9 +356,9 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location
356 356 $scope.Set3DwindowStoreData(windowviewid, 'currentViewTitle', ThreeDTitle);
357 357 localStorage.setItem("currentViewTitle", ThreeDTitle);
358 358  
359   - var isMaximize = $scope.ThreeDOpenInOtherModules.maximised;
360   - var isMinimize = $scope.ThreeDOpenInOtherModules.minimised;
361   -
  359 + var isMaximize = $scope.ThreeDOpenInOtherModules.maximised!=undefined?$scope.ThreeDOpenInOtherModules.maximised:false;
  360 + var isMinimize = $scope.ThreeDOpenInOtherModules.minimised!=undefined?$scope.ThreeDOpenInOtherModules.minimised:false;
  361 +
362 362 $scope.Set3DwindowStoreData(windowviewid, 'maximised', isMaximize);
363 363 $scope.Set3DwindowStoreData(windowviewid, 'minimised', isMinimize);
364 364 if($location.url()== "/curriculum-builder-detail") {
... ... @@ -421,7 +421,7 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location
421 421 }
422 422 else {
423 423 $scope.jsPanelWidth = $(window).outerWidth() - 20;
424   - $scope.jsPanelHeight = $(window).outerHeight() - 105;
  424 + $scope.jsPanelHeight = $(window).outerHeight() - 90;
425 425 $scope.jsPanelLeft = 1;
426 426 $scope.jsPanelTop = 70;
427 427 }
... ... @@ -435,7 +435,7 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location
435 435 theme: 'success',
436 436 currentController: '3dAController',
437 437 parentSlug: $scope.Get3DwindowStoreData(windowviewid, 'parentSlugName'),
438   - content: '<div class="col-sm-12" style="height: 100%;overflow: scroll;" >' +
  438 + content: '<div style="height: 100%;overflow: scroll;" >' +
439 439 '<object data="' + Selected3DImagePath + '" width="100%" height="100%" type="image/svg+xml" id="threedImage_' + windowviewid + '" onload="AnimationOnLoad(event)"></object>' +
440 440 '</div><script>$(document).ready(function(){var $ua = navigator.userAgent; if (($ua.match(/(iPod|iPhone|iPad|android)/i))) {var threeDivWidth = $("#ThreeDView").css("width");$("#ThreeDView").css({"left":"0px","width":"100%","min-idth": threeDivWidth}); var jspanelContainerWidth = $(".jsPanel-content").css("width"); $(".jsPanel-content").css({ "width": "100%", "min-width": jspanelContainerWidth}); $("#ThreeDImagePanel_' + windowviewid + '").css("width", "100%"); }});</script>',
441 441 title: tittle,
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/AIController.js
  View file @716861f
... ... @@ -77,7 +77,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
77 77 'width': 0,
78 78 'height': 0,
79 79 'minimised': false,
80   - 'maximised': false,
  80 + 'maximised': true,
81 81 'minmaxAutoEvent':true,
82 82 'annotationData':{shapeStates:[],paintCanvasState:[]},
83 83 };
... ... @@ -1105,8 +1105,9 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
1105 1105 $scope.SetAIwindowStoreData(windowviewid, 'currentViewTitle', aiTitle);
1106 1106 localStorage.setItem("currentViewTitle", aiTitle);
1107 1107  
1108   - var isMaximize = $scope.aiOpenInOtherModules.maximised;
1109   - var isMinimize = $scope.aiOpenInOtherModules.minimised;
  1108 + var isMaximize = $scope.aiOpenInOtherModules.maximised!=undefined?$scope.aiOpenInOtherModules.maximised:false;
  1109 + var isMinimize = $scope.aiOpenInOtherModules.minimised!=undefined?$scope.aiOpenInOtherModules.minimised:false;
  1110 +
1110 1111 $scope.SetAIwindowStoreData(windowviewid, 'maximised', isMaximize);
1111 1112 $scope.SetAIwindowStoreData(windowviewid, 'minimised', isMinimize);
1112 1113  
... ... @@ -1168,9 +1169,10 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
1168 1169 }
1169 1170 else {
1170 1171 $scope.jsPanelWidth = $(window).innerWidth() - 30;
1171   - $scope.jsPanelHeight = $(window).innerHeight() - 150;
  1172 + $scope.jsPanelHeight =$(window).innerHeight() - 150;
1172 1173 $scope.jsPanelLeft = 15;
1173 1174 $scope.jsPanelTop = 70;
  1175 +
1174 1176 }
1175 1177  
1176 1178 if (selectedAIImage.length > 0) {
... ... @@ -1217,6 +1219,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
1217 1219 $scope.SetAIwindowStoreData(windowviewid, 'minimised',false);
1218 1220 var canvasDIvHeight = $('#aiImagePanel_' + windowviewid+ " .jsPanel-content").height();
1219 1221 $('#canvasDivAI_' + windowviewid).css('height', canvasDIvHeight-5);
  1222 +
1220 1223 },
1221 1224 onnormalized:function (panel) {
1222 1225 var isAutoCalled = $scope.GetAIwindowStoreData(windowviewid, 'minmaxAutoEvent');
... ... @@ -1228,7 +1231,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
1228 1231 $scope.SetAIwindowStoreData(windowviewid, 'maximised',false);
1229 1232 var canvasDIvHeight = $('#aiImagePanel_' + windowviewid+ " .jsPanel-content").height();
1230 1233 $('#canvasDivAI_' + windowviewid).css('height', canvasDIvHeight-5);
1231   - },
  1234 + },
1232 1235 resizable: {
1233 1236 stop: function (event, ui) {
1234 1237 var len = (event.currentTarget.id).split("_").length;
... ... @@ -1276,10 +1279,11 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
1276 1279 $('.jsPanel-content .jsPanel-theme-success').css('overflow-y', 'auto !important')
1277 1280 var canvasDIvHeight = $('#aiImagePanel_' + windowviewid+ " .jsPanel-content").height();
1278 1281 // console.log($rootScope.OpenAdamImages);
1279   - $('#AIView').css("height", $(window).innerHeight()-100);
1280   -
1281   - $('#AIView').css("width",$(window).innerWidth()-100);
1282   -
  1282 + if (!$rootScope.isCallFromOtherModule) {
  1283 + $('#AIView').css("height", $(window).innerHeight()-100);
  1284 + $('#AIView').css("width",$(window).innerWidth()-100);
  1285 + }
  1286 +
1283 1287 $('#canvasDivAI_' + windowviewid).css('height', canvasDIvHeight-5);
1284 1288  
1285 1289 if (!$rootScope.isCallFromOtherModule) {
... ... @@ -1376,8 +1380,8 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
1376 1380 $rootScope.resetMenuOption();
1377 1381  
1378 1382 //remove pre event
1379   - $("#aiImagePanel_" + windowviewid).off("click");
1380   -
  1383 + // $("#aiImagePanel_" + windowviewid).off("click");
  1384 +
1381 1385 $("#aiImagePanel_" + windowviewid).on('click', function (event) {
1382 1386 //after drawing annotation click not work on iPad/Android device
1383 1387 var pnlName = event.currentTarget.id;
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
  View file @716861f
... ... @@ -63,7 +63,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
63 63 'width': 0,
64 64 'height': 0,
65 65 'minimised': false,
66   - 'maximised': false,
  66 + 'maximised': true,
67 67 'minmaxAutoEvent':true,
68 68 };
69 69 return windata;
... ... @@ -878,8 +878,9 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
878 878 $scope.SetCAwindowStoreData(windowviewid, 'currentViewTitle', ciTitle);
879 879 localStorage.setItem("currentViewTitle", ciTitle);
880 880  
881   - var isMaximize = $scope.caOpenInOtherModules.maximised;
882   - var isMinimize = $scope.caOpenInOtherModules.minimised;
  881 + var isMaximize = $scope.caOpenInOtherModules.maximised!=undefined?$scope.caOpenInOtherModules.maximised:false;
  882 + var isMinimize = $scope.caOpenInOtherModules.minimised!=undefined?$scope.caOpenInOtherModules.minimised:false;
  883 +
883 884 $scope.SetCAwindowStoreData(windowviewid, 'maximised', isMaximize);
884 885 $scope.SetCAwindowStoreData(windowviewid, 'minimised', isMinimize);
885 886  
... ... @@ -940,7 +941,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
940 941 if ($rootScope.isCallFromOtherModule) {
941 942 if($rootScope.linkToOpenCa==true)
942 943 {
943   - $scope.jsPanelWidth = $(window).outerWidth() - 20;
  944 + $scope.jsPanelWidth = $(window).outerWidth() - 10;
944 945 $scope.jsPanelHeight = $(window).outerHeight() - 105;
945 946 $scope.jsPanelLeft = 1;
946 947 $scope.jsPanelTop = 70;
... ... @@ -972,7 +973,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
972 973  
973 974 }
974 975 else {
975   - $scope.jsPanelWidth = $(window).outerWidth() - 20;
  976 + $scope.jsPanelWidth = $(window).outerWidth()-30;
976 977 $scope.jsPanelHeight = $(window).outerHeight() - 105;
977 978 $scope.jsPanelLeft = 1;
978 979 $scope.jsPanelTop = 70;
... ... @@ -1163,7 +1164,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
1163 1164 $rootScope.resetMenuOption();
1164 1165 // call from while open module in CB
1165 1166 //remove pre event
1166   - $("#caImagePanel_" + windowviewid).off("click");
  1167 + // $("#caImagePanel_" + windowviewid).off("click");
1167 1168  
1168 1169 $("#caImagePanel_" + windowviewid).on('click', function (event) {
1169 1170 //after drawing annotation click not work on iPad/Android device
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
  View file @716861f
... ... @@ -73,7 +73,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
73 73 'width': 0,
74 74 'height': 0,
75 75 'minimised': false,
76   - 'maximised': false,
  76 + 'maximised': true,
77 77 'minmaxAutoEvent':true,
78 78 'annotationData':{shapeStates:[],paintCanvasState:[]},
79 79  
... ... @@ -891,9 +891,9 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
891 891 var ciTitle = $scope.ciOpenInOtherModules.anatomyTitle;
892 892 $scope.SetCIwindowStoreData(windowviewid, 'currentViewTitle', ciTitle);
893 893 localStorage.setItem("currentViewTitle", ciTitle);
  894 + var isMaximize = $scope.ciOpenInOtherModules.maximised!=undefined?$scope.ciOpenInOtherModules.maximised:false;
  895 + var isMinimize = $scope.ciOpenInOtherModules.minimised!=undefined?$scope.ciOpenInOtherModules.minimised:false;
894 896  
895   - var isMaximize = $scope.ciOpenInOtherModules.maximised;
896   - var isMinimize = $scope.ciOpenInOtherModules.minimised;
897 897 $scope.SetCIwindowStoreData(windowviewid, 'maximised', isMaximize);
898 898 $scope.SetCIwindowStoreData(windowviewid, 'minimised', isMinimize);
899 899  
... ... @@ -956,8 +956,8 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
956 956  
957 957 }
958 958 else {
959   - $scope.jsPanelWidth = $(window).outerWidth() - 15;
960   - $scope.jsPanelHeight = $(window).outerHeight() - 140;
  959 + $scope.jsPanelWidth = $(window).outerWidth() - 30;
  960 + $scope.jsPanelHeight = $(window).outerHeight() - 150;
961 961 $scope.jsPanelLeft = 15;
962 962 $scope.jsPanelTop = 70;
963 963 }
... ... @@ -971,12 +971,12 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
971 971 content:'<div>'+
972 972 ' <div class="container-fluid">'+
973 973 ' <div class="row">'+
974   - '<div class="img-thumbnail" style="overflow: hidden;width:100%;position:relative" id="canvasDivCI_' + windowviewid + '"> <canvas id="canvasPaintCI_' + windowviewid + '" ng-click="FreeStylePaint($event)" width="2270" height="700" class="canvas-annotationStyle1" style="position: absolute;z-index:0;left:0px"></canvas><canvas id="canvasCI_' + windowviewid + '" ng-click="onDrawingCanvasClick($event)" width="2270" height="700" class="canvas-annotationStyle" style="position: absolute; background-color: transparent;z-index:1;left:0px "></canvas>' +
  974 + '<div class="img-thumbnail" style="overflow: scroll;width:100%;position:relative" id="canvasDivCI_' + windowviewid + '"> <canvas id="canvasPaintCI_' + windowviewid + '" ng-click="FreeStylePaint($event)" width="2270" height="700" class="canvas-annotationStyle1" style="position: absolute;z-index:0;left:0px"></canvas><canvas id="canvasCI_' + windowviewid + '" ng-click="onDrawingCanvasClick($event)" width="2270" height="700" class="canvas-annotationStyle" style="position: absolute; background-color: transparent;z-index:1;left:0px "></canvas>' +
975 975 //'<div class="col-sm-12 img-thumbnail" align="center">' +
976 976 '<img id="ciimage_' + windowviewid + '" alt="" title="" style="left:0px;top:0px;position:absolute;visibility:hidden">' +
977 977 '<div id="summary_' + windowviewid + '" class="col-sm-12 well img-subtitle" style="position:absolute;bottom:0px;margin-bottom:0px;padding:5px;width:100%">' +
978 978 '<div id="sid_' + windowviewid + '" align="left" style="height:100px;overflow-y:scroll !important;-webkit-overflow-scrolling:touch !important;"><p>' + selectedImageCISummary + '</p></div><button id="btnTxtOnOff_' + windowviewid + '" class="btn btn-primary pull-right">Text Off</button>' +
979   - '<script>$(document).ready(function(){ var $ua = navigator.userAgent;if(($ua.match(/(iPod|iPhone|iPad|android)/i))) { var jspanelContainerWidth = $(".jsPanel-content").css("width"); $(".jsPanel-content").css({ "width": "100%", "min-width": jspanelContainerWidth });$("#' + $scope.jsPanelID + '").css("width", "100%"); }$("#btnTxtOnOff_' + windowviewid + '").click(function(){if($.trim($(this).text()) === "Text Off"){$(this).text("Text On");$("#sid_' + windowviewid + '").css("visibility","hidden");}else{$(this).text("Text Off");$("#sid_' + windowviewid + '").css("visibility","visible");} GetTextVisibityCI(event);});});</script></div>' +
  979 + '<script>$(document).ready(function(){ var $ua = navigator.userAgent;if(($ua.match(/(iPod|iPhone|iPad|android)/i))) { $(".jsPanel-content").css({ "width": "100%"});$("#' + $scope.jsPanelID + '").css("width", "100%"); }$("#btnTxtOnOff_' + windowviewid + '").click(function(){if($.trim($(this).text()) === "Text Off"){$(this).text("Text On");$("#sid_' + windowviewid + '").css("visibility","hidden");}else{$(this).text("Text Off");$("#sid_' + windowviewid + '").css("visibility","visible");} GetTextVisibityCI(event);});});</script></div>' +
980 980 '</div>'+
981 981 '</div></div></div>',
982 982 title: tittle,
... ... @@ -1075,12 +1075,11 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
1075 1075  
1076 1076  
1077 1077 $scope.SetCIwindowStoreData(windowviewid, 'currentSlug', 'clinical-illustrations-detail');
1078   - $timeout(function () {
1079   -
  1078 + $timeout(function () {
1080 1079 var canvasDIvHeight = $('#ciImagePanel_' + windowviewid+ " .jsPanel-content").height();
1081   -
  1080 +
1082 1081 $('#canvasDivCI_' + windowviewid).css('height', canvasDIvHeight);
1083   -
  1082 +
1084 1083 if (!$rootScope.isCallFromOtherModule) {
1085 1084 $('#CIView').css("height", $(window).outerHeight() - 65);
1086 1085 $('#CIView').css("width", $(window).outerWidth() - 15);
... ... @@ -1212,7 +1211,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
1212 1211 //call when module loaded
1213 1212 $rootScope.resetMenuOption();
1214 1213 //remove pre event
1215   - $("#ciImagePanel_" + windowviewid).off("click");
  1214 + //$("#ciImagePanel_" + windowviewid).off("click");
1216 1215  
1217 1216 $("#ciImagePanel_" + windowviewid).on('click', function (event) {
1218 1217 //after drawing annotation click not work on iPad/Android device
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js
  View file @716861f
... ... @@ -37,8 +37,8 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
37 37 }
38 38 else
39 39 {
40   - $("#treecontent").css('height',screen.height-250);
41   - $("#cbdivarea").css('height',screen.height-180);
  40 + $("#treecontent").css('height',screen.height-280);
  41 + $("#cbdivarea").css('height',screen.height-210);
42 42 }
43 43  
44 44 $('#sidebar-wrapper').unbind('click');
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @716861f
... ... @@ -132,7 +132,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
132 132 'width': 0,
133 133 'height': 0,
134 134 'minimised': false,
135   - 'maximised': false,
  135 + 'maximised': true,
136 136 'minmaxAutoEvent':true,
137 137 'id': 0,
138 138 'moduleName': 'DISSECTIBLE_ANATOMY',
... ... @@ -754,8 +754,9 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
754 754 //// one layer down as compare to current running on production
755 755 $scope.SetwindowStoreData(windowviewid, 'layerNumber', $scope.daOpenInOtherModules.layerNumber - 1);
756 756  
757   - var isMaximize = $scope.daOpenInOtherModules.maximised;
758   - var isMinimize = $scope.daOpenInOtherModules.minimised;
  757 + var isMaximize = $scope.daOpenInOtherModules.maximised!=undefined?$scope.daOpenInOtherModules.maximised:false;
  758 + var isMinimize = $scope.daOpenInOtherModules.minimised!=undefined?$scope.daOpenInOtherModules.minimised:false;
  759 +
759 760 $scope.SetwindowStoreData(windowviewid, 'maximised', isMaximize);
760 761 $scope.SetwindowStoreData(windowviewid, 'minimised', isMinimize);
761 762 $scope.SetwindowStoreData(windowviewid, 'moduleName', "DISSECTIBLE_ANATOMY");
... ... @@ -984,13 +985,8 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
984 985 }
985 986 $scope.SetwindowStoreData(windowviewid, 'maximised',true);
986 987 $scope.SetwindowStoreData(windowviewid, 'minimised',false);
987   - if ($rootScope.isCallFromOtherModule) {
988   - var canvasDIvHeight = $('#daImagePanel_' + windowviewid+ " .jsPanel-content").height()-95;
989   - }
990   - else
991   - {
992   - var canvasDIvHeight = $('#daImagePanel_' + windowviewid+ " .jsPanel-content").height()-50;
993   - }
  988 + var canvasDIvHeight = $('#daImagePanel_' + windowviewid+ " .jsPanel-content").height()-50;
  989 +
994 990 $('#canvasDivDA_' + windowviewid).css('height', canvasDIvHeight);
995 991 },
996 992 onnormalized:function (panel) {
... ... @@ -1001,14 +997,8 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
1001 997 }
1002 998 $scope.SetwindowStoreData(windowviewid, 'minimised',false);
1003 999 $scope.SetwindowStoreData(windowviewid, 'maximised',false);
1004   - if ($rootScope.isCallFromOtherModule) {
1005   - var canvasDIvHeight = $('#daImagePanel_' + windowviewid+ " .jsPanel-content").height()-95;
1006   - }
1007   - else
1008   - {
1009   - var canvasDIvHeight = $('#daImagePanel_' + windowviewid+ " .jsPanel-content").height()-60;
1010   -
1011   - }
  1000 + var canvasDIvHeight = $('#daImagePanel_' + windowviewid+ " .jsPanel-content").height()-50;
  1001 +
1012 1002 $('#canvasDivDA_' + windowviewid).css('height', canvasDIvHeight);
1013 1003 },
1014 1004 resizable: {
... ... @@ -1017,14 +1007,9 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
1017 1007 var windowviewid = (event.currentTarget.id).split("_")[len - 1];
1018 1008 $scope.SetwindowStoreData(windowviewid, 'width', ui.size.width);
1019 1009 $scope.SetwindowStoreData(windowviewid, 'height', ui.size.height);
1020   - $rootScope.UnsaveCurriculum = true;
1021   - if ($rootScope.isCallFromOtherModule) {
1022   - var canvasDIvHeight = $('#daImagePanel_' + windowviewid+ " .jsPanel-content").height()-95;
1023   - }
1024   - else
1025   - {
1026   - var canvasDIvHeight = $('#daImagePanel_' + windowviewid+ " .jsPanel-content").height()-50;
1027   - }
  1010 + $rootScope.UnsaveCurriculum = true;
  1011 + var canvasDIvHeight = $('#daImagePanel_' + windowviewid+ " .jsPanel-content").height()-50;
  1012 +
1028 1013 $('#canvasDivDA_' + windowviewid).css('height', canvasDIvHeight);
1029 1014 }
1030 1015  
... ... @@ -1197,10 +1182,11 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
1197 1182 $scope.loadDAView = function (currentBodyViewId, windowviewid) {
1198 1183  
1199 1184 //0.4 added some stylesheets
1200   - $('#daBodyview').css("height", (parseInt($(window).outerHeight()) - 62 - 20));
1201   -
1202   - $('#daBodyview').css("width", $(window).outerWidth());
1203   -
  1185 + if (!$rootScope.isCallFromOtherModule) {
  1186 + $('#daBodyview').css("height", (parseInt($(window).outerHeight()) - 82));
  1187 + $('#daBodyview').css("width", $(window).outerWidth());
  1188 + }
  1189 +
1204 1190 $scope.SetwindowStoreData(windowviewid,'voId',currentBodyViewId);
1205 1191 //1. load navigator man first
1206 1192 console.log('before LoadBodyViewNavigatorImage call')
... ... @@ -1254,7 +1240,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
1254 1240 $rootScope.resetMenuOption();
1255 1241  
1256 1242 //remove pre event
1257   - $("#daImagePanel_" + windowviewid).off("click");
  1243 + // $("#daImagePanel_" + windowviewid).off("click");
1258 1244  
1259 1245 $("#daImagePanel_" + windowviewid).on('click', function (event) {
1260 1246  
... ... @@ -2113,13 +2099,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
2113 2099 $scope.SetwindowStoreData(windowviewid,'BodyRegionCordinatesData',[]);
2114 2100 $('#daBodyview').css('width', '100%');
2115 2101  
2116   - if ($rootScope.isCallFromOtherModule) {
2117   - var canvasDIvHeight = $('#daImagePanel_' + windowviewid+ " .jsPanel-content").height()-95;
2118   - }
2119   - else
2120   - {
2121   - var canvasDIvHeight = $('#daImagePanel_' + windowviewid+ " .jsPanel-content").height()-45;
2122   - }
  2102 + var canvasDIvHeight = $('#daImagePanel_' + windowviewid+ " .jsPanel-content").height()-50;
2123 2103  
2124 2104 $('#canvasDivDA_' + windowviewid).css('height', canvasDIvHeight);
2125 2105 $('#leftToolBarDA_' + windowviewid).css('height', $('#daImagePanel_' + windowviewid).outerHeight())
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @716861f
... ... @@ -9050,18 +9050,26 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
9050 9050  
9051 9051 }
9052 9052  
  9053 + $rootScope.CloseExportModal = function () {
  9054 +
  9055 + $(".modal-backdrop").css("opacity", "0");
  9056 + $(".modal-backdrop").css("z-index", "0");
  9057 + $("#exportfilename").val("");
  9058 + $("#filename_open").val("");
  9059 + $(".export-image").modal("hide");
  9060 + $(".export-image-ipad").modal("hide");
  9061 + }
9053 9062  
9054 9063 $rootScope.SaveImagefile = function () {
9055 9064 // select one module from multiple
9056 9065 var PanelElement= $scope.GetPanelElement($rootScope.panelNameWithCb);
9057   -
9058 9066 var canvasDiv = PanelElement.canvasDivElement;
9059 9067 if (canvasDiv == null || canvasDiv == undefined) return;
9060 9068 var canvasDivId = canvasDiv.id;
  9069 + var fileName = $("#exportfilename").val() + '.jpg';
9061 9070 $("#" + canvasDivId).append("<img id='exportlogo' class='img-responsive' src='content/images/adam-logo-small.png'/>");
9062 9071 html2canvas($("#" + canvasDivId), {
9063   - onrendered: function (canvas) {
9064   - var fileName = document.getElementById("filename").value + '.jpg';
  9072 + onrendered: function (canvas) {
9065 9073 if (typeof (fileName) == "undefined" || fileName == ".jpg")
9066 9074 fileName = "Untitled.jpg"
9067 9075  
... ... @@ -9075,7 +9083,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
9075 9083 console.log(blob);
9076 9084 saveAs(blob, fileName);
9077 9085 $("#exportlogo").remove();
9078   - $("#filename").val("");
  9086 + $("#exportfilename").val("");
9079 9087  
9080 9088 var imageInfo=$rootScope.UserImageExportData[0];
9081 9089  
... ... @@ -9083,70 +9091,70 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
9083 9091 .then(
9084 9092 function (result) {
9085 9093  
9086   - if ($rootScope.DaWindowData != undefined && $rootScope.DaWindowData.length > 0) {
9087   - for (var i = 0; i < $rootScope.DaWindowData.length; i++) {
9088   - $scope.updatedWindowListForSaveCB={
  9094 + // if ($rootScope.DaWindowData != undefined && $rootScope.DaWindowData.length > 0) {
  9095 + // for (var i = 0; i < $rootScope.DaWindowData.length; i++) {
  9096 + // $scope.updatedWindowListForSaveCB={
9089 9097  
9090   - // bodySystemTermList: $rootScope.DaWindowData[i].BodySystemData,
9091   - isTitleBarVisible: false,
9092   - highlightOptionsSelectedId: 0,
9093   - selectedStructureID: 0,//N
9094   - contentDescriptorId: 0,
9095   - callOuts: $rootScope.DaWindowData[i].CurriculumTermData,
9096   -
9097   - layerNumber: parseInt($rootScope.DaWindowData[i].layerNumber) + 1,
9098   - isModestyOn: $rootScope.DaWindowData[i].ModestyValue,
  9098 + // // bodySystemTermList: $rootScope.DaWindowData[i].BodySystemData,
  9099 + // isTitleBarVisible: false,
  9100 + // highlightOptionsSelectedId: 0,
  9101 + // selectedStructureID: 0,//N
  9102 + // contentDescriptorId: 0,
  9103 + // callOuts: $rootScope.DaWindowData[i].CurriculumTermData,
  9104 +
  9105 + // layerNumber: parseInt($rootScope.DaWindowData[i].layerNumber) + 1,
  9106 + // isModestyOn: $rootScope.DaWindowData[i].ModestyValue,
9099 9107  
9100   - isTopToolBarVisible: false,
9101   - clickedTermList: $rootScope.DaWindowData[i].fullTermlist,
9102   - minimised: $rootScope.DaWindowData[i].minimised,
9103   - windowTitle: $rootScope.DaWindowData[i].currentViewTitle,
  9108 + // isTopToolBarVisible: false,
  9109 + // clickedTermList: $rootScope.DaWindowData[i].fullTermlist,
  9110 + // minimised: $rootScope.DaWindowData[i].minimised,
  9111 + // windowTitle: $rootScope.DaWindowData[i].currentViewTitle,
9104 9112  
9105   - maximised: $rootScope.DaWindowData[i].maximised,
9106   - size: {
9107   - width: $rootScope.DaWindowData[i].width,
9108   - height: $rootScope.DaWindowData[i].height
9109   - },
9110   - id: $rootScope.DaWindowData[i].voId,
  9113 + // maximised: $rootScope.DaWindowData[i].maximised,
  9114 + // size: {
  9115 + // width: $rootScope.DaWindowData[i].width,
  9116 + // height: $rootScope.DaWindowData[i].height
  9117 + // },
  9118 + // id: $rootScope.DaWindowData[i].voId,
9111 9119  
9112   - imageId: $rootScope.DaWindowData[i].imageId,
9113   - position: {
9114   - top: $rootScope.DaWindowData[i].top,
9115   - left: $rootScope.DaWindowData[i].left,
9116   - },
9117   - mType: $rootScope.DaWindowData[i].moduleName,
9118   - containsCapturedContent: true,
  9120 + // imageId: $rootScope.DaWindowData[i].imageId,
  9121 + // position: {
  9122 + // top: $rootScope.DaWindowData[i].top,
  9123 + // left: $rootScope.DaWindowData[i].left,
  9124 + // },
  9125 + // mType: $rootScope.DaWindowData[i].moduleName,
  9126 + // containsCapturedContent: true,
9119 9127  
9120   - zoom: $rootScope.DaWindowData[i].zoomInOut,
9121   - skinId: $rootScope.DaWindowData[i].curentEthnicity,
9122   - isResizeLock: false , //N
9123   - mode: $rootScope.DaWindowData[i].mode,
9124   - windowListId: 0,//N
9125   - canvasVScrollX: $rootScope.DaWindowData[i].CanvasDivTopPosition,
9126   - canvasHScrollX: $rootScope.DaWindowData[i].CanvasDivLeftPosition,
9127   - isCallOutVisible: false,
9128   - annotationData:$rootScope.DaWindowData[i].annotationData,
9129   - isLeftToolBarVisible: false,
9130   - isModuleLoaded: false,
9131   - searchSelectedText: $rootScope.DaWindowData[i].searchSelectedText,
9132   - prevId: $rootScope.DaWindowData[i].prevId,
  9128 + // zoom: $rootScope.DaWindowData[i].zoomInOut,
  9129 + // skinId: $rootScope.DaWindowData[i].curentEthnicity,
  9130 + // isResizeLock: false , //N
  9131 + // mode: $rootScope.DaWindowData[i].mode,
  9132 + // windowListId: 0,//N
  9133 + // canvasVScrollX: $rootScope.DaWindowData[i].CanvasDivTopPosition,
  9134 + // canvasHScrollX: $rootScope.DaWindowData[i].CanvasDivLeftPosition,
  9135 + // isCallOutVisible: false,
  9136 + // annotationData:$rootScope.DaWindowData[i].annotationData,
  9137 + // isLeftToolBarVisible: false,
  9138 + // isModuleLoaded: false,
  9139 + // searchSelectedText: $rootScope.DaWindowData[i].searchSelectedText,
  9140 + // prevId: $rootScope.DaWindowData[i].prevId,
9133 9141  
9134   - isTransparent: $rootScope.DaWindowData[i].isTransparent,
9135   - transparencyBounds: $rootScope.DaWindowData[i].transparencyBounds,
9136   - transparencyValue: $rootScope.DaWindowData[i].transNumber,
9137   - layerNumberTransparency: $rootScope.DaWindowData[i].layerNumberTransparency,
9138   - transparencyX: $rootScope.DaWindowData[i].transparencyX,
9139   - transparencyY: $rootScope.DaWindowData[i].transparencyY,
9140   - layerNumberBeforeTBDraw: $rootScope.DaWindowData[i].layerNumberBeforeTBDraw,
9141   - showHideAnnotations: $rootScope.DaWindowData[i].showHideAnnotations
  9142 + // isTransparent: $rootScope.DaWindowData[i].isTransparent,
  9143 + // transparencyBounds: $rootScope.DaWindowData[i].transparencyBounds,
  9144 + // transparencyValue: $rootScope.DaWindowData[i].transNumber,
  9145 + // layerNumberTransparency: $rootScope.DaWindowData[i].layerNumberTransparency,
  9146 + // transparencyX: $rootScope.DaWindowData[i].transparencyX,
  9147 + // transparencyY: $rootScope.DaWindowData[i].transparencyY,
  9148 + // layerNumberBeforeTBDraw: $rootScope.DaWindowData[i].layerNumberBeforeTBDraw,
  9149 + // showHideAnnotations: $rootScope.DaWindowData[i].showHideAnnotations
9142 9150  
9143 9151  
9144   - }
9145   - }
  9152 + // }
  9153 + // }
9146 9154  
9147   - }
  9155 + // }
9148 9156  
9149   - localStorage.setItem("daDataObject",JSON.stringify($scope.updatedWindowListForSaveCB) );
  9157 + //localStorage.setItem("daDataObject",JSON.stringify($scope.updatedWindowListForSaveCB) );
9150 9158 if(result!=null && result!="ADMIN" )
9151 9159 {
9152 9160 var userid= $rootScope.userData.Id;
... ... @@ -9173,21 +9181,23 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
9173 9181  
9174 9182 }
9175 9183 });
9176   - $(".export-image").css("display", "none");
  9184 + $(".modal-backdrop").css("opacity", "0");
  9185 + $(".modal-backdrop").css("z-index", "0");
  9186 + $(".export-image").modal("hide")
9177 9187  
9178 9188 };
9179 9189  
9180 9190 $rootScope.SaveOpenImagefile = function () {
9181 9191 // select one module from multiple
9182 9192 var PanelElement= $scope.GetPanelElement($rootScope.panelNameWithCb);
9183   -
  9193 + var fileName = $("#filename_open").val() + '.jpg';
9184 9194 var canvasDiv = PanelElement.canvasDivElement;
9185 9195 if (canvasDiv == null || canvasDiv == undefined) return;
9186 9196 var canvasDivId = canvasDiv.id;
9187 9197 $("#" + canvasDivId).append("<img id='exportlogo' class='img-responsive' src='content/images/adam-logo-small.png'/>");
9188 9198 html2canvas($("#" + canvasDivId), {
9189 9199 onrendered: function (canvas) {
9190   - var fileName = document.getElementById("filename_open").value + '.jpg';
  9200 +
9191 9201 if (typeof (fileName) == "undefined" || fileName == ".jpg")
9192 9202 fileName = "Untitled.jpg"
9193 9203  
... ... @@ -9216,7 +9226,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
9216 9226 .then(
9217 9227 function (result) {
9218 9228  
9219   - localStorage.setItem("daDataObject",JSON.stringify($scope.updatedWindowListForSaveCB) );
  9229 + //localStorage.setItem("daDataObject",JSON.stringify($scope.updatedWindowListForSaveCB) );
9220 9230 if(result!=null && result!="ADMIN" )
9221 9231 {
9222 9232 var userid= $rootScope.userData.Id;
... ... @@ -9243,8 +9253,10 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
9243 9253  
9244 9254 }
9245 9255 });
9246   - $(".export-image-ipad").css("display", "none");
9247   -
  9256 + $(".modal-backdrop").css("opacity", "0");
  9257 + $(".modal-backdrop").css("z-index", "0");
  9258 + $(".export-image-ipad").modal("hide");
  9259 +
9248 9260 };
9249 9261  
9250 9262 }]
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js
  View file @716861f
... ... @@ -40,7 +40,7 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
40 40 'width': 0,
41 41 'height': 0,
42 42 'minimised': false,
43   - 'maximised': false,
  43 + 'maximised': true,
44 44 'minmaxAutoEvent':true,
45 45 'isLabExChanged':false
46 46  
... ... @@ -311,8 +311,9 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
311 311 var keywords = $scope.leOpenInOtherModules.id;
312 312  
313 313 $scope.SetLEwindowStoreData(windowviewid, 'keywords', keywords);
314   - var isMaximize = $scope.leOpenInOtherModules.maximised;
315   - var isMinimize = $scope.leOpenInOtherModules.minimised;
  314 + var isMaximize = $scope.leOpenInOtherModules.maximised!=undefined?$scope.leOpenInOtherModules.maximised:false;
  315 + var isMinimize = $scope.leOpenInOtherModules.minimised!=undefined?$scope.leOpenInOtherModules.minimised:false;
  316 + ;
316 317 $scope.SetLEwindowStoreData(windowviewid, 'maximised', isMaximize);
317 318 $scope.SetLEwindowStoreData(windowviewid, 'minimised', isMinimize);
318 319  
... ... @@ -537,7 +538,7 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
537 538 $rootScope.resetMenuOption();
538 539  
539 540 //remove pre event
540   - $("#labImagePanel_" + windowviewid).off("click");
  541 + // $("#labImagePanel_" + windowviewid).off("click");
541 542  
542 543 $("#labImagePanel_" + windowviewid).on('click', function (event) {
543 544 var pnlName = event.currentTarget.id;
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/MyAnimationController.js
  View file @716861f
... ... @@ -213,8 +213,9 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
213 213 var aiTitle = $scope.VidOpenInOtherModules.anatomyTitle;
214 214 $scope.SetVideowindowStoreData(windowviewid, 'currentViewTitle', aiTitle);
215 215 localStorage.setItem("currentViewTitle", aiTitle);
216   - var isMaximize = $scope.VidOpenInOtherModules.maximised;
217   - var isMinimize = $scope.VidOpenInOtherModules.minimised;
  216 + var isMaximize = $scope.VidOpenInOtherModules.maximised!=undefined?$scope.VidOpenInOtherModules.maximised:false;
  217 + var isMinimize = $scope.VidOpenInOtherModules.minimised!=undefined?$scope.VidOpenInOtherModules.minimised:false;
  218 +
218 219 $scope.SetVideowindowStoreData(windowviewid, 'maximised', isMaximize);
219 220 $scope.SetVideowindowStoreData(windowviewid, 'minimised', isMinimize);
220 221  
... ... @@ -447,7 +448,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
447 448 $rootScope.resetMenuOption();
448 449 // call from while open module in CB
449 450 //remove pre event
450   - $("#vidImagePanel_" + windowviewid).off("click");
  451 + // $("#vidImagePanel_" + windowviewid).off("click");
451 452  
452 453 $("#vidImagePanel_" + windowviewid).on('click', function (event) {
453 454 //after drawing annotation click not work on iPad/Android device
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/MyPictureController.js
  View file @716861f
... ... @@ -224,8 +224,9 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
224 224 var aiTitle = $scope.picOpenInOtherModules.anatomyTitle;
225 225 $scope.SetPICwindowStoreData(windowviewid, 'currentViewTitle', aiTitle);
226 226 localStorage.setItem("currentViewTitle", aiTitle);
227   - var isMaximize = $scope.picOpenInOtherModules.maximised;
228   - var isMinimize = $scope.picOpenInOtherModules.minimised;
  227 + var isMaximize = $scope.picOpenInOtherModules.maximised!=undefined?$scope.picOpenInOtherModules.maximised:false;
  228 + var isMinimize = $scope.picOpenInOtherModules.minimised!=undefined?$scope.picOpenInOtherModules.minimised:false;
  229 +
229 230 $scope.SetPICwindowStoreData(windowviewid, 'maximised', isMaximize);
230 231 $scope.SetPICwindowStoreData(windowviewid, 'minimised', isMinimize);
231 232  
... ... @@ -281,7 +282,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
281 282 content: '<div>'+
282 283 ' <div class="container-fluid">'+
283 284 ' <div class="row">'+
284   - '<div class="img-thumbnail" style="overflow: hidden;width:100%;position:relative" id="canvasDivPIC_' + windowviewid + '" ><canvas id="canvasPaintPIC_' + windowviewid + '" ng-click="FreeStylePaint($event)" width="2277" height="1000" class="canvas-annotationStyle1" style="position: absolute;z-index:0;left:0px"></canvas><canvas id="canvasPIC_' + windowviewid + '" ng-click="onDrawingCanvasClick($event)" width="2277" height="1000" class="canvas-annotationStyle" style="position: absolute; background-color: transparent;z-index:1;left:0px "></canvas>' +
  285 + '<div class="img-thumbnail" style="overflow: scroll;width:100%;position:relative" id="canvasDivPIC_' + windowviewid + '" ><canvas id="canvasPaintPIC_' + windowviewid + '" ng-click="FreeStylePaint($event)" width="2277" height="1000" class="canvas-annotationStyle1" style="position: absolute;z-index:0;left:0px"></canvas><canvas id="canvasPIC_' + windowviewid + '" ng-click="onDrawingCanvasClick($event)" width="2277" height="1000" class="canvas-annotationStyle" style="position: absolute; background-color: transparent;z-index:1;left:0px "></canvas>' +
285 286 '<img id="mypic_' + windowviewid + '" alt="" title="" style="left:0px;top:0px;position:absolute">' +
286 287 '</div>'+
287 288 '</div></div></div>',
... ... @@ -374,10 +375,11 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
374 375  
375 376 $('.jsPanel-content .jsPanel-theme-success').css('overflow-y', 'auto !important')
376 377  
377   - $('#PicView').css("height", $(window).outerHeight() - 65);
378   -
379   - $('#PicView').css("width", $(window).outerWidth() - 15);
380   -
  378 + if (!$rootScope.isCallFromOtherModule) {
  379 + $('#PicView').css("height", $(window).outerHeight() - 65);
  380 + $('#PicView').css("width", $(window).outerWidth() - 15);
  381 + }
  382 +
381 383 var canvasDIvHeight = $('#picImagePanel_' + windowviewid+ " .jsPanel-content").height();
382 384  
383 385 $('#canvasDivPIC_' + windowviewid).css('height', canvasDIvHeight-5);
... ... @@ -433,7 +435,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
433 435 $rootScope.resetMenuOption();
434 436  
435 437 //remove pre event
436   - $("#picImagePanel_" + windowviewid).off("click");
  438 + // $("#picImagePanel_" + windowviewid).off("click");
437 439  
438 440 $("#picImagePanel_" + windowviewid).on('click', function (event) {
439 441 //after drawing annotation click not work on iPad/Android device
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
  View file @716861f
... ... @@ -93,7 +93,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
93 93 'width': 0,
94 94 'height': 0,
95 95 'minimised': false,
96   - 'maximised': false,
  96 + 'maximised': true,
97 97 'minmaxAutoEvent':true,
98 98 'id': 0,
99 99 'selectedPins': [],
... ... @@ -508,10 +508,11 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
508 508 $scope.SetAAwindowStoreData(windowviewid, 'isShowSelectedPins', $scope.aaOpenInOtherModules.showSelectedPins);
509 509 if ($scope.aaOpenInOtherModules.showHideAnnotations != undefined && $scope.aaOpenInOtherModules.showHideAnnotations != "") {
510 510 $scope.SetAAwindowStoreData(windowviewid, 'showHideAnnotations', $scope.aaOpenInOtherModules.showHideAnnotations);
511   - }
512   -
513   - var isMaximize = $scope.aaOpenInOtherModules.maximised;
514   - var isMinimize = $scope.aaOpenInOtherModules.minimised;
  511 + }
  512 +
  513 + var isMaximize = $scope.aaOpenInOtherModules.maximised!=undefined?$scope.aaOpenInOtherModules.maximised:false;
  514 + var isMinimize = $scope.aaOpenInOtherModules.minimised!=undefined?$scope.aaOpenInOtherModules.minimised:false;
  515 +
515 516 $scope.SetAAwindowStoreData(windowviewid, 'maximised', isMaximize);
516 517 $scope.SetAAwindowStoreData(windowviewid, 'minimised', isMinimize);
517 518  
... ... @@ -619,7 +620,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
619 620 }
620 621 else {
621 622 $scope.jsPanelWidth = $(window).outerWidth() - 20;
622   - $scope.jsPanelHeight = $(window).outerHeight() - 150;
  623 + $scope.jsPanelHeight = $(window).outerHeight() - 140;
623 624 $scope.jsPanelLeft = 1;
624 625 $scope.jsPanelTop = 70;
625 626 }
... ... @@ -663,7 +664,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
663 664 }
664 665 $scope.SetAAwindowStoreData(windowviewid, 'maximised',true);
665 666 $scope.SetAAwindowStoreData(windowviewid, 'minimised',false);
666   - var canvasDIvHeight = $('#AAImagePanel_' + windowviewid+ " .jsPanel-content").height()-70;
  667 + var canvasDIvHeight = $('#AAImagePanel_' + windowviewid+ " .jsPanel-content").height()-50;
667 668 $('#canvasAADiv_' + windowviewid).css('height', canvasDIvHeight);
668 669 },
669 670 onnormalized:function (panel) {
... ... @@ -674,7 +675,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
674 675 }
675 676 $scope.SetAAwindowStoreData(windowviewid, 'minimised',false);
676 677 $scope.SetAAwindowStoreData(windowviewid, 'maximised',false);
677   - var canvasDIvHeight = $('#AAImagePanel_' + windowviewid+ " .jsPanel-content").height()-70;
  678 + var canvasDIvHeight = $('#AAImagePanel_' + windowviewid+ " .jsPanel-content").height()-50;
678 679 $('#canvasAADiv_' + windowviewid).css('height', canvasDIvHeight);
679 680 },
680 681 resizable: {
... ... @@ -684,7 +685,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
684 685 $scope.SetAAwindowStoreData(windowviewid, 'width', ui.size.width);
685 686 $scope.SetAAwindowStoreData(windowviewid, 'height', ui.size.height);
686 687 $rootScope.UnsaveCurriculum = true;
687   - var canvasDIvHeight = $('#AAImagePanel_' + windowviewid+ " .jsPanel-content").height()-70;
  688 + var canvasDIvHeight = $('#AAImagePanel_' + windowviewid+ " .jsPanel-content").height()-50;
688 689 $('#canvasAADiv_' + windowviewid).css('height', canvasDIvHeight);
689 690 }
690 691  
... ... @@ -761,16 +762,12 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
761 762  
762 763 $scope.loadAAModule = function (windowviewid) {
763 764  
764   - if ($rootScope.isCallFromOtherModule) {
765   - var canvasDIvHeight = parseInt($('#AAImagePanel_' + windowviewid).outerHeight()) - 100;
766   - }
767   - else
768   - {
769   - var canvasDIvHeight = parseInt($('#AAImagePanel_' + windowviewid).outerHeight()) - 90;
  765 + if (!$rootScope.isCallFromOtherModule) {
770 766 $('#aaBodyView').css("height", $(window).outerHeight() - 65);
771 767 $('#aaBodyView').css("width", $(window).outerWidth() - 15);
772 768 }
773   -
  769 +
  770 + var canvasDIvHeight = $('#AAImagePanel_' + windowviewid+ " .jsPanel-content").height()-50;
774 771 $('#canvasAADiv_' + windowviewid).css('height', canvasDIvHeight);
775 772 $('.canvasDivClass').css("height", canvasDIvHeight);
776 773  
... ... @@ -988,7 +985,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
988 985 //call when module loaded
989 986 $rootScope.resetMenuOption();
990 987 //remove pre event
991   - $("#AAImagePanel_" + windowviewid).off("click");
  988 + // $("#AAImagePanel_" + windowviewid).off("click");
992 989  
993 990 $("#AAImagePanel_" + windowviewid).on('click', function (event) {
994 991 var pnlName=event.currentTarget.id;
... ...
400-SOURCECODE/AIAHTML5.Web/index.aspx
  View file @716861f
... ... @@ -1181,12 +1181,12 @@
1181 1181 </div>
1182 1182  
1183 1183 <!--Export Image Modal-->
1184   - <div class="modal fade export-image ui-draggable in" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
  1184 + <div class="modal fade export-image ui-draggable in" data-keyboard="false" data-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
1185 1185 style="z-index: 1200002;">
1186 1186 <div class="modal-dialog modal-sm" role="document">
1187 1187 <div class="modal-content">
1188 1188 <div class="modal-header annotation-modal-header ui-draggable-handle">
1189   - <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
  1189 + <button type="button" class="close" data-dismiss="modal" aria-label="Close" ng-click="CloseExportModal()"><span aria-hidden="true">×</span></button>
1190 1190 <h4 class="modal-title" id="">Save As</h4>
1191 1191 </div>
1192 1192 <div class="modal-body">
... ... @@ -1195,7 +1195,7 @@
1195 1195 <div class="form-group">
1196 1196 <label for="filename">Filename:</label>
1197 1197 <div class="input-group">
1198   - <input type="text" class="form-control" id="filename" placeholder="enter name" ng-model="filename">
  1198 + <input type="text" class="form-control" id="exportfilename" placeholder="enter name" ng-model="exportfilename">
1199 1199 <div class="input-group-addon">.jpg</div>
1200 1200 </div>
1201 1201 </div>
... ... @@ -1213,12 +1213,12 @@
1213 1213 </div>
1214 1214 </div>
1215 1215 </div>
1216   - <div class="modal fade export-image-ipad ui-draggable in" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
  1216 + <div class="modal fade export-image-ipad ui-draggable in" data-keyboard="false" data-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
1217 1217 style="z-index: 1200002;">
1218 1218 <div class="modal-dialog modal-sm" role="document" style="width:400px">
1219 1219 <div class="modal-content">
1220 1220 <div class="modal-header annotation-modal-header ui-draggable-handle">
1221   - <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
  1221 + <button type="button" class="close" data-dismiss="modal" aria-label="Close" ng-click="CloseExportModal()"><span aria-hidden="true">×</span></button>
1222 1222 <h4 class="modal-title" id="">Download Export Image</h4>
1223 1223 </div>
1224 1224 <div class="modal-body" style="width: 400px; height: 100px; overflow-x: auto;">
... ...
400-SOURCECODE/AIAHTML5.Web/libs/jquery/jquery_plugin/jsPanel/jspanel/jquery.jspanel.js
  View file @716861f
... ... @@ -76,10 +76,10 @@ var jsPanel = {
76 76 '<div class="jsPanel-hdr jsPanel-theme-default">' +
77 77 '<h3 class="jsPanel-title"></h3>' +
78 78 '<div class="jsPanel-hdr-r">' +
79   - '<div class="jsPanel-btn-close "><span class="jsglyph jsglyph-remove"></span></div>' +
80   - '<div class="jsPanel-btn-max"><span class="jsglyph jsglyph-maximize"></span></div>' +
81   - '<div class="jsPanel-btn-norm"><span class="jsglyph jsglyph-normalize"></span></div>' +
82   - '<div class="jsPanel-btn-min"><span id="minSpan" class="fa fa-minus"></span></div>' +
  79 + '<div class="jsPanel-btn-close " title="close"><span class="jsglyph jsglyph-remove"></span></div>' +
  80 + '<div class="jsPanel-btn-max" title="maximize"><span class="jsglyph jsglyph-maximize"></span></div>' +
  81 + '<div class="jsPanel-btn-norm" title="restore"><span class="jsglyph jsglyph-normalize"></span></div>' +
  82 + '<div class="jsPanel-btn-min" title="minimize"><span id="minSpan" class="fa fa-minus"></span></div>' +
83 83  
84 84 //'<div class="jsPanel-btn-min"><span class="jsglyph jsglyph-minimize"></span></div>' +
85 85 //'<div class="jsPanel-btn-small"><span class="jsglyph jsglyph-chevron-up"></span></div>' +
... ... @@ -135,7 +135,7 @@ var jsPanel = {
135 135 // title h3 might be to small: load() is async!
136 136 jsPanel.resizeTitle(panel);
137 137 // update option.size (content might come delayed)
138   - jsPanel.updateOptionSize(panel, panel.option.size);
  138 + //jsPanel.updateOptionSize(panel, panel.option.size);
139 139 })
140 140 .then(function (data, textStatus, jqXHR) {
141 141 if (oAjax.then && $.isArray(oAjax.then)) {
... ... @@ -145,7 +145,7 @@ var jsPanel = {
145 145 // title h3 might be to small: load() is async!
146 146 jsPanel.resizeTitle(panel);
147 147 // update option.size (content might come delayed)
148   - jsPanel.updateOptionSize(panel, panel.option.size);
  148 + //jsPanel.updateOptionSize(panel, panel.option.size);
149 149 }
150 150 }, function (jqXHR, textStatus, errorThrown) {
151 151 if (oAjax.then && $.isArray(oAjax.then)) {
... ... @@ -775,7 +775,7 @@ var jsPanel = {
775 775 // title h3 might be to small: load() is async!
776 776 jsPanel.resizeTitle(panel);
777 777 // update option.size (content might come delayed)
778   - jsPanel.updateOptionSize(panel, panel.option.size);
  778 + //jsPanel.updateOptionSize(panel, panel.option.size);
779 779 // fix for a bug in jQuery-UI draggable? that causes the jsPanel to reduce width when dragged beyond boundary of containing element and option.size.width is 'auto'
780 780 panel.content.css('width', function () {
781 781 return panel.content.outerWidth();
... ... @@ -858,52 +858,33 @@ var jsPanel = {
858 858 //birendra
859 859 var currentController = panel.option.currentController;
860 860 if (pathname == "/curriculum-builder-detail")
861   - {
862   -
863   -
864   - if (currentController == 'DAController') {
865   - var len= (panel.option.id).split("_").length;
866   - var MultiWinId = (panel.option.id).split("_")[len-1];
867   - $('#canvasDivDA_' + MultiWinId).css('height', 460);
868   -
869   - }
870   - else if(currentController == 'TileViewListController')
871   - {
872   - var len= (panel.option.id).split("_").length;
873   - var MultiWinId = (panel.option.id).split("_")[len-1];
874   - $('#canvasAADiv_' + MultiWinId).css('height', 490);
875   -
876   - }
877   - else if (currentController == "CIController")
878   - {
879   -
880   - var len = (panel.option.id).split("_").length;
881   - var MultiWinId = (panel.option.id).split("_")[len - 1];
882   - $('#canvasDivCI_' + MultiWinId).css('height', 450);
883   - }
884   - else
885   - {
886   - // add for other module like AI when implemt for CB
887   - $('#canvasDiv').css('height', 470);
888   - }
889   -
890   - panel.css({
  861 + {
  862 + var ht=$("#cbdivarea").height()-100;
  863 + var wt= $("#cbdivarea").width();
  864 + panel.css({
891 865 top: parseInt(80),
892   - left: parseInt(320),
893   - width: currentController == 'CIController' ? 1010 : 1025,
894   - height: currentController == 'CIController' ? 550 : currentController == 'CAController' ? 545: 580,
  866 + left:parseInt(10),
  867 + width: wt,
  868 + height:ht,
895 869 });
  870 +
896 871  
897 872 }
898 873 else
899 874 {
900   - var ht=parseInt(panel.parent().outerHeight()) - parseInt(panel.option.maximizedMargin.top) - parseInt(panel.option.maximizedMargin.bottom) - 65;
  875 + //disable resize and drag on full screen
  876 + // panel.resizable({ disabled: true });
  877 + // panel.draggable({ disabled: true });
  878 + //maximize
  879 + var screenWidth =screen.width-20;
  880 + var screenHeight =screen.height<1024 ?screen.height-80:screen.height-230;
  881 + var ht=$(window).outerHeight()-10 - parseInt(panel.option.maximizedMargin.top) - parseInt(panel.option.maximizedMargin.bottom) - 65;
  882 + var wt=$(window).outerWidth()-10 - parseInt(panel.option.maximizedMargin.left) - parseInt(panel.option.maximizedMargin.right);
901 883 panel.css({
902 884 top: parseInt(70),//panel.option.maximizedMargin.top),
903   - left:currentController == 'CIController' ? 15 : parseInt(panel.option.maximizedMargin.left),
904   - width: parseInt(panel.parent().outerWidth(), 10) - parseInt(panel.option.maximizedMargin.left) - parseInt(panel.option.maximizedMargin.right),
905   - //height: parseInt(panel.parent().outerHeight()) - parseInt(panel.option.maximizedMargin.top) - parseInt(panel.option.maximizedMargin.bottom) - 65
906   - height: currentController == 'MyAnimationController' ? 510 : ht
  885 + left:parseInt(panel.option.maximizedMargin.left),
  886 + width: currentController == 'CAController' ? screenWidth: currentController == '3dAController' ? screenWidth: wt,
  887 + height:currentController == '3dAController' ? screenHeight: ht,
907 888 });
908 889  
909 890  
... ... @@ -977,8 +958,8 @@ var jsPanel = {
977 958 });
978 959 // update panel size to have correct values when normalizing again
979 960 if (panel.status === "normalized" || panel.option.panelstatus === "normalized") {
980   - panel.option.size.width = panel.outerWidth();
981   - panel.option.size.height = panel.outerHeight();
  961 + //panel.option.size.width = panel.outerWidth();
  962 + //panel.option.size.height = panel.outerHeight();
982 963 }
983 964 panel.animate({
984 965 opacity: 0
... ... @@ -1063,32 +1044,6 @@ var jsPanel = {
1063 1044 if (pathname == "/curriculum-builder-detail")
1064 1045 {
1065 1046  
1066   - if (currentController == 'DAController') {
1067   - var len= (panel.option.id).split("_").length;
1068   - var MultiWinId = (panel.option.id).split("_")[len-1];
1069   - $('#canvasDivDA_' + MultiWinId).css('height', (parseInt(panel.option.size.height, 10)-100));
1070   -
1071   - }
1072   - else if(currentController == 'TileViewListController')
1073   - {
1074   - var len= (panel.option.id).split("_").length;
1075   - var MultiWinId = (panel.option.id).split("_")[len-1];
1076   - $('#canvasAADiv_' + MultiWinId).css('height', (parseInt(panel.option.size.height, 10)-70));
1077   -
1078   - }
1079   - else if (currentController == 'CIController') {
1080   - var len = (panel.option.id).split("_").length;
1081   - var MultiWinId = (panel.option.id).split("_")[len - 1];
1082   - $('#canvasDivCI_' + MultiWinId).css('height', (parseInt(panel.option.size.height, 10) - 70));
1083   -
1084   - }
1085   - else
1086   - {
1087   - // add for other module like CI,AI when implemt for CB
1088   - $('#canvasDiv').css('height', (parseInt(panel.option.size.height, 10)-100));
1089   -
1090   - }
1091   -
1092 1047 panel.css({
1093 1048 width: panel.option.size.width,
1094 1049 height: currentController == 'CIController' ? parseInt(panel.option.size.height, 10) : currentController == 'CAController' ? parseInt(panel.option.size.height, 10) : parseInt(panel.option.size.height, 10) + 35,
... ... @@ -1100,9 +1055,11 @@ var jsPanel = {
1100 1055 }
1101 1056 else
1102 1057 {
  1058 + var ht=$(window).outerHeight()-panel.option.size.height<200?$(window).outerHeight()-200:panel.option.size.height;
  1059 + var wt=screen.width<1025?screen.width-100:$(window).innerWidth()-panel.option.size.width<300?$(window).innerWidth()-300:panel.option.size.width;
1103 1060 panel.css({
1104   - width: currentController == 'CIController' ? panel.option.size.width - 18 : panel.option.size.width,
1105   - height: currentController == 'CAController' ? parseInt(panel.option.size.height, 10) : parseInt(panel.option.size.height, 10) + 35,
  1061 + width: wt,
  1062 + height:ht,
1106 1063 top: panelTop,
1107 1064 left: panel.option.position.left
1108 1065 });
... ... @@ -1431,14 +1388,11 @@ var jsPanel = {
1431 1388 if (jspanel.attr("id") !== $(elmt).attr("id")) {
1432 1389  
1433 1390 var pathname = window.location.pathname;
1434   - //birendra
1435   - if (pathname == "/curriculum-builder-detail") {
1436 1391 var zindex = $(elmt).css("z-index");
1437 1392 if (zindex = "auto") {
1438 1393 $(elmt).css('z-index', '1');
1439 1394 }
1440   - }
1441   -
  1395 +
1442 1396 allZi.push($(elmt).css("z-index"));
1443 1397  
1444 1398 }
... ... @@ -2447,7 +2401,7 @@ console.log(&quot;jsPanel version: &quot; + jsPanel.version);
2447 2401 "onbeforeminimize": false,
2448 2402 "onbeforenormalize": false,
2449 2403 "onclosed": false,
2450   - "oncmaximized": false,
  2404 + "onmaximized": false,
2451 2405 "onminimized": false,
2452 2406 "onnormalized": false,
2453 2407 "overflow": 'hidden',
... ...