ADAM / AIAHTML5

Commit ffd462c00df5d83183c4a2f03b8316f2b5f2dc91

Authored by Birendra
1 parent f2107439

new modification in AIA

Inline Side-by-side
Showing 34 changed files with 1100 additions and 544 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js
  View file @ffd462c
... ... @@ -68,15 +68,15 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location
68 68 }
69 69 }
70 70  
71   - $rootScope.Get3DWindowId = function () {
72   - // handle for single window
73   - if ($rootScope.TheeDWindowData.length > 0) {
74   - for (var x = 0 ; x < $rootScope.TheeDWindowData.length; x++) {
  71 + // access from home controller
  72 + $rootScope.Set3DwindowData=function(windowviewid,keyname,data) {
  73 + for(var x=0 ;x < $rootScope.TheeDWindowData.length;x++){
75 74  
76   - return $rootScope.TheeDWindowData[x].multiwinid;
  75 + if($rootScope.TheeDWindowData[x].multiwinid==windowviewid)
  76 + {
  77 + $rootScope.TheeDWindowData[x][keyname]=data;
77 78 }
78 79 }
79   - else return 0;
80 80 }
81 81  
82 82 $scope.DisableUI = function () {
... ... @@ -228,7 +228,7 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location
228 228 "mType": 'THREE_D_ANATOMY',
229 229 "windowTitle": $event.currentTarget.textContent,
230 230 "size": { height: 600, width: 900 },
231   - "position": { x: 300, y: 110 }
  231 + "position": { x: 10, y: 30 }
232 232 };
233 233  
234 234 window.parent.AIAModuleOpenResourceInfo(ThreeDopenData);
... ... @@ -272,9 +272,10 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location
272 272 }
273 273  
274 274 $rootScope.Open3DModelBodyMain = function () {
275   - $scope.DisableUI();
276 275 if ($rootScope.isCallFromOtherModule) {
277 276 $scope.ThreeDModuleData = ModuleService.getModuleData("THREE_D_ANATOMY");
  277 + if($scope.ThreeDModuleData.length<1) return;
  278 + $scope.DisableUI();
278 279 $scope.readyToLoad = true;
279 280 $rootScope.ThreeDWindowLoadComplete = false;
280 281 $scope.wincount = 1;
... ... @@ -312,6 +313,7 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location
312 313  
313 314 }
314 315 else {
  316 + $scope.DisableUI();
315 317 $scope.Open3DModelBody(null);
316 318 }
317 319 }
... ... @@ -412,10 +414,12 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location
412 414 if ($scope.ThreeDOpenInOtherModules.position.x < 20)
413 415 $scope.jsPanelLeft = 20;
414 416 $scope.jsPanelTop = $scope.ThreeDOpenInOtherModules.position.y;
415   -
  417 + if ($scope.ThreeDOpenInOtherModules.position.y < 35)
  418 + $scope.jsPanelTop = 35;
  419 +
416 420 if($location.url()!= "/curriculum-builder-detail") {
417   - $scope.jsPanelLeft = 1;
418   - $scope.jsPanelTop = $rootScope.cBModulejsPanelTop();
  421 + $scope.jsPanelLeft = 20;
  422 + $scope.jsPanelTop = 100;
419 423 }
420 424  
421 425 }
... ... @@ -449,6 +453,9 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location
449 453 height: $scope.jsPanelHeight
450 454 },
451 455 onminimized:function (panel) {
  456 + var pnlName=panel[0].id;
  457 + var len = (pnlName).split("_").length;
  458 + var windowviewid = (pnlName).split("_")[len - 1];
452 459 var isAutoCalled = $scope.Get3DwindowStoreData(windowviewid, 'minmaxAutoEvent');
453 460 if(!isAutoCalled)
454 461 {
... ... @@ -458,6 +465,9 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location
458 465 $scope.Set3DwindowStoreData(windowviewid, 'maximised',false);
459 466 },
460 467 onmaximized:function (panel) {
  468 + var pnlName=panel[0].id;
  469 + var len = (pnlName).split("_").length;
  470 + var windowviewid = (pnlName).split("_")[len - 1];
461 471 var isAutoCalled = $scope.Get3DwindowStoreData(windowviewid, 'minmaxAutoEvent');
462 472 if(!isAutoCalled)
463 473 {
... ... @@ -467,6 +477,9 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location
467 477 $scope.Set3DwindowStoreData(windowviewid, 'minimised',false);
468 478 },
469 479 onnormalized:function (panel) {
  480 + var pnlName=panel[0].id;
  481 + var len = (pnlName).split("_").length;
  482 + var windowviewid = (pnlName).split("_")[len - 1];
470 483 var isAutoCalled = $scope.Get3DwindowStoreData(windowviewid, 'minmaxAutoEvent');
471 484 if(!isAutoCalled)
472 485 {
... ... @@ -474,24 +487,31 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location
474 487 }
475 488 $scope.Set3DwindowStoreData(windowviewid, 'minimised',false);
476 489 $scope.Set3DwindowStoreData(windowviewid, 'maximised',false);
  490 + $rootScope.resetMenuOptionOnClick(pnlName);
477 491 },
478 492 resizable: {
479 493 stop: function (event, ui) {
480   - var len = (event.currentTarget.id).split("_").length;
481   - var windowviewid = (event.currentTarget.id).split("_")[len - 1];
  494 + var pnlName=event.currentTarget.id;
  495 + var len = (pnlName).split("_").length;
  496 + var windowviewid = (pnlName).split("_")[len - 1];
482 497 $scope.Set3DwindowStoreData(windowviewid, 'width', ui.size.width);
483 498 $scope.Set3DwindowStoreData(windowviewid, 'height', ui.size.height);
  499 + $scope.Set3DwindowStoreData(windowviewid, 'y', ui.position.top);
  500 + $scope.Set3DwindowStoreData(windowviewid, 'x', ui.position.left);
484 501 $rootScope.UnsaveCurriculum = true;
  502 + $rootScope.resetMenuOptionOnClick(pnlName);
485 503 }
486 504  
487 505 },
488 506 draggable: {
489 507 stop: function( event, ui ) {
490   - var len = (event.currentTarget.id).split("_").length;
491   - var windowviewid = (event.currentTarget.id).split("_")[len - 1];
  508 + var pnlName=event.currentTarget.id;
  509 + var len = (pnlName).split("_").length;
  510 + var windowviewid = (pnlName).split("_")[len - 1];
492 511 $scope.Set3DwindowStoreData(windowviewid, 'y', ui.position.top);
493 512 $scope.Set3DwindowStoreData(windowviewid, 'x', ui.position.left);
494 513 $rootScope.UnsaveCurriculum = true;
  514 + $rootScope.resetMenuOptionOnClick(pnlName);
495 515 }
496 516 },
497 517  
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/AIController.js
  View file @ffd462c
... ... @@ -548,7 +548,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
548 548 }
549 549 else
550 550 {
551   - $('#grid-view').css({"height":"690","overflow":"scroll"});
  551 + $('#grid-view').css({"height":"670","overflow":"scroll"});
552 552 $('#ListViewDiv').css({"height":"450","overflow":"scroll"});
553 553 }
554 554 }
... ... @@ -689,7 +689,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
689 689 localStorage.setItem("SearchText", currentSearchtext);
690 690 if (currentSearchtext == "undefined" || (currentSearchtext == null || currentSearchtext == "")) {
691 691 if ($scope.query.SearchText == "undefined" || ($scope.query.SearchText == null || $scope.query.SearchText == "")) {
692   - $rootScope.errorMessage = AIAConstants.PLEASE_ENTER_SEARCH_TEXT;
  692 + $('#errorMessage').text(AIAConstants.PLEASE_ENTER_SEARCH_TEXT);
693 693 $("#messageModal").modal('show');
694 694 $scope.EnableUI();
695 695 return false;
... ... @@ -972,7 +972,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
972 972 "mType": 'ADAM_IMAGES',
973 973 "windowTitle": $rootScope.ViewTitle,
974 974 "size": { height: 600, width: 900 },
975   - "position": { x: 300, y: 110 }
  975 + "position": { x: 10, y: 30 }
976 976 };
977 977  
978 978 window.parent.AIAModuleOpenResourceInfo(AIDopenData);
... ... @@ -1017,9 +1017,11 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
1017 1017 }
1018 1018  
1019 1019 $rootScope.OpenAdamImageViewMain = function () {
1020   - $scope.DisableUI();
  1020 +
1021 1021 if ($rootScope.isCallFromOtherModule) {
1022 1022 $scope.AIModuleData = ModuleService.getModuleData("ADAM_IMAGES");
  1023 + if($scope.AIModuleData.length<1) return;
  1024 + $scope.DisableUI();
1023 1025 $scope.readyToLoad = true;
1024 1026 $rootScope.AIWindowLoadComplete = false;
1025 1027 $scope.wincount = 1;
... ... @@ -1042,6 +1044,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
1042 1044 if ($scope.wincount == winlen && $rootScope.AIWindowLoadComplete == true) {
1043 1045 $scope.stopInterval();
1044 1046 $scope.$emit("LoadModuleComplete", "ADAM_IMAGES");
  1047 +
1045 1048 }
1046 1049  
1047 1050  
... ... @@ -1057,6 +1060,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
1057 1060  
1058 1061 }
1059 1062 else {
  1063 + $scope.DisableUI();
1060 1064 $scope.OpenAdamImageView(null);
1061 1065 }
1062 1066 }
... ... @@ -1161,10 +1165,12 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
1161 1165 if ($scope.aiOpenInOtherModules.position.x < 20)
1162 1166 $scope.jsPanelLeft = 20;
1163 1167 $scope.jsPanelTop = $scope.aiOpenInOtherModules.position.y;
  1168 + if ($scope.aiOpenInOtherModules.position.y < 35)
  1169 + $scope.jsPanelTop = 35;
1164 1170  
1165 1171 if($location.url()!= "/curriculum-builder-detail") {
1166   - $scope.jsPanelLeft = 1;
1167   - $scope.jsPanelTop = $rootScope.cBModulejsPanelTop();
  1172 + $scope.jsPanelLeft = 20;
  1173 + $scope.jsPanelTop = 100;
1168 1174 }
1169 1175 }
1170 1176 else {
... ... @@ -1201,6 +1207,9 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
1201 1207 height: $scope.jsPanelHeight
1202 1208 },
1203 1209 onminimized:function (panel) {
  1210 + var pnlName=panel[0].id;
  1211 + var len = (pnlName).split("_").length;
  1212 + var windowviewid = (pnlName).split("_")[len - 1];
1204 1213 var isAutoCalled = $scope.GetAIwindowStoreData(windowviewid, 'minmaxAutoEvent');
1205 1214 if(!isAutoCalled)
1206 1215 {
... ... @@ -1210,6 +1219,9 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
1210 1219 $scope.SetAIwindowStoreData(windowviewid, 'maximised',false);
1211 1220 },
1212 1221 onmaximized:function (panel) {
  1222 + var pnlName=panel[0].id;
  1223 + var len = (pnlName).split("_").length;
  1224 + var windowviewid = (pnlName).split("_")[len - 1];
1213 1225 var isAutoCalled = $scope.GetAIwindowStoreData(windowviewid, 'minmaxAutoEvent');
1214 1226 if(!isAutoCalled)
1215 1227 {
... ... @@ -1219,9 +1231,13 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
1219 1231 $scope.SetAIwindowStoreData(windowviewid, 'minimised',false);
1220 1232 var canvasDIvHeight = $('#aiImagePanel_' + windowviewid+ " .jsPanel-content").height();
1221 1233 $('#canvasDivAI_' + windowviewid).css('height', canvasDIvHeight-5);
  1234 + $rootScope.resetMenuOptionOnClick(pnlName);
1222 1235  
1223 1236 },
1224 1237 onnormalized:function (panel) {
  1238 + var pnlName=panel[0].id;
  1239 + var len = (pnlName).split("_").length;
  1240 + var windowviewid = (pnlName).split("_")[len - 1];
1225 1241 var isAutoCalled = $scope.GetAIwindowStoreData(windowviewid, 'minmaxAutoEvent');
1226 1242 if(!isAutoCalled)
1227 1243 {
... ... @@ -1231,26 +1247,33 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
1231 1247 $scope.SetAIwindowStoreData(windowviewid, 'maximised',false);
1232 1248 var canvasDIvHeight = $('#aiImagePanel_' + windowviewid+ " .jsPanel-content").height();
1233 1249 $('#canvasDivAI_' + windowviewid).css('height', canvasDIvHeight-5);
  1250 + $rootScope.resetMenuOptionOnClick(pnlName);
1234 1251 },
1235 1252 resizable: {
1236 1253 stop: function (event, ui) {
1237   - var len = (event.currentTarget.id).split("_").length;
1238   - var windowviewid = (event.currentTarget.id).split("_")[len - 1];
  1254 + var pnlName=event.currentTarget.id;
  1255 + var len = (pnlName).split("_").length;
  1256 + var windowviewid = (pnlName).split("_")[len - 1];
1239 1257 $scope.SetAIwindowStoreData(windowviewid, 'width', ui.size.width);
1240 1258 $scope.SetAIwindowStoreData(windowviewid, 'height', ui.size.height);
  1259 + $scope.SetAIwindowStoreData(windowviewid, 'y', ui.position.top);
  1260 + $scope.SetAIwindowStoreData(windowviewid, 'x', ui.position.left);
1241 1261 $rootScope.UnsaveCurriculum = true;
1242 1262 var canvasDIvHeight = $('#aiImagePanel_' + windowviewid+ " .jsPanel-content").height();
1243 1263 $('#canvasDivAI_' + windowviewid).css('height', canvasDIvHeight-5);
  1264 + $rootScope.resetMenuOptionOnClick(pnlName);
1244 1265 }
1245 1266  
1246 1267 },
1247 1268 draggable: {
1248 1269 stop: function( event, ui ) {
1249   - var len = (event.currentTarget.id).split("_").length;
1250   - var windowviewid = (event.currentTarget.id).split("_")[len - 1];
  1270 + var pnlName=event.currentTarget.id;
  1271 + var len = (pnlName).split("_").length;
  1272 + var windowviewid = (pnlName).split("_")[len - 1];
1251 1273 $scope.SetAIwindowStoreData(windowviewid, 'y', ui.position.top);
1252 1274 $scope.SetAIwindowStoreData(windowviewid, 'x', ui.position.left);
1253 1275 $rootScope.UnsaveCurriculum = true;
  1276 + $rootScope.resetMenuOptionOnClick(pnlName);
1254 1277 }
1255 1278 },
1256 1279  
... ... @@ -1289,18 +1312,27 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
1289 1312  
1290 1313 var canvas = document.getElementById("canvasAI_" + windowviewid);
1291 1314 var canvasPaint = document.getElementById("canvasPaintAI_" + windowviewid);
1292   -
1293   - canvas.height = canvasDIvHeight-30;
1294   - canvasPaint.height = canvasDIvHeight-30;
  1315 +
1295 1316 var $ua = navigator.userAgent;
1296 1317 if (($ua.match(/(iPod|iPhone|iPad|android)/i))) {
1297 1318 canvas.width = screen.width-20;
1298 1319 canvasPaint.width = screen.width-20;
  1320 + canvas.height = screen.height-130;
  1321 + canvasPaint.height = screen.height-130;
1299 1322 }
1300 1323 else
1301   - {
  1324 + {
  1325 + canvas.height = screen.height-280;
  1326 + canvasPaint.height = screen.height-280;
1302 1327 canvas.width = screen.width-40;
1303 1328 canvasPaint.width = screen.width-40;
  1329 + if($location.url()== "/curriculum-builder-detail") {
  1330 + canvas.height = screen.height-300;
  1331 + canvasPaint.height = screen.height-300;
  1332 + canvas.width = screen.width-370;
  1333 + canvasPaint.width = screen.width-370;
  1334 + }
  1335 +
1304 1336 }
1305 1337  
1306 1338 $scope.SetAIwindowStoreData(windowviewid, 'currentSlug', 'adam-images-detail');
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/AODController.js
  View file @ffd462c
... ... @@ -238,7 +238,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
238 238 var $el = $('<div id="' + value._ImageId + '" class="col-sm-3 col-lg-2" title = "'+ value._Title + '" data-ng-click="openView($event)">'
239 239 + '<div class="thumbnail" ><a href="#">'
240 240 + '<img id="' + value._Title + '" class="img-responsive" style="width:100%;height:100%;" ng-src="' + imagePath + '" alt="" title="" >'
241   - + '<div class="caption" style="padding:0px;height:80px"><p style="height:15px"><em>'+'ID: '+ value._ImageId + '</em></p><p style="font-weight:bold;white-space:pre-wrap">' + value._Title + '</p></div></a></div></div>').appendTo('#grid-view');
  241 + + '<div class="caption" style="padding:0px;height:80px"><p style="height:15px"><em>'+'ID: '+ value._ImageId + '</em></p><p style="white-space:pre-wrap;height:60px">' + value._Title + '</p></div></a></div></div>').appendTo('#grid-view');
242 242  
243 243 $compile($el)($scope);
244 244  
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
  View file @ffd462c
... ... @@ -114,15 +114,15 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
114 114 }
115 115 }
116 116  
117   - $rootScope.GetCAWindowId = function () {
118   - // handle for single window
119   - if ($rootScope.CAWindowData.length > 0) {
120   - for (var x = 0 ; x < $rootScope.CAWindowData.length; x++) {
  117 + // access from home controller
  118 + $rootScope.SetCAwindowData=function(windowviewid,keyname,data) {
  119 + for(var x=0 ;x < $rootScope.CAWindowData.length;x++){
121 120  
122   - return $rootScope.CAWindowData[x].multiwinid;
  121 + if($rootScope.CAWindowData[x].multiwinid==windowviewid)
  122 + {
  123 + $rootScope.CAWindowData[x][keyname]=data;
123 124 }
124 125 }
125   - else return 0;
126 126 }
127 127  
128 128 $scope.DisableUI = function () {
... ... @@ -695,8 +695,8 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
695 695 }
696 696 else
697 697 {
698   - $('#grid-view').css({"height":"720","overflow":"scroll"});
699   - $('#ListViewDiv').css({"height":"480","overflow":"scroll"});
  698 + $('#grid-view').css({"height":"696","overflow":"scroll"});
  699 + $('#ListViewDiv').css({"height":"460","overflow":"scroll"});
700 700 }
701 701 }
702 702 $scope.scroll = function () {
... ... @@ -732,7 +732,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
732 732 "textVisible": true,
733 733 "windowTitle": $rootScope.ViewTitle,
734 734 "size": { height: 600, width: 900 },
735   - "position": { x: 300, y: 110 }
  735 + "position": { x: 10, y: 30 }
736 736 };
737 737  
738 738 window.parent.AIAModuleOpenResourceInfo(CADopenData);
... ... @@ -783,9 +783,11 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
783 783 }
784 784  
785 785 $rootScope.openCABodyViewMain = function () {
786   - $scope.DisableUI();
  786 +
787 787 if ($rootScope.isCallFromOtherModule) {
788 788 $scope.CAModuleData = ModuleService.getModuleData("CLINICAL_ANIMATIONS");
  789 + if($scope.CAModuleData.length<1) return;
  790 + $scope.DisableUI();
789 791 $scope.readyToLoad = true;
790 792 $rootScope.CAWindowLoadComplete = false;
791 793 $scope.wincount = 1;
... ... @@ -823,6 +825,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
823 825  
824 826 }
825 827 else {
  828 + $scope.DisableUI();
826 829 $scope.openBodyView(null);
827 830 }
828 831 }
... ... @@ -960,15 +963,17 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
960 963 if ($scope.caOpenInOtherModules.size.height < 510)
961 964 $scope.jsPanelHeight = 510;
962 965  
963   - $scope.jsPanelLeft = $scope.caOpenInOtherModules.position.x;
964   - if ($scope.caOpenInOtherModules.position.x < 20)
965   - $scope.jsPanelLeft = 20;
966   - $scope.jsPanelTop = $scope.caOpenInOtherModules.position.y;
967   -
968   - if($location.url()!= "/curriculum-builder-detail") {
969   - $scope.jsPanelLeft = 1;
970   - $scope.jsPanelTop = $rootScope.cBModulejsPanelTop();
971   - }
  966 + $scope.jsPanelLeft = $scope.caOpenInOtherModules.position.x;
  967 + if ($scope.caOpenInOtherModules.position.x < 20)
  968 + $scope.jsPanelLeft = 20;
  969 + $scope.jsPanelTop = $scope.caOpenInOtherModules.position.y;
  970 + if ($scope.caOpenInOtherModules.position.y < 35)
  971 + $scope.jsPanelTop = 35;
  972 +
  973 + if($location.url()!= "/curriculum-builder-detail") {
  974 + $scope.jsPanelLeft = 20;
  975 + $scope.jsPanelTop = 100;
  976 + }
972 977 }
973 978  
974 979 }
... ... @@ -1016,6 +1021,9 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
1016 1021 height: $scope.jsPanelHeight
1017 1022 },
1018 1023 onminimized:function (panel) {
  1024 + var pnlName=panel[0].id;
  1025 + var len = (pnlName).split("_").length;
  1026 + var windowviewid = (pnlName).split("_")[len - 1];
1019 1027 var isAutoCalled = $scope.GetCAwindowStoreData(windowviewid, 'minmaxAutoEvent');
1020 1028 if(!isAutoCalled)
1021 1029 {
... ... @@ -1025,6 +1033,9 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
1025 1033 $scope.SetCAwindowStoreData(windowviewid, 'maximised',false);
1026 1034 },
1027 1035 onmaximized:function (panel) {
  1036 + var pnlName=panel[0].id;
  1037 + var len = (pnlName).split("_").length;
  1038 + var windowviewid = (pnlName).split("_")[len - 1];
1028 1039 var isAutoCalled = $scope.GetCAwindowStoreData(windowviewid, 'minmaxAutoEvent');
1029 1040 if(!isAutoCalled)
1030 1041 {
... ... @@ -1034,6 +1045,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
1034 1045 $scope.SetCAwindowStoreData(windowviewid, 'minimised',false);
1035 1046 var canvasDIvHeight = $('#caImagePanel_' + windowviewid+ " .jsPanel-content").height();
1036 1047 $('#playerinlineVideo_'+ windowviewid ).css("height",canvasDIvHeight-120 );
  1048 + $rootScope.resetMenuOptionOnClick(pnlName);
1037 1049 },
1038 1050 onnormalized:function (panel) {
1039 1051 var isAutoCalled = $scope.GetCAwindowStoreData(windowviewid, 'minmaxAutoEvent');
... ... @@ -1045,26 +1057,33 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
1045 1057 $scope.SetCAwindowStoreData(windowviewid, 'maximised',false);
1046 1058 var canvasDIvHeight = $('#caImagePanel_' + windowviewid+ " .jsPanel-content").height();
1047 1059 $('#playerinlineVideo_'+ windowviewid ).css("height",canvasDIvHeight-120 );
  1060 + $rootScope.resetMenuOptionOnClick(pnlName);
1048 1061 },
1049 1062 resizable: {
1050 1063 stop: function (event, ui) {
1051   - var len = (event.currentTarget.id).split("_").length;
1052   - var windowviewid = (event.currentTarget.id).split("_")[len - 1];
  1064 + var pnlName=event.currentTarget.id;
  1065 + var len = (pnlName).split("_").length;
  1066 + var windowviewid = (pnlName).split("_")[len - 1];
1053 1067 $scope.SetCAwindowStoreData(windowviewid, 'width', ui.size.width);
1054 1068 $scope.SetCAwindowStoreData(windowviewid, 'height', ui.size.height);
  1069 + $scope.SetCAwindowStoreData(windowviewid, 'y', ui.position.top);
  1070 + $scope.SetCAwindowStoreData(windowviewid, 'x', ui.position.left);
1055 1071 $rootScope.UnsaveCurriculum = true;
1056 1072 var canvasDIvHeight = $('#caImagePanel_' + windowviewid+ " .jsPanel-content").height();
1057 1073 $('#playerinlineVideo_'+ windowviewid ).css("height",canvasDIvHeight-120 );
  1074 + $rootScope.resetMenuOptionOnClick(pnlName);
1058 1075 }
1059 1076  
1060 1077 },
1061 1078 draggable: {
1062 1079 stop: function( event, ui ) {
1063   - var len = (event.currentTarget.id).split("_").length;
1064   - var windowviewid = (event.currentTarget.id).split("_")[len - 1];
  1080 + var pnlName=event.currentTarget.id;
  1081 + var len = (pnlName).split("_").length;
  1082 + var windowviewid = (pnlName).split("_")[len - 1];
1065 1083 $scope.SetCAwindowStoreData(windowviewid, 'y', ui.position.top);
1066 1084 $scope.SetCAwindowStoreData(windowviewid, 'x', ui.position.left);
1067 1085 $rootScope.UnsaveCurriculum = true;
  1086 + $rootScope.resetMenuOptionOnClick(pnlName);
1068 1087 }
1069 1088 },
1070 1089  
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
  View file @ffd462c
... ... @@ -715,7 +715,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
715 715 }
716 716 else
717 717 {
718   - $('#grid-view').css({"height":"720","overflow":"scroll"});
  718 + $('#grid-view').css({"height":"696","overflow":"scroll"});
719 719 $('#ListViewDiv').css({"height":"480","overflow":"scroll"});
720 720 }
721 721 }
... ... @@ -753,8 +753,8 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
753 753 "mType": 'CLINICAL_ILLUSTRATIONS',
754 754 "textVisible": true,
755 755 "windowTitle": $rootScope.ViewTitle,
756   - "size": { height: 500, width: 900 },
757   - "position": { x: 300, y: 110 }
  756 + "size": { height: 600, width: 900 },
  757 + "position": { x: 10, y: 30 }
758 758 };
759 759  
760 760 window.parent.AIAModuleOpenResourceInfo(CIDopenData);
... ... @@ -796,9 +796,10 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
796 796 }
797 797  
798 798 $rootScope.openCIBodyViewMain = function () {
799   - $scope.DisableUI();
800 799 if ($rootScope.isCallFromOtherModule) {
801 800 $scope.CIModuleData = ModuleService.getModuleData("CLINICAL_ILLUSTRATIONS");
  801 + if($scope.CIModuleData.length<1) return;
  802 + $scope.DisableUI();
802 803 $scope.readyToLoad = true;
803 804 $rootScope.CIWindowLoadComplete = false;
804 805 $scope.wincount = 1;
... ... @@ -836,6 +837,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
836 837  
837 838 }
838 839 else {
  840 + $scope.DisableUI();
839 841 $scope.openBodyView(null);
840 842 }
841 843 }
... ... @@ -944,15 +946,17 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
944 946 if ($scope.ciOpenInOtherModules.size.height < 540)
945 947 $scope.jsPanelHeight = 540;
946 948  
947   - $scope.jsPanelLeft = $scope.ciOpenInOtherModules.position.x;
948   - if ($scope.ciOpenInOtherModules.position.x < 20)
949   - $scope.jsPanelLeft = 20;
950   - $scope.jsPanelTop = $scope.ciOpenInOtherModules.position.y;
951   -
952   - if($location.url()!= "/curriculum-builder-detail") {
953   - $scope.jsPanelLeft = 1;
954   - $scope.jsPanelTop = $rootScope.cBModulejsPanelTop();
955   - }
  949 + $scope.jsPanelLeft = $scope.ciOpenInOtherModules.position.x;
  950 + if ($scope.ciOpenInOtherModules.position.x < 20)
  951 + $scope.jsPanelLeft = 20;
  952 + $scope.jsPanelTop = $scope.ciOpenInOtherModules.position.y;
  953 + if ($scope.ciOpenInOtherModules.position.y < 35)
  954 + $scope.jsPanelTop = 35;
  955 +
  956 + if($location.url()!= "/curriculum-builder-detail") {
  957 + $scope.jsPanelLeft = 20;
  958 + $scope.jsPanelTop = 100;
  959 + }
956 960  
957 961 }
958 962 else {
... ... @@ -974,7 +978,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
974 978 '<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 979 //'<div class="col-sm-12 img-thumbnail" align="center">' +
976 980 '<img id="ciimage_' + windowviewid + '" alt="" title="" style="left:0px;top:0px;position:absolute;visibility:hidden">' +
977   - '<div id="summary_' + windowviewid + '" class="col-sm-12 well img-subtitle" style="position:absolute;bottom:0px;margin-bottom:0px;padding:5px;width:99%">' +
  981 + '<div id="summary_' + windowviewid + '" class="col-sm-12 well img-subtitle" style="position:absolute;margin-bottom:0px;padding:5px;width:99%">' +
978 982 '<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 983 '<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 984 '</div>'+
... ... @@ -990,6 +994,9 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
990 994 height: $scope.jsPanelHeight
991 995 },
992 996 onminimized:function (panel) {
  997 + var pnlName=panel[0].id;
  998 + var len = (pnlName).split("_").length;
  999 + var windowviewid = (pnlName).split("_")[len - 1];
993 1000 var isAutoCalled = $scope.GetCIwindowStoreData(windowviewid, 'minmaxAutoEvent');
994 1001 if(!isAutoCalled)
995 1002 {
... ... @@ -999,6 +1006,9 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
999 1006 $scope.SetCIwindowStoreData(windowviewid, 'maximised',false);
1000 1007 },
1001 1008 onmaximized:function (panel) {
  1009 + var pnlName=panel[0].id;
  1010 + var len = (pnlName).split("_").length;
  1011 + var windowviewid = (pnlName).split("_")[len - 1];
1002 1012 var isAutoCalled = $scope.GetCIwindowStoreData(windowviewid, 'minmaxAutoEvent');
1003 1013 if(!isAutoCalled)
1004 1014 {
... ... @@ -1008,8 +1018,13 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
1008 1018 $scope.SetCIwindowStoreData(windowviewid, 'minimised',false);
1009 1019 var canvasDIvHeight = $('#ciImagePanel_' + windowviewid+ " .jsPanel-content").height();
1010 1020 $('#canvasDivCI_' + windowviewid).css('height', canvasDIvHeight);
  1021 + $rootScope.resetMenuOptionOnClick(pnlName);
  1022 +
1011 1023 },
1012 1024 onnormalized:function (panel) {
  1025 + var pnlName=panel[0].id;
  1026 + var len = (pnlName).split("_").length;
  1027 + var windowviewid = (pnlName).split("_")[len - 1];
1013 1028 var isAutoCalled = $scope.GetCIwindowStoreData(windowviewid, 'minmaxAutoEvent');
1014 1029 if(!isAutoCalled)
1015 1030 {
... ... @@ -1019,13 +1034,17 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
1019 1034 $scope.SetCIwindowStoreData(windowviewid, 'maximised',false);
1020 1035 var canvasDIvHeight = $('#ciImagePanel_' + windowviewid+ " .jsPanel-content").height();
1021 1036 $('#canvasDivCI_' + windowviewid).css('height', canvasDIvHeight);
  1037 + $rootScope.resetMenuOptionOnClick(pnlName);
1022 1038 },
1023 1039 resizable: {
1024 1040 stop: function (event, ui) {
1025   - var len = (event.currentTarget.id).split("_").length;
1026   - var windowviewid = (event.currentTarget.id).split("_")[len - 1];
  1041 + var pnlName=event.currentTarget.id;
  1042 + var len = (pnlName).split("_").length;
  1043 + var windowviewid = (pnlName).split("_")[len - 1];
1027 1044 $scope.SetCIwindowStoreData(windowviewid, 'width', ui.size.width);
1028 1045 $scope.SetCIwindowStoreData(windowviewid, 'height', ui.size.height);
  1046 + $scope.SetCIwindowStoreData(windowviewid, 'y', ui.position.top);
  1047 + $scope.SetCIwindowStoreData(windowviewid, 'x', ui.position.left);
1029 1048 $rootScope.UnsaveCurriculum = true;
1030 1049 var canvasDIvHeight = $('#ciImagePanel_' + windowviewid+ " .jsPanel-content").height();
1031 1050 //annotation lost after resize paint canvas
... ... @@ -1038,6 +1057,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
1038 1057 // canvasPaint.width = canvasDIvWidth;
1039 1058  
1040 1059 $('#canvasDivCI_' + windowviewid).css('height', canvasDIvHeight);
  1060 + $rootScope.resetMenuOptionOnClick(pnlName);
1041 1061  
1042 1062  
1043 1063 }
... ... @@ -1045,11 +1065,13 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
1045 1065 },
1046 1066 draggable: {
1047 1067 stop: function( event, ui ) {
1048   - var len = (event.currentTarget.id).split("_").length;
1049   - var windowviewid = (event.currentTarget.id).split("_")[len - 1];
  1068 + var pnlName=event.currentTarget.id;
  1069 + var len = (pnlName).split("_").length;
  1070 + var windowviewid = (pnlName).split("_")[len - 1];
1050 1071 $scope.SetCIwindowStoreData(windowviewid, 'y', ui.position.top);
1051 1072 $scope.SetCIwindowStoreData(windowviewid, 'x', ui.position.left);
1052 1073 $rootScope.UnsaveCurriculum = true;
  1074 + $rootScope.resetMenuOptionOnClick(pnlName);
1053 1075 }
1054 1076 },
1055 1077  
... ... @@ -1075,36 +1097,51 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
1075 1097  
1076 1098  
1077 1099 $scope.SetCIwindowStoreData(windowviewid, 'currentSlug', 'clinical-illustrations-detail');
  1100 + var $ua = navigator.userAgent;
  1101 + if (($ua.match(/(iPod|iPhone|iPad|android)/i))) {
  1102 + $('#summary_' + windowviewid).css("top", screen.height-270);
  1103 + }
  1104 + else
  1105 + {
  1106 + $('#summary_' + windowviewid).css("top", screen.height-420);
  1107 + }
1078 1108 $timeout(function () {
1079 1109 var canvasDIvHeight = $('#ciImagePanel_' + windowviewid+ " .jsPanel-content").height();
1080 1110  
1081 1111 $('#canvasDivCI_' + windowviewid).css('height', canvasDIvHeight);
1082 1112  
1083   - if (!$rootScope.isCallFromOtherModule) {
1084   - $('#CIView').css("height", $(window).outerHeight() - 65);
1085   - $('#CIView').css("width", $(window).outerWidth() - 15);
1086   -
  1113 + if (!$rootScope.isCallFromOtherModule) {
  1114 + $('#CIView').css("height", $(window).innerHeight()-100);
  1115 + $('#CIView').css("width",$(window).innerWidth()-100);
  1116 + }
  1117 +
1087 1118 var canvas = document.getElementById("canvasCI_" + windowviewid);
1088 1119 var canvasPaint = document.getElementById("canvasPaintCI_" + windowviewid);
1089   - canvas.height = canvasDIvHeight-30;
1090   - canvasPaint.height = canvasDIvHeight-30;
1091   -
  1120 +
1092 1121 var $ua = navigator.userAgent;
1093 1122 if (($ua.match(/(iPod|iPhone|iPad|android)/i))) {
1094 1123 canvas.width = screen.width-20;
1095 1124 canvasPaint.width = screen.width-20;
  1125 + canvas.height = screen.height-270;
  1126 + canvasPaint.height = screen.height-270;
1096 1127 }
1097 1128 else
1098 1129 {
1099 1130 canvas.width = screen.width-40;
1100 1131 canvasPaint.width = screen.width-40;
  1132 + canvas.height = screen.height-400;
  1133 + canvasPaint.height = screen.height-400;
  1134 +
  1135 + if($location.url()== "/curriculum-builder-detail") {
  1136 + canvas.width = screen.width-370;
  1137 + canvasPaint.width = screen.width-370;
  1138 + }
  1139 +
1101 1140 }
1102 1141 if(screen.height<400)
1103 1142 {
1104 1143 $('#summary_' + windowviewid).css("bottom", "-220px");
1105 1144 }
1106   -
1107   - }
1108 1145  
1109 1146 var openedImage = document.getElementById('ciimage_' + windowviewid );
1110 1147 openedImage.src = selectedCIImage;
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js
  View file @ffd462c
... ... @@ -288,7 +288,6 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
288 288 }
289 289  
290 290 $rootScope.OpenExistingCurriculum = function (event) {
291   -
292 291 var fileupload = document.getElementById("openCBJsonFile");
293 292 $timeout(function () {
294 293 $(fileupload).trigger('click');
... ... @@ -299,21 +298,21 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
299 298 var extension='';
300 299 var fileId, file, objFileRead;
301 300 if (typeof window.FileReader !== 'function') {
302   - $rootScope.errorMessage = "The file API isn't supported on this browser yet.";
  301 + $('#errorMessage').text(AIAConstants.File_API_Not_Supported);
303 302 $("#messageModal").modal('show');
304 303 return;
305 304 }
306 305 fileId = document.getElementById('openCBJsonFile');
307 306 if (!fileId) {
308   - $rootScope.errorMessage = "File couldn't find the element.";
  307 + $('#errorMessage').text(AIAConstants.File_No_Content_Found);
309 308 $("#messageModal").modal('show');
310 309 }
311 310 else if (!fileId.files) {
312   - $rootScope.errorMessage = "This browser doesn't seem to support the `files` property of file inputs.";
  311 + $('#errorMessage').text(AIAConstants.Browser_Not_Supported);
313 312 $("#messageModal").modal('show');
314 313 }
315 314 else if (!fileId.files[0]) {
316   - $rootScope.errorMessage = "Please select a file before clicking 'Load'.";
  315 + $('#errorMessage').text(AIAConstants.Select_File);
317 316 $("#messageModal").modal('show');
318 317 }
319 318 else
... ... @@ -327,7 +326,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
327 326 }
328 327 else
329 328 {
330   - $rootScope.errorMessage = AIAConstants.CB_FILE_FORMAT_ISSUE;
  329 + $('#errorMessage').text(AIAConstants.CB_FILE_FORMAT_ISSUE);
331 330 $("#messageModal").modal('show');
332 331 }
333 332  
... ... @@ -454,21 +453,21 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
454 453 var myfileName='';
455 454 var fileId, file, objFileRead;
456 455 if (typeof window.FileReader !== 'function') {
457   - $rootScope.errorMessage = "The file API isn't supported on this browser yet.";
  456 + $('#errorMessage').text(AIAConstants.File_API_Not_Supported);
458 457 $("#messageModal").modal('show');
459 458 return;
460 459 }
461 460 fileId = document.getElementById('xmltojsonfile');
462 461 if (!fileId) {
463   - $rootScope.errorMessage = "File couldn't find the element.";
  462 + $('#errorMessage').text(AIAConstants.File_No_Content_Found);
464 463 $("#messageModal").modal('show');
465 464 }
466 465 else if (!fileId.files) {
467   - $rootScope.errorMessage = "This browser doesn't seem to support the `files` property of file inputs.";
  466 + $('#errorMessage').text(AIAConstants.Browser_Not_Supported);
468 467 $("#messageModal").modal('show');
469 468 }
470 469 else if (!fileId.files[0]) {
471   - $rootScope.errorMessage = "Please select a file before clicking 'Load'.";
  470 + $('#errorMessage').text(AIAConstants.Select_File);
472 471 $("#messageModal").modal('show');
473 472 }
474 473 else
... ... @@ -485,7 +484,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
485 484 }
486 485 else
487 486 {
488   - $rootScope.errorMessage = AIAConstants.CB_FILE_FORMAT_ISSUE;"";
  487 + $('#errorMessage').text(AIAConstants.CB_FILE_FORMAT_ISSUE);
489 488 $("#messageModal").modal('show');
490 489 }
491 490  
... ... @@ -525,19 +524,8 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
525 524  
526 525 $scope.convertDownLoad = function (curriculumobject,myfileName) {
527 526 var blob = new Blob([angular.toJson(curriculumobject, true)], { type: 'text/json' });
528   -
529   - // document.execCommand("SaveAs", true, myfileName);
530   -
531   - // var event = document.createEvent('MouseEvents'),
532   - // saveElement = document.createElement('a');
533   - // saveElement.download = myfileName;
534   - // saveElement.href = window.URL.createObjectURL(blob);
535   - // saveElement.dataset.downloadurl = ['text/json', saveElement.download, saveElement.href].join(':');
536   - // event.initEvent('click', true, false, window, 0, 0, 0, 0, 0, false, false, false, false, 0, null);
537   - // saveElement.dispatchEvent(event);
538   -
539 527 //save file saver handle for all browser
540   - saveAs(blob, filename);
  528 + saveAs(blob, myfileName);
541 529  
542 530 }
543 531 $scope.checkCompatibility = function (curriculumobject) {
... ... @@ -734,7 +722,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
734 722 title: $rootScope.cbTreeFirstLabel,
735 723  
736 724 position: {
737   - top: 10,
  725 + top: 5,
738 726 left: 10,
739 727 },
740 728 controls: { buttons: 'closeonly' },
... ... @@ -1203,16 +1191,16 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
1203 1191  
1204 1192 if (password.trim() == "")
1205 1193 {
1206   - $('#errorMsg').text('password required!');
  1194 + $('#errorMsg').text(AIAConstants.CB_Password_Required);
1207 1195 return;
1208 1196 }
1209 1197 if (confirm_password.trim() == "")
1210 1198 {
1211   - $('#errorMsg').text('confirm password required!');
  1199 + $('#errorMsg').text(AIAConstants.CB_Confirm_Password);
1212 1200 return;
1213 1201 }
1214 1202 if (password != confirm_password) {
1215   - $('#errorMsg').text('confirm password not matched!');
  1203 + $('#errorMsg').text(AIAConstants.CB_Confirm_Password_Not_Match);
1216 1204 return false;
1217 1205 }
1218 1206 $('#errorMsg').text('');
... ... @@ -1236,10 +1224,9 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
1236 1224 $scope.cbUnlockSlide = function () {
1237 1225 var nodeid = document.getElementById('cbSelect').value;
1238 1226 var password = $('#slidepass').val();
1239   -
1240 1227 if (password.trim() == "")
1241 1228 {
1242   - $rootScope.errorMessage = "Password field is empty.please try again!";
  1229 + $('#errorMessage').text(AIAConstants.CB_Password_Empty);
1243 1230 $("#messageModal").modal('show');
1244 1231 return;
1245 1232 }
... ... @@ -1250,7 +1237,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
1250 1237 traverseTreeSelectedSingleObj($rootScope.structureObjForSaveCB, nodeid);
1251 1238 if ($scope.selectedNodeSingleObj._isBranch == "false") {
1252 1239 if (password != $scope.selectedNodeSingleObj._password) {
1253   - $rootScope.errorMessage = "Password is not matched.please try again!";
  1240 + $('#errorMessage').text(AIAConstants.CB_Password_Not_Match);
1254 1241 $("#messageModal").modal('show');
1255 1242 return false;
1256 1243 }
... ... @@ -1443,21 +1430,21 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
1443 1430 var extension='';
1444 1431 var fileId, file, objFileRead;
1445 1432 if (typeof window.FileReader !== 'function') {
1446   - $rootScope.errorMessage = "The file API isn't supported on this browser yet.";
  1433 + $('#errorMessage').text(AIAConstants.File_API_Not_Supported);
1447 1434 $("#messageModal").modal('show');
1448 1435 return;
1449 1436 }
1450 1437 fileId = document.getElementById('openCBJsonFile');
1451 1438 if (!fileId) {
1452   - $rootScope.errorMessage = "File couldn't find the element.";
  1439 + $('#errorMessage').text(AIAConstants.File_No_Content_Found);
1453 1440 $("#messageModal").modal('show');
1454 1441 }
1455 1442 else if (!fileId.files) {
1456   - $rootScope.errorMessage = "This browser doesn't seem to support the `files` property of file inputs.";
  1443 + $('#errorMessage').text(AIAConstants.Browser_Not_Supported);
1457 1444 $("#messageModal").modal('show');
1458 1445 }
1459 1446 else if (!fileId.files[0]) {
1460   - $rootScope.errorMessage = "Please select a file before clicking 'Load'.";
  1447 + $('#errorMessage').text(AIAConstants.Select_File);
1461 1448 $("#messageModal").modal('show');
1462 1449 }
1463 1450 else {
... ... @@ -1472,7 +1459,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
1472 1459 }
1473 1460 else
1474 1461 {
1475   - $rootScope.errorMessage = AIAConstants.CB_FILE_FORMAT_ISSUE;
  1462 + $('#errorMessage').text(AIAConstants.CB_FILE_FORMAT_ISSUE);
1476 1463 $("#messageModal").modal('show');
1477 1464  
1478 1465 }
... ... @@ -1608,8 +1595,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
1608 1595 }
1609 1596  
1610 1597 $rootScope.ExportSection = function () {
1611   - var currentid = document.getElementById('cbSelect').value;
1612   -
  1598 + var currentid = document.getElementById('cbSelect').value;
1613 1599 if ($rootScope.contentNotesForSaveCB.length == 0) {
1614 1600 $rootScope.contentNotesForSaveCB = $rootScope.cbDynamicContents;
1615 1601 }
... ... @@ -1620,7 +1606,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
1620 1606 var strFromParent=$scope.selectedNodeSingleObj['structure'];
1621 1607 if(strFromParent.length<=0)
1622 1608 {
1623   - $rootScope.errorMessage = "Please add slide first to export this section.";
  1609 + $('#errorMessage').text(AIAConstants.CB_Add_Slide_First);
1624 1610 $("#messageModal").modal('show');
1625 1611 return;
1626 1612 }
... ... @@ -1632,11 +1618,12 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
1632 1618 }
1633 1619  
1634 1620 $rootScope.ExportCurriculum =function()
1635   - {
  1621 + {
  1622 + $('#errorMessage').text("");
1636 1623 var filename = document.getElementById("filename").value;
1637 1624 if (filename == "" ||filename == " ")
1638 1625 {
1639   - $rootScope.errorMessage = "Curriculum name is empty!";
  1626 + $('#errorMessage').text(AIAConstants.CB_Curriculum_Name_Empty);
1640 1627 $("#messageModal").modal('show');
1641 1628 return;
1642 1629 }
... ... @@ -1713,7 +1700,8 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
1713 1700 }
1714 1701  
1715 1702 $scope.saveCBwithAnimation=function(downloadtype,filename)
1716   - {
  1703 + {
  1704 + $('#errorMessage').text("");
1717 1705 if($rootScope.collectAnimationSource.length>0)
1718 1706 {
1719 1707 $rootScope.loadingAnimationstatus=1;
... ... @@ -1757,7 +1745,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
1757 1745 $rootScope.dynamicUpdatedJsonForSaveCB = "";
1758 1746 $('#uploading-curriculum').css("display", "none");
1759 1747 $("#filename").val("");
1760   - $rootScope.errorMessage = AIAConstants.SAVE_ANIMATION_ERROR+"\n"+error.ExceptionMessage;;
  1748 + $('#errorMessage').text(AIAConstants.SAVE_ANIMATION_ERROR+"\n"+error.ExceptionMessage);
1761 1749 $("#messageModal").modal('show');
1762 1750 },
1763 1751 function(progress){
... ... @@ -1787,17 +1775,6 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
1787 1775 $rootScope.UnsaveCurriculum = false;
1788 1776 var blob = new Blob([angular.toJson($rootScope.dynamicUpdatedJsonForSaveCB, true)], { type: 'text/json' });
1789 1777 }
1790   -
1791   - // document.execCommand("SaveAs", true, filename);
1792   -
1793   - // var event = document.createEvent('MouseEvents'),
1794   - // saveElement = document.createElement('a');
1795   - // saveElement.download = filename;
1796   - // saveElement.href = window.URL.createObjectURL(blob);
1797   - // saveElement.dataset.downloadurl = ['text/json', saveElement.download, saveElement.href].join(':');
1798   - // event.initEvent('click', true, false, window, 0, 0, 0, 0, 0, false, false, false, false, 0, null);
1799   - // saveElement.dispatchEvent(event);
1800   -
1801 1778 //save file saver handle for all browser
1802 1779 saveAs(blob, filename);
1803 1780  
... ... @@ -2224,10 +2201,11 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
2224 2201 }
2225 2202  
2226 2203 $rootScope.saveMyCurricullam = function () {
  2204 + $('#errorMessage').text("");
2227 2205 var filename = document.getElementById("filename").value;
2228 2206 if (filename == "" ||filename == " ")
2229 2207 {
2230   - $rootScope.errorMessage = "Curriculum name is empty!";
  2208 + $('#errorMessage').text(AIAConstants.CB_Curriculum_Name_Empty);
2231 2209 $("#messageModal").modal('show');
2232 2210 return;
2233 2211 }
... ... @@ -2404,7 +2382,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
2404 2382  
2405 2383  
2406 2384 $scope.loadContentOfSelectedSlide = function (id) {
2407   - console.log("id= " + id)
  2385 + $('#errorMessage').text("");
2408 2386 if ($rootScope.contentNotesForSaveCB.length == 0) {
2409 2387 $rootScope.contentNotesForSaveCB = $rootScope.cbDynamicContents;
2410 2388 }
... ... @@ -2446,7 +2424,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
2446 2424 if (!annotation.hasOwnProperty(shapeStates) || !annotation.hasOwnProperty(paintCanvasState))
2447 2425 {
2448 2426 $rootScope.UnsaveCurriculum = true;
2449   - $rootScope.errorMessage =AIAConstants.CB_OLD_SLIDE_ANNOTATION_ISSUE;
  2427 + $('#errorMessage').text(AIAConstants.CB_OLD_SLIDE_ANNOTATION_ISSUE);
2450 2428 $("#messageModal").modal('show');
2451 2429 windowData.annotationData="";
2452 2430 }
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @ffd462c
... ... @@ -516,7 +516,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
516 516 "windowTitle": $event.currentTarget.textContent,
517 517 "zoom": 75,
518 518 "size":{height:600,width:900},
519   - "position": { x: 300, y: 110 },
  519 + "position": { x: 10, y: 30 },
520 520 "mType": 'DISSECTIBLE_ANATOMY',
521 521 "isModestyOn":userModestysettings,
522 522 "skinId": userEthnicity,
... ... @@ -665,11 +665,12 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
665 665  
666 666 }
667 667  
668   - $rootScope.openDABodyViewMain = function () {
669   - $scope.ScopeVariablesDeclare();
670   - $scope.DisableUI();
  668 + $rootScope.openDABodyViewMain = function () {
671 669 if ($rootScope.isCallFromOtherModule) {
672 670 $scope.DAModuleData = ModuleService.getModuleData("DISSECTIBLE_ANATOMY");
  671 + if($scope.DAModuleData.length<1) return;
  672 + $scope.ScopeVariablesDeclare();
  673 + $scope.DisableUI();
673 674 $scope.readyToLoad=true;
674 675 $rootScope.DAWindowLoadComplete = false;
675 676 $scope.wincount=1;
... ... @@ -712,6 +713,8 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
712 713  
713 714 }
714 715 else {
  716 + $scope.ScopeVariablesDeclare();
  717 + $scope.DisableUI();
715 718 $scope.openBodyView(null);
716 719 }
717 720  
... ... @@ -736,7 +739,6 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
736 739 $scope.SetwindowStoreData(windowviewid,'currentViewTitle',$scope.daOpenInOtherModules.windowTitle);
737 740 localStorage.setItem("currentViewTitle", $scope.daOpenInOtherModules.windowTitle);
738 741 $scope.jsPanelID = 'daImagePanel' + '_' + windowviewid;
739   - $scope.viewID = 'daViewDA_' + windowviewid;
740 742 console.log('$location.url = ' + $location.url())
741 743  
742 744 var skinValue=$scope.daOpenInOtherModules.skinId;
... ... @@ -838,7 +840,6 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
838 840 $scope.SetwindowStoreData(windowviewid, 'voId', $rootScope.getLocalStorageValue("currentBodyViewId"));
839 841  
840 842 $scope.jsPanelID = 'daImagePanel' + '_' + windowviewid;
841   - $scope.viewID = 'daViewDA' + '_' + windowviewid;
842 843 $scope.SetwindowStoreData(windowviewid, 'parentSlugName', 'da-view-list');
843 844  
844 845 $scope.loadTermData(windowviewid);
... ... @@ -938,10 +939,12 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
938 939 if ($scope.daOpenInOtherModules.position.x < 20)
939 940 $scope.jsPanelLeft = 20;
940 941 $scope.jsPanelTop = $scope.daOpenInOtherModules.position.y;
941   -
  942 + if ($scope.daOpenInOtherModules.position.y < 35)
  943 + $scope.jsPanelTop = 35;
  944 +
942 945 if($location.url()!= "/curriculum-builder-detail") {
943   - $scope.jsPanelLeft = 1;
944   - $scope.jsPanelTop = $rootScope.cBModulejsPanelTop();
  946 + $scope.jsPanelLeft = 20;
  947 + $scope.jsPanelTop = 100;
945 948 }
946 949 }
947 950  
... ... @@ -974,6 +977,9 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
974 977 height: $scope.jsPanelHeight
975 978 },
976 979 onminimized:function (panel) {
  980 + var pnlName=panel[0].id;
  981 + var len = (pnlName).split("_").length;
  982 + var windowviewid = (pnlName).split("_")[len - 1];
977 983 var isAutoCalled = $scope.GetwindowStoreData(windowviewid, 'minmaxAutoEvent');
978 984 if(!isAutoCalled)
979 985 {
... ... @@ -983,6 +989,9 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
983 989 $scope.SetwindowStoreData(windowviewid, 'maximised',false);
984 990 },
985 991 onmaximized:function (panel) {
  992 + var pnlName=panel[0].id;
  993 + var len = (pnlName).split("_").length;
  994 + var windowviewid = (pnlName).split("_")[len - 1];
986 995 var isAutoCalled = $scope.GetwindowStoreData(windowviewid, 'minmaxAutoEvent');
987 996 if(!isAutoCalled)
988 997 {
... ... @@ -993,39 +1002,57 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
993 1002 var canvasDIvHeight = $('#daImagePanel_' + windowviewid+ " .jsPanel-content").height()-50;
994 1003  
995 1004 $('#canvasDivDA_' + windowviewid).css('height', canvasDIvHeight);
  1005 + $rootScope.resetMenuOptionOnClick(pnlName);
996 1006 },
997 1007 onnormalized:function (panel) {
998   - var isAutoCalled = $scope.GetwindowStoreData(windowviewid, 'minmaxAutoEvent');
999   - if(!isAutoCalled)
1000   - {
1001   - $rootScope.UnsaveCurriculum = true;
1002   - }
1003   - $scope.SetwindowStoreData(windowviewid, 'minimised',false);
1004   - $scope.SetwindowStoreData(windowviewid, 'maximised',false);
1005   - var canvasDIvHeight = $('#daImagePanel_' + windowviewid+ " .jsPanel-content").height()-50;
1006   -
1007   - $('#canvasDivDA_' + windowviewid).css('height', canvasDIvHeight);
  1008 + var pnlName=panel[0].id;
  1009 + var len = (pnlName).split("_").length;
  1010 + var windowviewid = (pnlName).split("_")[len - 1];
  1011 + var isAutoCalled = $scope.GetwindowStoreData(windowviewid, 'minmaxAutoEvent');
  1012 + if(!isAutoCalled)
  1013 + {
  1014 + $rootScope.UnsaveCurriculum = true;
  1015 + }
  1016 + $scope.SetwindowStoreData(windowviewid, 'minimised',false);
  1017 + $scope.SetwindowStoreData(windowviewid, 'maximised',false);
  1018 + var canvasDIvHeight = $('#daImagePanel_' + windowviewid+ " .jsPanel-content").height()-50;
  1019 +
  1020 + $('#canvasDivDA_' + windowviewid).css('height', canvasDIvHeight);
  1021 + $rootScope.resetMenuOptionOnClick(pnlName);
  1022 +
1008 1023 },
1009 1024 resizable: {
1010 1025 stop: function (event, ui) {
1011   - var len = (event.currentTarget.id).split("_").length;
1012   - var windowviewid = (event.currentTarget.id).split("_")[len - 1];
  1026 + var pnlName=event.currentTarget.id;
  1027 + var len = (pnlName).split("_").length;
  1028 + var windowviewid = (pnlName).split("_")[len - 1];
1013 1029 $scope.SetwindowStoreData(windowviewid, 'width', ui.size.width);
1014 1030 $scope.SetwindowStoreData(windowviewid, 'height', ui.size.height);
  1031 + $scope.SetwindowStoreData(windowviewid, 'y', ui.position.top);
  1032 + $scope.SetwindowStoreData(windowviewid, 'x', ui.position.left);
1015 1033 $rootScope.UnsaveCurriculum = true;
1016 1034 var canvasDIvHeight = $('#daImagePanel_' + windowviewid+ " .jsPanel-content").height()-50;
1017 1035  
1018 1036 $('#canvasDivDA_' + windowviewid).css('height', canvasDIvHeight);
  1037 + $('#da-input_'+windowviewid).removeClass();
  1038 + if(ui.size.width<700)
  1039 + $('#da-input_'+windowviewid).addClass('input-group col-sm-6 col-xs-7 col-md-5 pull-left');
  1040 + else{
  1041 + $('#da-input_'+windowviewid).addClass('input-group col-sm-6 col-xs-7 col-md-7 pull-left');
  1042 + }
  1043 + $rootScope.resetMenuOptionOnClick(pnlName);
1019 1044 }
1020 1045  
1021 1046 },
1022 1047 draggable: {
1023 1048 stop: function( event, ui ) {
1024   - var len = (event.currentTarget.id).split("_").length;
1025   - var windowviewid = (event.currentTarget.id).split("_")[len - 1];
  1049 + var pnlName=event.currentTarget.id;
  1050 + var len = (pnlName).split("_").length;
  1051 + var windowviewid = (pnlName).split("_")[len - 1];
1026 1052 $scope.SetwindowStoreData(windowviewid, 'y', ui.position.top);
1027 1053 $scope.SetwindowStoreData(windowviewid, 'x', ui.position.left);
1028 1054 $rootScope.UnsaveCurriculum = true;
  1055 + $rootScope.resetMenuOptionOnClick(pnlName);
1029 1056 }
1030 1057 },
1031 1058  
... ... @@ -1076,7 +1103,6 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
1076 1103 $scope.dropdownMenu4ID = "dropdownMenu4";
1077 1104 $scope.genderChangeID = "genderChangeId";
1078 1105 $scope.structureDropdownID = "structureDropdown";
1079   - $scope.viewID = "daView";
1080 1106 $scope.viewChangeID = "viewChangeID";
1081 1107 $scope.btnStrutureBoxID = "btnStrutureBox";
1082 1108 $scope.typedTermNameID = "typedTermName";
... ... @@ -1320,8 +1346,8 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
1320 1346  
1321 1347 $scope.langSearchLoad= function(windowviewid)
1322 1348 {
1323   - $('#searchlangaugeDiv').empty();
1324   - $('#searchlangaugeDiv').css("display","none");
  1349 + $('#searchlangaugeDiv_'+windowviewid).empty();
  1350 + $('#searchlangaugeDiv_'+windowviewid).css("display","none");
1325 1351 var languageArray = $rootScope.lexiconLanguageArray;
1326 1352  
1327 1353 $("#btnDATermSearch_"+windowviewid).parent().css("margin-right", "10px");
... ... @@ -1329,12 +1355,12 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
1329 1355 if(languageArray.length>1)
1330 1356 {
1331 1357 $("#btnDATermSearch_"+windowviewid).parent().css("margin-right", "-10px");
1332   - $('#searchlangaugeDiv').css("display","block");
  1358 + $('#searchlangaugeDiv_'+windowviewid).css("display","block");
1333 1359 var option='';
1334 1360 for (var i = 0; i <= languageArray.length - 1; i++) {
1335 1361 option=option+'<option value="' + languageArray[i].id + '">' + languageArray[i].language + '</option>';
1336 1362 }
1337   - var $all = $('#searchlangaugeDiv').append(
  1363 + var $all = $('#searchlangaugeDiv_'+windowviewid).append(
1338 1364 '<div class="btn-group col-sm-3 col-xs-7 col-md-2" style="margin-right:-10px">'+
1339 1365 '<select class="form-control" id="searchLanguageLm_'+windowviewid+'" ng-blur="HideSearch()" onchange="changeSearchLanguage(event)" style="height:30px;padding:4px 12px">'+
1340 1366 option+
... ... @@ -1607,7 +1633,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
1607 1633 $("#closeTermList").attr("id", "closeTermList_" + windowviewid);
1608 1634 $("#selectLanguage").attr("id", "selectLanguage_" + windowviewid);
1609 1635 $("#totalTerms").attr("id", "totalTerms_" + windowviewid);
1610   -
  1636 + $("#searchlangaugeDiv").attr("id", "searchlangaugeDiv_" + windowviewid);
1611 1637  
1612 1638 // bodyview id
1613 1639 $("#Anterior").attr("id", "Anterior_" + windowviewid);
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @ffd462c
1 1 'use strict';
2 2  
3   -AIA.controller("HomeController", ["$rootScope", "$scope", "Modules", "$log", "$location", "$compile", "$timeout", "DataService", "AuthenticationService", "ConfigurationService", "LoginConstants", "UserModules", "LoginMessageConstants", "AdminService", "$http", "AdminConstants", "UserTypeConstants", "AIAConstants","ModuleService","$window","Idle", "Keepalive",
4   -function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, DataService, AuthenticationService, ConfigurationService, LoginConstants, UserModules, LoginMessageConstants, AdminService, $http, AdminConstants, UserTypeConstants, AIAConstants, ModuleService,$window,Idle, Keepalive) {
  3 +AIA.controller("HomeController", ["$rootScope", "$scope", "Modules", "$log", "$location", "$compile", "$timeout", "DataService", "AuthenticationService", "ConfigurationService", "LoginConstants", "UserModules", "LoginMessageConstants", "AdminService", "$http", "AdminConstants", "UserTypeConstants", "AIAConstants","ModuleService","$window","Idle", "Keepalive", "$interval",
  4 +function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, DataService, AuthenticationService, ConfigurationService, LoginConstants, UserModules, LoginMessageConstants, AdminService, $http, AdminConstants, UserTypeConstants, AIAConstants, ModuleService,$window,Idle, Keepalive, $interval) {
5 5  
6 6 $rootScope.MULTI_VIEW_ID = 401;
7 7 $rootScope.pageToOpen = 'app/widget/MainMenu.html';
... ... @@ -60,7 +60,6 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
60 60 $rootScope.shapestyleborderColor = "black";
61 61 $rootScope.shapestyleborderWidth = 3;
62 62 $rootScope.shapestyleborderStyles = "solid";
63   - //$rootScope.errorMessage = ''; // Commented initialization to retain message when coming to login after password reset success screen
64 63 $("#fileMenuAnchor").addClass("disableFileMenu");
65 64  
66 65 $rootScope.userLicenseInfo = {
... ... @@ -80,7 +79,6 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
80 79 $rootScope.OpenMyPicture = function () {
81 80 $rootScope.CloseListManager();
82 81 $rootScope.CloseAnnotationTool();
83   -
84 82 // close list if opened in DA
85 83 var searchedTermListPopUp = $("#HomeContainerDiv").find("div[id*='searchedTermListPopUp']");
86 84 for (var i = 0 ; i < searchedTermListPopUp.length; i++) {
... ... @@ -101,39 +99,40 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
101 99  
102 100 var fileId, file, objFileRead;
103 101 if (typeof window.FileReader !== 'function') {
104   - $rootScope.errorMessage = "The file API isn't supported on this browser yet.";
  102 + $('#errorMessage').text(AIAConstants.File_API_Not_Supported);
105 103 $("#messageModal").modal('show');
106 104 return;
107 105 }
108 106 fileId = document.getElementById('myPictureFile');
109 107 if (!fileId) {
110   - $rootScope.errorMessage = "File couldn't find the element.";
  108 + $('#errorMessage').text(AIAConstants.File_No_Content_Found);
111 109 $("#messageModal").modal('show');
112 110 }
113 111 else if (!fileId.files) {
114   - $rootScope.errorMessage = "This browser doesn't seem to support the `files` property of file inputs.";
  112 + $('#errorMessage').text(AIAConstants.Browser_Not_Supported);
115 113 $("#messageModal").modal('show');
116 114 }
117 115 else if (!fileId.files[0]) {
118   - $rootScope.errorMessage = "Please select a file before clicking 'Load'.";
  116 + $('#errorMessage').text(AIAConstants.Select_File);
119 117 $("#messageModal").modal('show');
120 118 }
121   - else {
  119 + else
  120 + {
122 121 file = fileId.files[0];
123   - var extension = file.name.split(".")[1];
124   - if (extension == "jpg" || extension == "jpeg" || extension == "png") {
125   -
  122 + var extensionType = (file.name.split(".")[1]).toUpperCase();
  123 + if (extensionType == "JPG" || extensionType == "JPEG" || extensionType == "PNG" ||file.type=="image/png"||file.type=="image/jpg"||file.type=="image/jpeg")
  124 + {
126 125 var reader = new FileReader();
127 126 reader.onloadend = function () {
128   -
129 127 //set default module data
130 128 var PicOpenData = {
131 129 "mType": 'MY_PICTURES',
132 130 "imageSource":reader.result,
133 131 "windowTitle": file.name.split(".")[0],
134   - "size": { height: 500, width: 800 },
135   - "position": { x: 300, y: 110 }
  132 + "size": { height: 600, width: 900 },
  133 + "position": { x: 10, y: 30 }
136 134 };
  135 +
137 136 AIAModuleOpenResourceInfo(PicOpenData);
138 137  
139 138 }
... ... @@ -143,8 +142,9 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
143 142 }
144 143 else
145 144 {
146   - $rootScope.errorMessage = "Please select a file format type jpg/jpeg or png.";
  145 + $('#errorMessage').text(AIAConstants.Image_File_Format_Not_Supported);
147 146 $("#messageModal").modal('show');
  147 + return;
148 148 }
149 149  
150 150 }
... ... @@ -155,7 +155,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
155 155 $rootScope.OpenMyAnimation = function () {
156 156 $rootScope.CloseListManager();
157 157 $rootScope.CloseAnnotationTool();
158   -
  158 +
159 159 // close list if opened in DA
160 160 var searchedTermListPopUp = $("#HomeContainerDiv").find("div[id*='searchedTermListPopUp']");
161 161 for (var i = 0 ; i < searchedTermListPopUp.length; i++) {
... ... @@ -173,29 +173,29 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
173 173 $(fileupload).val('');//old file path
174 174 fileupload.onchange = function (e) {
175 175  
176   - var fileId, file, objFileRead;
  176 + var fileId, file;
177 177 if (typeof window.FileReader !== 'function') {
178   - $rootScope.errorMessage = "The file API isn't supported on this browser yet.";
  178 + $('#errorMessage').text(AIAConstants.File_API_Not_Supported);
179 179 $("#messageModal").modal('show');
180 180 return;
181 181 }
182 182 fileId = document.getElementById('myAnimationFile');
183 183 if (!fileId) {
184   - $rootScope.errorMessage = "File couldn't find the element.";
  184 + $('#errorMessage').text(AIAConstants.File_No_Content_Found);
185 185 $("#messageModal").modal('show');
186 186 }
187 187 else if (!fileId.files) {
188   - $rootScope.errorMessage = "This browser doesn't seem to support the `files` property of file inputs.";
  188 + $('#errorMessage').text(AIAConstants.Browser_Not_Supported);
189 189 $("#messageModal").modal('show');
190 190 }
191 191 else if (!fileId.files[0]) {
192   - $rootScope.errorMessage = "Please select a file before clicking 'Load'.";
  192 + $('#errorMessage').text(AIAConstants.Select_File);
193 193 $("#messageModal").modal('show');
194 194 }
195 195 else {
196 196 file = fileId.files[0];
197   - var extension = file.name.split(".")[1];
198   - if (extension == "mp4" && file.type=="video/mp4") {
  197 + var extensionType = (file.name.split(".")[1]).toUpperCase();
  198 + if (extensionType == "MP4" || file.type=="video/mp4") {
199 199 if (file.size <= $rootScope.MaxOneFileSize) {
200 200 var reader = new FileReader();
201 201 reader.onloadend = function () {
... ... @@ -207,8 +207,8 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
207 207 "id":animationId,//user for identify resource until save or export cb
208 208 "videoSource":reader.result,
209 209 "windowTitle": file.name.split(".")[0],
210   - "size": { height: 500, width: 800 },
211   - "position": { x: 300, y: 110 }
  210 + "size": { height: 500, width: 900 },
  211 + "position": { x: 10, y: 30 }
212 212 };
213 213 AIAModuleOpenResourceInfo(AniOpenData);
214 214 }
... ... @@ -218,14 +218,15 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
218 218 }
219 219 else
220 220 {
221   - $rootScope.errorMessage = "This Animation video size not allow more than 10MB.Please try again.";
  221 + $('#errorMessage').text(AIAConstants.Animation_File_Size_Exceeded);
222 222 $("#messageModal").modal('show');
223 223 }
224 224 }
225 225 else
226 226 {
227   - $rootScope.errorMessage = "This Animation video is not in supported format.Please try again.";
  227 + $('#errorMessage').text(AIAConstants.Animation_File_Format_Not_Supported);
228 228 $("#messageModal").modal('show');
  229 + return;
229 230 }
230 231  
231 232 }
... ... @@ -253,11 +254,10 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
253 254 // var homepath = $location.protocol() + "//" + $location.host() + ":" + $location.port() + "/";
254 255 var homepath = $rootScope.homeURL;
255 256 $("#HomeContainerDiv").css({ "display": "none", "pointer-events": "none", "opacity": ".5" });
256   - $(".navbar-fixed-top").css({"display": "none", "pointer-events": "none", "opacity": ".5" });
  257 +
257 258 // if any panel in minimized mode
258 259 $("#jsPanel-min-container").css({"display":"none"});
259   -
260   -
  260 +
261 261 var parentslag = "";
262 262 var openNewlink = "";
263 263 if ($location.url() == "/curriculum-builder") {
... ... @@ -299,26 +299,37 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
299 299 parentslag = "lab-exercise-view";
300 300 openNewlink = "lab-exercises";
301 301 }
302   -
  302 + var newpanelWidth=0;
  303 + var newpanelHeight=0;
  304 + var newpanelLeft=0;
  305 + var $ua = navigator.userAgent;
  306 + if (($ua.match(/(iPod|iPhone|iPad|android)/i))) {
  307 + newpanelWidth=screen.width;
  308 + newpanelHeight=screen.height;
  309 + }
  310 + else{
  311 + newpanelWidth=screen.width-10;
  312 + newpanelHeight=screen.height-185;
  313 + }
303 314 $.jsPanel({
304 315 id: 'dvOpenResourcePanel',
305 316 selector: '#dvOpenResoucePanel',
306 317 theme: 'success',
307 318 currentController: 'HomeController',
308 319 parentSlug: parentslag,
309   - content: '<div class="col-sm-12" >' +
  320 + content: '<div>' +
310 321 '<iframe src="' + homepath + '" width="100%" height="10px" frameBorder="0" name="' + openNewlink + '" id="OpenModuleInCB" onload="OpenResourcePanel(this)"></iframe>',
311 322 title: "",
312 323 position: {
313 324 top: 1,
314   - left: 1
  325 + left: 0
315 326 },
316 327 controls: { buttons: 'closeonly' },
317 328 draggable: "disabled",
318 329  
319 330 size: {
320   - width: screen.width-30,
321   - height: screen.height-150
  331 + width: newpanelWidth,
  332 + height: newpanelHeight
322 333 },
323 334  
324 335 });
... ... @@ -326,67 +337,59 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
326 337 }
327 338  
328 339 $scope.OpenResourcePanel = function (iframe) {
  340 + var innerDoc = (iframe.contentDocument) ? iframe.contentDocument : iframe.contentWindow.document;
  341 + var head = $(innerDoc).contents().find("head");
  342 + //hide menu link
  343 + var css = '<style type="text/css">' +
  344 + // '#topMenuBar{visibility: hidden;} ' +
  345 + '.navbar-fixed-top{display: none}'+
  346 + '.pageHeading{margin-top: 2px}'+
  347 + '.sidebar{padding-top: 35px}'+
  348 + '.main{margin-top: 8px}'+
  349 +
  350 + '#Link\\/encyclopedia{display: none} ' +
  351 + // '#curriculum-builder{display: none} ' +
  352 + '#anatomy-test{display: none} ' +
  353 + '#Link\\/IP-10{display: none} ' +
  354 + //'#lab-exercises{display: none} ' +
  355 + '#Link\\/indepth-reports{display: none} ' +
  356 + '#Link\\/complementary-and-alternate-medicine{display: none} ' +
  357 + '#Link\\/bodyguide{display: none} ' +
  358 + '#Link\\/symptom-navigator{display: none} ' +
  359 + '#Link\\/health-navigator{display: none} ' +
  360 + '#Link\\/wellness-tools{display: none} ' +
  361 + '#ADAM-on-demand{display: none} ' +
  362 +
  363 + '</style>';
329 364  
  365 + var storefunc = '<script> function OpenDefaultModule(iframe){ iframe.contentWindow.document.getElementById(iframe.name).click();}</script>';
  366 + $(head).append(css);
  367 + $(head).append(storefunc);
  368 +
330 369 var canvasDIvHeight = $("#dvOpenResourcePanel .jsPanel-content").height();
331 370 $('#OpenModuleInCB').css('height', canvasDIvHeight);
332 371  
333   - //var iframe = document.getElementById('OpenModuleInCB');
334   - var innerDoc = (iframe.contentDocument) ? iframe.contentDocument : iframe.contentWindow.document;
335   - var head = $(innerDoc).contents().find("head");
336   - if (head != undefined && head != null)
337   - {
  372 + $timeout(function () {
  373 + console.log('frame content loding delayed......');
338 374 $scope.loadopenresourceContent(head, iframe);
339   - }
340   - else
341   - {
342   - $timeout(function () {
343   -
344   - var head = $(innerDoc).contents().find("head");
  375 + if (head != undefined && head != null)
  376 + {
345 377 $scope.loadopenresourceContent(head, iframe);
  378 + }
346 379  
347   - }, 500);
348   - }
  380 + }, 500);
349 381  
350 382 }
351 383  
352 384 $scope.loadopenresourceContent = function (header, iframe)
353   - {
354   - //disable link
355   - var css = '<style type="text/css">' +
356   - '#topMenuBar{pointer-events: none; opacity: .3} ' +
357   -
358   - '#Link\\/encyclopedia{pointer-events: none; opacity: .3} ' +
359   - // '#curriculum-builder{pointer-events: none; opacity: .3} ' +
360   - '#anatomy-test{pointer-events: none; opacity: .3} ' +
361   - '#Link\\/IP-10{pointer-events: none; opacity: .3} ' +
362   - //'#lab-exercises{pointer-events: none; opacity: .3} ' +
363   - '#Link\\/indepth-reports{pointer-events: none; opacity: .3} ' +
364   - '#Link\\/complementary-and-alternate-medicine{pointer-events: none; opacity: .3} ' +
365   - // '#ADAM-images{pointer-events: none; opacity: .3} ' +
366   - '#Link\\/bodyguide{pointer-events: none; opacity: .3} ' +
367   - '#Link\\/symptom-navigator{pointer-events: none; opacity: .3} ' +
368   - '#Link\\/health-navigator{pointer-events: none; opacity: .3} ' +
369   - '#Link\\/wellness-tools{pointer-events: none; opacity: .3} ' +
370   - '#ADAM-on-demand{pointer-events: none; opacity: .3} ' +
371   -
372   -
373   - '</style>';
374   -
375   - var storefunc = '<script> function OpenDefaultModule(iframe){ iframe.contentWindow.document.getElementById(iframe.name).click();}</script>';
376   - $(header).append(css);
377   - $(header).append(storefunc);
378   -
  385 + {
379 386 $timeout(function () {
380   - // var elmnt = iframe.contentWindow.document.getElementById("da-view-list");
381   - //$('#' + elmnt.id).trigger('click');
382 387 sessionStorage.setItem('isModuleOpenByOpenResource', 'true');
383   - sessionStorage.removeItem('ExitsCBFileDetail');
384   -
  388 + sessionStorage.removeItem('ExitsCBFileDetail');
385 389 OpenDefaultModule(iframe);
386 390  
387 391 }, 500);
388 392  
389   -
390 393 }
391 394  
392 395 $scope.AIAModuleOpenResourceInfo = function (newWindowData)
... ... @@ -425,28 +428,28 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
425 428 }
426 429 else if (($location.url() == "/da-body-view")) {
427 430  
428   - $scope.loadOpenResourceWindow(newWindowData.mType, '#daBodyview');
  431 + $scope.loadOpenResourceWindow(newWindowData.mType, '#daparentcustomDiv');
429 432 }
430 433 else if ($location.url() == "/clinical-illustrations-detail") {
431   - $scope.loadOpenResourceWindow(newWindowData.mType, '#CIView');
  434 + $scope.loadOpenResourceWindow(newWindowData.mType, '#ciparentcustomDiv');
432 435 }
433 436 else if ($location.url() == "/module-item-view") {
434 437  
435   - $scope.loadOpenResourceWindow(newWindowData.mType, '#aaBodyView');
  438 + $scope.loadOpenResourceWindow(newWindowData.mType, '#aaparentcustomDiv');
436 439 }
437 440 else if ($location.url() == "/clinical-animations-detail") {
438   - $scope.loadOpenResourceWindow(newWindowData.mType, '#CAView');
  441 + $scope.loadOpenResourceWindow(newWindowData.mType, '#caparentcustomDiv');
439 442 }
440 443 else if ($location.url() == "/adam-images-detail") {
441   - $scope.loadOpenResourceWindow(newWindowData.mType, '#AIView');
  444 + $scope.loadOpenResourceWindow(newWindowData.mType, '#aiparentcustomDiv');
442 445 }
443 446 else if ($location.url() == "/3d-anatomy-details") {
444 447  
445   - $scope.loadOpenResourceWindow(newWindowData.mType, '#ThreeDView');
  448 + $scope.loadOpenResourceWindow(newWindowData.mType, '#tdparentcustomDiv');
446 449 }
447 450 else if ($location.url() == "/lab-exercise-view") {
448 451  
449   - $scope.loadOpenResourceWindow(newWindowData.mType, '#labBodyview');
  452 + $scope.loadOpenResourceWindow(newWindowData.mType, '#labparentcustomDiv');
450 453 }
451 454  
452 455 }, 500);
... ... @@ -459,7 +462,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
459 462 case "DISSECTIBLE_ANATOMY":
460 463 var daSectionExist = document.getElementById('daCustomModuleDiv');
461 464  
462   - if (daSectionExist == null && BasemoduleDivId != "#daBodyview") {
  465 + if (daSectionExist == null && BasemoduleDivId != "#daparentcustomDiv") {
463 466 $(BasemoduleDivId).append($('<div id="daCustomModuleDiv"></div>'));
464 467 var html = $('#daCustomModuleDiv').append("<da-directive></da-directive>");
465 468 $compile(html)($scope);
... ... @@ -472,7 +475,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
472 475 case "ATLAS_ANATOMY":
473 476 var aaSectionExist = document.getElementById('aaCustomModuleDiv');
474 477  
475   - if (aaSectionExist == null && BasemoduleDivId != "#aaBodyView") {
  478 + if (aaSectionExist == null && BasemoduleDivId != "#aaparentcustomDiv") {
476 479 $(BasemoduleDivId).append($('<div id="aaCustomModuleDiv"></div>'));
477 480 var html = $('#aaCustomModuleDiv').append("<atlas-anatomy-directive></atlas-anatomy-directive>");
478 481 $compile(html)($scope);
... ... @@ -485,7 +488,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
485 488 case "CLINICAL_ILLUSTRATIONS":
486 489 var ciSectionExist = document.getElementById('ciCustomModuleDiv');
487 490  
488   - if (ciSectionExist == null && BasemoduleDivId != "#CIView") {
  491 + if (ciSectionExist == null && BasemoduleDivId != "#ciparentcustomDiv") {
489 492 $(BasemoduleDivId).append($('<div id="ciCustomModuleDiv"></div>'));
490 493 var html = $('#ciCustomModuleDiv').append("<clinical-illustration-directive></clinical-illustration-directive>");
491 494 $compile(html)($scope);
... ... @@ -498,7 +501,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
498 501 case "ADAM_IMAGES":
499 502 var aiSectionExist = document.getElementById('aiCustomModuleDiv');
500 503  
501   - if (aiSectionExist == null && BasemoduleDivId != "#AIView") {
  504 + if (aiSectionExist == null && BasemoduleDivId != "#aiparentcustomDiv") {
502 505 $(BasemoduleDivId).append($('<div id="aiCustomModuleDiv"></div>'));
503 506 var html = $('#aiCustomModuleDiv').append("<adam-image-directive></adam-image-directive>");
504 507 $compile(html)($scope);
... ... @@ -511,7 +514,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
511 514 case "CLINICAL_ANIMATIONS":
512 515 var caSectionExist = document.getElementById('caCustomModuleDiv');
513 516  
514   - if (caSectionExist == null && BasemoduleDivId != "#CAView") {
  517 + if (caSectionExist == null && BasemoduleDivId != "#caparentcustomDiv") {
515 518 $(BasemoduleDivId).append($('<div id="caCustomModuleDiv"></div>'));
516 519 var html = $('#caCustomModuleDiv').append("<clinical-animation-directive></clinical-animation-directive>");
517 520 $compile(html)($scope);
... ... @@ -524,7 +527,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
524 527 case "THREE_D_ANATOMY":
525 528 var threeDSectionExist = document.getElementById('theeDCustomModuleDiv');
526 529  
527   - if (threeDSectionExist == null && BasemoduleDivId != "#ThreeDView") {
  530 + if (threeDSectionExist == null && BasemoduleDivId != "#tdparentcustomDiv") {
528 531 $(BasemoduleDivId).append($('<div id="theeDCustomModuleDiv"></div>'));
529 532 var html = $('#theeDCustomModuleDiv').append("<threed-anatomy-directive></threed-anatomy-directive>");
530 533 $compile(html)($scope);
... ... @@ -538,7 +541,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
538 541 case "LAB_EXERCISE":
539 542 var labSectionExist = document.getElementById('labCustomModuleDiv');
540 543  
541   - if (labSectionExist == null && BasemoduleDivId != "#labBodyview") {
  544 + if (labSectionExist == null && BasemoduleDivId != "#labparentcustomDiv") {
542 545 $(BasemoduleDivId).append($('<div id="labCustomModuleDiv"></div>'));
543 546 var html = $('#labCustomModuleDiv').append("<lab-exercise-directive></lab-exercise-directive>");
544 547 $compile(html)($scope);
... ... @@ -596,7 +599,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
596 599 }
597 600  
598 601 $rootScope.promptUserForCookies = function () {
599   - $rootScope.errorMessage = AIAConstants.COOKIES_MESSAGE;
  602 + $('#errorMessage').text(AIAConstants.COOKIES_MESSAGE);
600 603 $("#messageModal").modal('show');
601 604  
602 605 }
... ... @@ -638,8 +641,8 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
638 641  
639 642 var url = $location.url();
640 643 //some time value not remove then reload
641   - sessionStorage.removeItem('isModuleOpenByOpenResource');
642 644 sessionStorage.removeItem('ExitsCBFileDetail');
  645 + sessionStorage.removeItem('isModuleOpenByOpenResource');
643 646 $('#login').css('visibility', 'visible');
644 647 $rootScope.lexiconData();
645 648  
... ... @@ -741,15 +744,15 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
741 744 $rootScope.LogoutUserSession();
742 745 }
743 746 else
744   - {
745   - AuthenticateAlreadyLoggedInUser();
  747 + {
  748 + AuthenticateAlreadyLoggedInUser();
746 749 }
747 750 }
748 751  
749 752 }),
750 753 function (error) {
751 754 console.log(' Error in user login status = ' + error.statusText);
752   - $rootScope.errorMessage = error;
  755 + $('#errorMessage').text(error);
753 756 $("#messageModal").modal('show');
754 757 }
755 758  
... ... @@ -980,10 +983,10 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
980 983 }
981 984 $rootScope.AuthenticateUser = function (userInfo) {
982 985 if (navigator.cookieEnabled) {
983   - $rootScope.errorMessage = "";
  986 + $('#errorMessage').text("");
984 987 if (userInfo.username == "" || userInfo.username == null || userInfo.username == undefined || userInfo.password == "" || userInfo.password == null || userInfo.password == undefined) {
985 988  
986   - $rootScope.errorMessage = LoginMessageConstants.USER_CREDENTIALS_MISSING;
  989 + $('#errorMessage').text(LoginMessageConstants.USER_CREDENTIALS_MISSING);
987 990 $("#messageModal").modal('show');
988 991 }
989 992 else {
... ... @@ -997,7 +1000,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
997 1000 if (result == LoginConstants.USER_NOT_FOUND) {
998 1001 $rootScope.LoginEnableUI();
999 1002 $rootScope.isVisibleLogin = true;
1000   - $rootScope.errorMessage = LoginMessageConstants.INVALID_USER;
  1003 + $('#errorMessage').text(LoginMessageConstants.INVALID_USER);
1001 1004 $("#messageModal").modal('show');
1002 1005 }
1003 1006 else {
... ... @@ -1056,10 +1059,21 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
1056 1059  
1057 1060 }
1058 1061  
1059   - $rootScope.lexicons = {
1060   - primaryid:result.userLexicon!=null && result.userLexicon.primaryid!=""?result.userLexicon.primaryid:"1",
1061   - secondryids:result.userLexicon!=null && result.userLexicon.secondryids!="" ?result.userLexicon.secondryids:""
1062   - };
  1062 + //under graduate
  1063 + if(result.EditionId==2 || result.EditionId==4 )
  1064 + {
  1065 + $rootScope.lexicons = {
  1066 + primaryid:result.userLexicon!=null && result.userLexicon.primaryid!=""?result.userLexicon.primaryid:"2",
  1067 + secondryids:result.userLexicon!=null && result.userLexicon.secondryids!="" ?result.userLexicon.secondryids:""
  1068 + };
  1069 + }
  1070 + else
  1071 + {
  1072 + $rootScope.lexicons = {
  1073 + primaryid:result.userLexicon!=null && result.userLexicon.primaryid!=""?result.userLexicon.primaryid:"1",
  1074 + secondryids:result.userLexicon!=null && result.userLexicon.secondryids!="" ?result.userLexicon.secondryids:""
  1075 + };
  1076 + }
1063 1077  
1064 1078 $rootScope.InitiateLexicon( $rootScope.lexicons.primaryid, $rootScope.lexicons.secondryids)
1065 1079  
... ... @@ -1090,10 +1104,22 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
1090 1104  
1091 1105 }
1092 1106  
1093   - $rootScope.lexicons = {
1094   - primaryid:result.userLexicon!=null && result.userLexicon.primaryid!=""?result.userLexicon.primaryid:"1",
1095   - secondryids:result.userLexicon!=null && result.userLexicon.secondryids!="" ?result.userLexicon.secondryids:""
1096   - };
  1107 + //under graduate
  1108 + if(result.EditionId==2 || result.EditionId==4 )
  1109 + {
  1110 + $rootScope.lexicons = {
  1111 + primaryid:result.userLexicon!=null && result.userLexicon.primaryid!=""?result.userLexicon.primaryid:"2",
  1112 + secondryids:result.userLexicon!=null && result.userLexicon.secondryids!="" ?result.userLexicon.secondryids:""
  1113 + };
  1114 + }
  1115 + else
  1116 + {
  1117 + $rootScope.lexicons = {
  1118 + primaryid:result.userLexicon!=null && result.userLexicon.primaryid!=""?result.userLexicon.primaryid:"1",
  1119 + secondryids:result.userLexicon!=null && result.userLexicon.secondryids!="" ?result.userLexicon.secondryids:""
  1120 + };
  1121 + }
  1122 +
1097 1123  
1098 1124 $rootScope.InitiateLexicon( $rootScope.lexicons.primaryid, $rootScope.lexicons.secondryids)
1099 1125  
... ... @@ -1109,72 +1135,72 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
1109 1135 if (result.LoginFailureCauseId != undefined && result.LoginFailureCauseId.toString() == LoginConstants.E_PASSWORD_NOT_MATCH) {
1110 1136 $rootScope.isVisibleLogin = true;
1111 1137 $rootScope.LoginEnableUI();
1112   - $rootScope.errorMessage = LoginMessageConstants.INVALID_PASSWORD;
  1138 + $('#errorMessage').text(LoginMessageConstants.INVALID_PASSWORD);
1113 1139 $("#messageModal").modal('show');
1114 1140 }
1115 1141 else if (result.LoginFailureCauseId != undefined && result.LoginFailureCauseId.toString() == LoginConstants.E_USER_ID_BLOCKED_24_HRS) {
1116 1142 $rootScope.isVisibleLogin = true;
1117 1143 $rootScope.LoginEnableUI();
1118   - $rootScope.errorMessage = LoginMessageConstants.USER_BLOCKED;
  1144 + $('#errorMessage').text(LoginMessageConstants.USER_BLOCKED);
1119 1145 $("#messageModal").modal('show');
1120 1146 }
1121 1147 else if ((result.LoginFailureCauseId != undefined && result.LoginFailureCauseId.toString() == LoginConstants.E_USER_NOT_ACTIVE) && (result.LicenseInfo != null) && (result.LicenseInfo != undefined) && (result.LicenseInfo.IsActive) && result.IsSubscriptionExpired) {
1122 1148 $rootScope.isVisibleLogin = true;
1123 1149 $rootScope.LoginEnableUI();
1124   - $rootScope.errorMessage = LoginMessageConstants.SUBSCRIPTION_EXPIRATION_MESSAGE + result.SubscriptionExpirationDate + '.';
1125   - $rootScope.errorMessage = $rootScope.errorMessage + ' ' + LoginMessageConstants.USER_INACTIVE_MESSAGE;
  1150 + var expmsg = LoginMessageConstants.SUBSCRIPTION_EXPIRATION_MESSAGE + result.SubscriptionExpirationDate + '.';
  1151 + $('#errorMessage').text(expmsg + ' ' + LoginMessageConstants.USER_INACTIVE_MESSAGE);
1126 1152 $("#messageModal").modal('show');
1127 1153 }
1128 1154 else if ((result.LoginFailureCauseId != undefined && result.LoginFailureCauseId.toString() == LoginConstants.E_USER_NOT_ACTIVE) && (result.LicenseInfo != null) && (result.LicenseInfo != undefined) && (!result.LicenseInfo.IsActive) && result.IsSubscriptionExpired) {
1129 1155 $rootScope.isVisibleLogin = true;
1130 1156 $rootScope.LoginEnableUI();
1131   - $rootScope.errorMessage = LoginMessageConstants.SUBSCRIPTION_EXPIRATION_MESSAGE + result.SubscriptionExpirationDate + '.';
1132   - $rootScope.errorMessage = $rootScope.errorMessage + ' ' + LoginMessageConstants.LICENSE_INACTIVE_MESSAGE + ' ' + LoginMessageConstants.USER_INACTIVE_MESSAGE;
  1157 + var expmsg = LoginMessageConstants.SUBSCRIPTION_EXPIRATION_MESSAGE + result.SubscriptionExpirationDate + '.';
  1158 + $('#errorMessage').text(expmsg + ' ' + LoginMessageConstants.LICENSE_INACTIVE_MESSAGE + ' ' + LoginMessageConstants.USER_INACTIVE_MESSAGE);
1133 1159 $("#messageModal").modal('show');
1134 1160 }
1135 1161 else if ((result.LoginFailureCauseId != undefined && result.LoginFailureCauseId.toString() == LoginConstants.E_USER_NOT_ACTIVE) && (result.LicenseInfo != null) && (result.LicenseInfo != undefined) && (!result.LicenseInfo.IsActive) && result.IsSubscriptionExpired) {
1136 1162 $rootScope.isVisibleLogin = true;
1137 1163 $rootScope.LoginEnableUI();
1138   - $rootScope.errorMessage = LoginMessageConstants.SUBSCRIPTION_EXPIRATION_MESSAGE + result.SubscriptionExpirationDate + '.';
1139   - $rootScope.errorMessage = $rootScope.errorMessage + ' ' + LoginMessageConstants.LICENSE_INACTIVE_MESSAGE + ' ' + LoginMessageConstants.USER_INACTIVE_MESSAGE;
  1164 + var expmsg = LoginMessageConstants.SUBSCRIPTION_EXPIRATION_MESSAGE + result.SubscriptionExpirationDate + '.';
  1165 + $('#errorMessage').text(expmsg + ' ' + LoginMessageConstants.LICENSE_INACTIVE_MESSAGE + ' ' + LoginMessageConstants.USER_INACTIVE_MESSAGE);
1140 1166 $("#messageModal").modal('show');
1141 1167 }
1142 1168 else if ((result.LoginFailureCauseId != undefined && result.LoginFailureCauseId.toString() == LoginConstants.E_USER_NOT_ACTIVE) && (result.LicenseInfo != null) && (result.LicenseInfo != undefined) && (!result.LicenseInfo.IsActive) && (!result.IsSubscriptionExpired)) {
1143 1169 $rootScope.isVisibleLogin = true;
1144 1170 $rootScope.LoginEnableUI();
1145   - $rootScope.errorMessage = LoginMessageConstants.LICENSE_INACTIVE_MESSAGE + ' ' + LoginMessageConstants.USER_INACTIVE_MESSAGE;
  1171 + $('#errorMessage').text(LoginMessageConstants.LICENSE_INACTIVE_MESSAGE + ' ' + LoginMessageConstants.USER_INACTIVE_MESSAGE);
1146 1172 $("#messageModal").modal('show');
1147 1173 }
1148 1174 else if (result.LoginFailureCauseId != undefined && result.LoginFailureCauseId.toString() == LoginConstants.E_USER_NOT_ACTIVE) {
1149 1175 $rootScope.isVisibleLogin = true;
1150 1176 $rootScope.LoginEnableUI();
1151   - $rootScope.errorMessage = LoginMessageConstants.USER_INACTIVE_MESSAGE;
  1177 + $('#errorMessage').text(LoginMessageConstants.USER_INACTIVE_MESSAGE);
1152 1178 $("#messageModal").modal('show');
1153 1179 }
1154 1180 else if ((result.LicenseInfo != null) && (result.LicenseInfo != undefined) && (!result.LicenseInfo.IsActive) && (result.IsSubscriptionExpired)) {
1155 1181 $rootScope.isVisibleLogin = true;
1156 1182 $rootScope.LoginEnableUI();
1157   - $rootScope.errorMessage = LoginMessageConstants.SUBSCRIPTION_EXPIRATION_MESSAGE + result.SubscriptionExpirationDate + '.';
1158   - $rootScope.errorMessage = $rootScope.errorMessage + ' ' + LoginMessageConstants.LICENSE_INACTIVE_MESSAGE;
  1183 + var expmsg = LoginMessageConstants.SUBSCRIPTION_EXPIRATION_MESSAGE + result.SubscriptionExpirationDate + '.';
  1184 + $('#errorMessage').text(expmsg + ' ' + LoginMessageConstants.LICENSE_INACTIVE_MESSAGE);
1159 1185 $("#messageModal").modal('show');
1160 1186 }
1161 1187 else if ((result.LicenseInfo != null) && (result.LicenseInfo != undefined) && (result.LicenseInfo.IsActive) && (result.IsSubscriptionExpired)) {
1162 1188 $rootScope.isVisibleLogin = true;
1163 1189 $rootScope.LoginEnableUI();
1164   - $rootScope.errorMessage = LoginMessageConstants.SUBSCRIPTION_EXPIRATION_MESSAGE + result.SubscriptionExpirationDate + '.';
  1190 + $('#errorMessage').text(LoginMessageConstants.SUBSCRIPTION_EXPIRATION_MESSAGE + result.SubscriptionExpirationDate + '.');
1165 1191 $("#messageModal").modal('show');
1166 1192 }
1167 1193 else if ((result.LicenseInfo != null) && (result.LicenseInfo != undefined) && (result.LicenseInfo.IsActive) && (result.IsSubscriptionNotStart)) {
1168 1194 // validation for new license which license start date is future date .
1169 1195 $rootScope.isVisibleLogin = true;
1170 1196 $rootScope.LoginEnableUI();
1171   - $rootScope.errorMessage = LoginMessageConstants.SUBSCRIPTION_NOT_START_MESSAGE + result.SubscriptionStartDate + '.';
  1197 + $('#errorMessage').text(LoginMessageConstants.SUBSCRIPTION_NOT_START_MESSAGE + result.SubscriptionStartDate + '.');
1172 1198 $("#messageModal").modal('show');
1173 1199 }
1174 1200 else if ((result.LicenseInfo != null) && (result.LicenseInfo != undefined) && (!result.LicenseInfo.IsActive) && (!result.IsSubscriptionExpired)) {
1175 1201 $rootScope.isVisibleLogin = true;
1176 1202 $rootScope.LoginEnableUI();
1177   - $rootScope.errorMessage = LoginMessageConstants.LICENSE_INACTIVE_MESSAGE;
  1203 + $('#errorMessage').text(LoginMessageConstants.LICENSE_INACTIVE_MESSAGE);
1178 1204 $("#messageModal").modal('show');
1179 1205 }
1180 1206 else {
... ... @@ -1325,7 +1351,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
1325 1351 }
1326 1352  
1327 1353 // set user session time
1328   - $rootScope.loadUserSession();
  1354 + $rootScope.loadUserSession();
1329 1355 $rootScope.LoginEnableUI();
1330 1356 }
1331 1357  
... ... @@ -1337,7 +1363,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
1337 1363 console.log(' Error in authentication = ' + error.statusText);
1338 1364 $rootScope.LoginEnableUI();
1339 1365 $rootScope.isVisibleLogin = true;
1340   - $rootScope.errorMessage = error;
  1366 + $('#errorMessage').text(error);
1341 1367 $("#messageModal").modal('show');
1342 1368 }
1343 1369 }
... ... @@ -1498,7 +1524,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
1498 1524 console.log(' Error in bypass login = ' + error.statusText);
1499 1525 $rootScope.isVisibleLogin = true;
1500 1526 $rootScope.LoginEnableUI();
1501   - $rootScope.errorMessage = error;
  1527 + $('#errorMessage').text(error);
1502 1528 $("#messageModal").modal('show');
1503 1529 }
1504 1530  
... ... @@ -1507,7 +1533,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
1507 1533 {
1508 1534 console.log(' invalid detail in bypass login');
1509 1535 $rootScope.isVisibleLogin = true;
1510   - $rootScope.errorMessage = "authentication is not allowed due to invalid details format .\nPlease pass the correct details again!";
  1536 + $('#errorMessage').text("authentication is not allowed due to invalid details format .\nPlease pass the correct details again!");
1511 1537 $("#messageModal").modal('show');
1512 1538 }
1513 1539  
... ... @@ -1560,49 +1586,49 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
1560 1586 if (result == LoginConstants.INVALID_CLIENT) {
1561 1587 $rootScope.isVisibleLogin = true;
1562 1588 $rootScope.LoginEnableUI();
1563   - $rootScope.errorMessage = LoginConstants.INVALID_CLIENT;
  1589 + $('#errorMessage').text(LoginConstants.INVALID_CLIENT);
1564 1590 $("#messageModal").modal('show');
1565 1591 }
1566 1592 else if (result == LoginConstants.MSG_NOT_AUTHORIZE_SITE_USER) {
1567 1593 $rootScope.isVisibleLogin = true;
1568 1594 $rootScope.LoginEnableUI();
1569   - $rootScope.errorMessage = LoginConstants.MSG_NOT_AUTHORIZE_SITE_USER;
  1595 + $('#errorMessage').text(LoginConstants.MSG_NOT_AUTHORIZE_SITE_USER);
1570 1596 $("#messageModal").modal('show');
1571 1597 }
1572 1598 else if (result.LoginFailureCauseId != undefined && result.LoginFailureCauseId.toString() == LoginConstants.E_ACCOUNT_NUMBER_NOT_NULL) {
1573 1599 $rootScope.isVisibleLogin = true;
1574 1600 $rootScope.LoginEnableUI();
1575   - $rootScope.errorMessage = LoginMessageConstants.E_ACCOUNT_NUMBER_NOT_NULL;
  1601 + $('#errorMessage').text(LoginMessageConstants.E_ACCOUNT_NUMBER_NOT_NULL);
1576 1602 $("#messageModal").modal('show');
1577 1603 }
1578 1604 else if (result.LoginFailureCauseId != undefined && result.LoginFailureCauseId.toString() == LoginConstants.E_EDITION_ID_NOT_NULL) {
1579 1605 $rootScope.isVisibleLogin = true;
1580 1606 $rootScope.LoginEnableUI();
1581   - $rootScope.errorMessage = LoginMessageConstants.E_EDITION_ID_NOT_NULL;
  1607 + $('#errorMessage').text(LoginMessageConstants.E_EDITION_ID_NOT_NULL);
1582 1608 $("#messageModal").modal('show');
1583 1609 }
1584 1610 else if (result.LoginFailureCauseId != undefined && result.LoginFailureCauseId.toString() == LoginConstants.E_EDITION_NOT_LINKED_WITH_SITE) {
1585 1611 $rootScope.isVisibleLogin = true;
1586 1612 $rootScope.LoginEnableUI();
1587   - $rootScope.errorMessage = LoginMessageConstants.E_EDITION_NOT_LINKED_WITH_SITE;
  1613 + $('#errorMessage').text(LoginMessageConstants.E_EDITION_NOT_LINKED_WITH_SITE);
1588 1614 $("#messageModal").modal('show');
1589 1615 }
1590 1616 else if (result.LoginFailureCauseId != undefined && result.LoginFailureCauseId.toString() == LoginConstants.LICENSE_INACTIVE) {
1591 1617 $rootScope.isVisibleLogin = true;
1592 1618 $rootScope.LoginEnableUI();
1593   - $rootScope.errorMessage = LoginMessageConstants.LICENSE_INACTIVE_MESSAGE;
  1619 + $('#errorMessage').text(LoginMessageConstants.LICENSE_INACTIVE_MESSAGE);
1594 1620 $("#messageModal").modal('show');
1595 1621 }
1596 1622 else if (result.LoginFailureCauseId != undefined && result.LoginFailureCauseId.toString() == LoginConstants.SITELICENSE_EXPIRED) {
1597 1623 $rootScope.isVisibleLogin = true;
1598 1624 $rootScope.LoginEnableUI();
1599   - $rootScope.errorMessage = LoginMessageConstants.SUBSCRIPTION_EXPIRATION_MESSAGE + result.SubscriptionExpirationDate + '.';
  1625 + $('#errorMessage').text(LoginMessageConstants.SUBSCRIPTION_EXPIRATION_MESSAGE + result.SubscriptionExpirationDate + '.');
1600 1626 $("#messageModal").modal('show');
1601 1627 }
1602 1628 else if (result.LoginFailureCauseId != undefined && result.LoginFailureCauseId.toString() == LoginConstants.SITELICENSE_NOTSTARTED) {
1603 1629 $rootScope.isVisibleLogin = true;
1604 1630 $rootScope.LoginEnableUI();
1605   - $rootScope.errorMessage = LoginMessageConstants.SUBSCRIPTION_NOT_START_MESSAGE + result.SubscriptionStartDate + '.';
  1631 + $('#errorMessage').text(LoginMessageConstants.SUBSCRIPTION_NOT_START_MESSAGE + result.SubscriptionStartDate + '.');
1606 1632 $("#messageModal").modal('show');
1607 1633 }
1608 1634 else
... ... @@ -1655,11 +1681,23 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
1655 1681 $rootScope.UpdateSetting($rootScope.formsetting);
1656 1682  
1657 1683 }
1658   -
1659   - $rootScope.lexicons = {
1660   - primaryid:result.userLexicon!=null && result.userLexicon.primaryid!=""?result.userLexicon.primaryid:"1",
1661   - secondryids:result.userLexicon!=null && result.userLexicon.secondryids!="" ?result.userLexicon.secondryids:""
1662   - };
  1684 +
  1685 + //under graduate
  1686 + if(result.EditionId==2 || result.EditionId==4 )
  1687 + {
  1688 + $rootScope.lexicons = {
  1689 + primaryid:result.userLexicon!=null && result.userLexicon.primaryid!=""?result.userLexicon.primaryid:"2",
  1690 + secondryids:result.userLexicon!=null && result.userLexicon.secondryids!="" ?result.userLexicon.secondryids:""
  1691 + };
  1692 + }
  1693 + else
  1694 + {
  1695 + $rootScope.lexicons = {
  1696 + primaryid:result.userLexicon!=null && result.userLexicon.primaryid!=""?result.userLexicon.primaryid:"1",
  1697 + secondryids:result.userLexicon!=null && result.userLexicon.secondryids!="" ?result.userLexicon.secondryids:""
  1698 + };
  1699 + }
  1700 +
1663 1701  
1664 1702 $rootScope.InitiateLexicon( $rootScope.lexicons.primaryid, $rootScope.lexicons.secondryids)
1665 1703  
... ... @@ -1691,10 +1729,21 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
1691 1729  
1692 1730 }
1693 1731  
1694   - $rootScope.lexicons = {
1695   - primaryid:result.userLexicon!=null && result.userLexicon.primaryid!=""?result.userLexicon.primaryid:"1",
1696   - secondryids:result.userLexicon!=null && result.userLexicon.secondryids!="" ?result.userLexicon.secondryids:""
1697   - };
  1732 + //under graduate
  1733 + if(result.EditionId==2 || result.EditionId==4 )
  1734 + {
  1735 + $rootScope.lexicons = {
  1736 + primaryid:result.userLexicon!=null && result.userLexicon.primaryid!=""?result.userLexicon.primaryid:"2",
  1737 + secondryids:result.userLexicon!=null && result.userLexicon.secondryids!="" ?result.userLexicon.secondryids:""
  1738 + };
  1739 + }
  1740 + else
  1741 + {
  1742 + $rootScope.lexicons = {
  1743 + primaryid:result.userLexicon!=null && result.userLexicon.primaryid!=""?result.userLexicon.primaryid:"1",
  1744 + secondryids:result.userLexicon!=null && result.userLexicon.secondryids!="" ?result.userLexicon.secondryids:""
  1745 + };
  1746 + }
1698 1747  
1699 1748 $rootScope.InitiateLexicon( $rootScope.lexicons.primaryid, $rootScope.lexicons.secondryids)
1700 1749  
... ... @@ -1802,10 +1851,10 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
1802 1851 $location.path('/');
1803 1852 }
1804 1853 }
1805   - $rootScope.LoginEnableUI();
1806   - // set user session time
1807   - $rootScope.loadUserSession();
1808   -
  1854 +
  1855 + $rootScope.loadUserSession();
  1856 + $rootScope.LoginEnableUI();
  1857 +
1809 1858 }
1810 1859  
1811 1860 }
... ... @@ -1818,7 +1867,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
1818 1867 console.log(' Error in authentication = ' + error.statusText);
1819 1868 $rootScope.LoginEnableUI();
1820 1869 $rootScope.isVisibleLogin = true;
1821   - $rootScope.errorMessage = error;
  1870 + $('#errorMessage').text(error);
1822 1871 $("#messageModal").modal('show');
1823 1872  
1824 1873 }
... ... @@ -1915,7 +1964,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
1915 1964 console.log(result);
1916 1965 $rootScope.isVisibleLogin = true;
1917 1966 $('#dvTermCondition').fadeIn();
1918   - $rootScope.errorMessage = LoginConstants.LICENSE_TERM_CONDITION_UPDATE_FAILED;
  1967 + $('#errorMessage').text(LoginConstants.LICENSE_TERM_CONDITION_UPDATE_FAILED);
1919 1968 $("#messageModal").modal('show');
1920 1969 $("#messageModal").css("z-index", 111112);
1921 1970 localStorage.removeItem("loggedInUserDetails");
... ... @@ -1926,7 +1975,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
1926 1975 console.log(' Error in Term and Condition acceptance status update = ' + error);//.statusText
1927 1976 $rootScope.isVisibleLogin = true;
1928 1977 $rootScope.isVisibleLogin = true;
1929   - $rootScope.errorMessage = error;
  1978 + $('#errorMessage').text(error);
1930 1979 $("#messageModal").modal('show');
1931 1980 $('#dvTermCondition').fadeIn();
1932 1981 });
... ... @@ -2019,6 +2068,8 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
2019 2068 $rootScope.LogoutUserSession = function () {
2020 2069 $rootScope.isSessionTimeout=true;
2021 2070 localStorage.removeItem('loggedInUserDetails');
  2071 + sessionStorage.removeItem('isModuleOpenByOpenResource');
  2072 + sessionStorage.removeItem('ExitsCBFileDetail');
2022 2073 localStorage.clear();
2023 2074 document.location = '/';
2024 2075 $rootScope.isVisibleLogin = true;
... ... @@ -2048,7 +2099,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
2048 2099 }),
2049 2100 function (error) {
2050 2101 console.log(' Error in user login status = ' + error.statusText);
2051   - $rootScope.errorMessage = error;
  2102 + $('#errorMessage').text(error);
2052 2103 $("#messageModal").modal('show');
2053 2104 }
2054 2105  
... ... @@ -2101,12 +2152,12 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
2101 2152 .then(function (result) {
2102 2153 if (result == LoginConstants.USER_NOT_FOUND) {
2103 2154 removeEmailPopUp();
2104   - $rootScope.errorMessage = LoginMessageConstants.INCORRECT_EMAIL_ID;
  2155 + $('#errorMessage').text(LoginMessageConstants.INCORRECT_EMAIL_ID);
2105 2156 $("#messageModal").modal('show');
2106 2157 }
2107 2158 else if (result == LoginConstants.MAIL_NOT_SENT) {
2108 2159 removeEmailPopUp();
2109   - $rootScope.errorMessage = LoginMessageConstants.MAIL_NOT_SENT;
  2160 + $('#errorMessage').text(LoginMessageConstants.MAIL_NOT_SENT);
2110 2161 $("#messageModal").modal('show');
2111 2162 }
2112 2163 else {
... ... @@ -2122,7 +2173,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
2122 2173 }
2123 2174 else
2124 2175 message = LoginMessageConstants.USERID_SENT_IN_EMAIL
2125   - $rootScope.errorMessage = message;
  2176 + $('#errorMessage').text(message);
2126 2177 $("#messageModal").modal('show');
2127 2178  
2128 2179  
... ... @@ -2133,19 +2184,19 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
2133 2184 function (error) {
2134 2185 console.log(' Error in authentication = ' + error.statusText);
2135 2186 removeEmailPopUp();
2136   - $rootScope.errorMessage = error;
  2187 + $('#errorMessage').text( error);
2137 2188 $("#messageModal").modal('show');
2138 2189 });
2139 2190 }
2140 2191 else {
2141 2192 removeEmailPopUp();
2142   - $rootScope.errorMessage = LoginMessageConstants.INCORRECT_EMAIL_ID;
  2193 + $('#errorMessage').text(LoginMessageConstants.INCORRECT_EMAIL_ID);
2143 2194 $("#messageModal").modal('show');
2144 2195 }
2145 2196 }
2146 2197 else {
2147 2198 removeEmailPopUp();
2148   - $rootScope.errorMessage = LoginMessageConstants.BLANK_EMAIL_ID;
  2199 + $('#errorMessage').text(LoginMessageConstants.BLANK_EMAIL_ID);
2149 2200 $("#messageModal").modal('show');
2150 2201  
2151 2202 }
... ... @@ -2185,30 +2236,30 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
2185 2236 .then(
2186 2237 function (result) {
2187 2238 if (result == LoginConstants.USER_NOT_FOUND) {
2188   - $rootScope.errorMessage = LoginMessageConstants.USER_NOT_FOUND;
  2239 + $('#errorMessage').text(LoginMessageConstants.USER_NOT_FOUND);
2189 2240 $("#messageModal").modal('show');
2190 2241  
2191 2242 }
2192 2243 else if (result == LoginConstants.EXCEPTION_OCCURED) {
2193   - $rootScope.errorMessage = LoginConstants.ERROR_IN_FECTHING_DETAILS;
  2244 + $('#errorMessage').text(LoginConstants.ERROR_IN_FECTHING_DETAILS);
2194 2245 $("#messageModal").modal('show');
2195 2246  
2196 2247 }
2197 2248 else if (result == LoginConstants.SQL_CONNECTION_ERROR) {
2198   - $rootScope.errorMessage = LoginConstants.SQL_CONNECTION_ERROR_MESSAGE;
  2249 + $('#errorMessage').text(LoginConstants.SQL_CONNECTION_ERROR_MESSAGE);
2199 2250 $("#messageModal").modal('show');
2200 2251 }
2201 2252 else {
2202 2253 //if ((result.IsAcknowledged == true) && (result.IsModifiedCountAvailable == true)) {
2203 2254 if (result == LoginMessageConstants.PASSWORD_UPDATE_SUCCESS) {
2204   - $rootScope.errorMessage = LoginMessageConstants.PASSWORD_RESET_MESSAGE;
  2255 + $('#errorMessage').text(LoginMessageConstants.PASSWORD_RESET_MESSAGE);
2205 2256 $("#messageModal").modal('show');
2206 2257 $rootScope.isVisibleLogin = true;
2207 2258 $rootScope.isVisibleResetPass = false;
2208 2259 $location.url("/");
2209 2260 }
2210 2261 else {
2211   - $rootScope.errorMessage = LoginMessageConstants.PASSWORD_RESET_FAILURE;
  2262 + $('#errorMessage').text(LoginMessageConstants.PASSWORD_RESET_FAILURE);
2212 2263 $("#messageModal").modal('show');
2213 2264 $rootScope.isVisibleLogin = true;
2214 2265 $rootScope.isVisibleResetPass = false;
... ... @@ -2218,18 +2269,18 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
2218 2269 },
2219 2270 function (error) {
2220 2271 console.log(' Error in authentication = ' + error.statusText);
2221   - $rootScope.errorMessage = error;
  2272 + $('#errorMessage').text(error);
2222 2273 $("#messageModal").modal('show');
2223 2274  
2224 2275 });
2225 2276 }
2226 2277 else {
2227   - $rootScope.errorMessage = LoginMessageConstants.NEW_AND_OLD_PASSWORD_DONOT_MATCH;
  2278 + $('#errorMessage').text(LoginMessageConstants.NEW_AND_OLD_PASSWORD_DONOT_MATCH);
2228 2279 $("#messageModal").modal('show');
2229 2280 }
2230 2281 }
2231 2282 else {
2232   - $rootScope.errorMessage = LoginMessageConstants.NEW_PASSWORD_FIELD_IS_EMPTY;
  2283 + $('#errorMessage').text(LoginMessageConstants.NEW_PASSWORD_FIELD_IS_EMPTY);
2233 2284 $("#messageModal").modal('show');
2234 2285 }
2235 2286  
... ... @@ -2254,7 +2305,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
2254 2305 $location.url("/");
2255 2306 }
2256 2307 else {
2257   - $rootScope.errorMessage = LoginMessageConstants.UNABLE_TO_UNBLOCK;
  2308 + $('#errorMessage').text(LoginMessageConstants.UNABLE_TO_UNBLOCK);
2258 2309 $("#messageModal").modal('show');
2259 2310 $rootScope.isVisibleLogin = true;
2260 2311 $location.url("/");
... ... @@ -2262,7 +2313,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
2262 2313 },
2263 2314 function (error) {
2264 2315 console.log(' Error in UnblockUser = ' + error.statusText);
2265   - $rootScope.errorMessage = error;
  2316 + $('#errorMessage').text(error);
2266 2317 $("#messageModal").modal('show');
2267 2318 }
2268 2319 );
... ... @@ -2270,6 +2321,11 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
2270 2321  
2271 2322 $(document).ready(function () {
2272 2323  
  2324 + var $ua = navigator.userAgent;
  2325 + if (($ua.match(/(iPod|iPhone|iPad|android)/i))) {
  2326 + $('#arragePannel .dropdown-content').css("display","block");
  2327 + }
  2328 +
2273 2329 $(function () {
2274 2330 var colpick = $('.demo').each(function () {
2275 2331  
... ... @@ -2564,30 +2620,214 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
2564 2620 }, 300);
2565 2621 }
2566 2622  
2567   - $rootScope.cBModulejsPanelTop = function () {
2568   -
2569   - var paneltopPosition = 0;
  2623 + $rootScope.arrangeCascadePanel = function () {
  2624 + //cascade view
  2625 + var pTop = 70;
  2626 + var pLeft = 5;
  2627 + var resetWidth=0;
  2628 + if($location.url()== "/curriculum-builder-detail") {
  2629 + pTop = 35;
  2630 + pLeft = 20;
  2631 + }
2570 2632 var moduleImagePanel = $("div[id*='ImagePanel']");
2571   -
2572   - if (moduleImagePanel.length > 0) {
  2633 +
  2634 + if (moduleImagePanel.length > 0) {
  2635 +
  2636 + var resetWidth=($(window).innerWidth()-30)/2;
2573 2637 for (var j = 0; j < moduleImagePanel.length; j++) {
  2638 + var paneld=moduleImagePanel[j].id;
  2639 + if(j>0)
  2640 + {
  2641 + pTop = pTop+30;
  2642 + pLeft = pLeft+40;
  2643 + }
  2644 + $("#"+paneld).css('top',pTop);
  2645 + $("#"+paneld).css('left',pLeft);
  2646 +
  2647 + $("#"+paneld).css('width',resetWidth);
  2648 + $("#"+paneld+' .jsPanel-content').css('width',resetWidth);
  2649 + $("#"+paneld).css('z-index',j+1000);
  2650 +
  2651 + $scope.resetPanelPosition(paneld,resetWidth,pTop,pLeft);
  2652 +
  2653 + }
  2654 + }
  2655 +
  2656 + }
  2657 + $rootScope.arrangeTiledPanel = function () {
  2658 + //tiled view
  2659 + var pTop = 70;
  2660 + var pLeft = 5;
  2661 + var resetWidth=0;
  2662 + var countreset=0;
  2663 + if($location.url()== "/curriculum-builder-detail") {
  2664 + pTop = 35;
  2665 + pLeft = 10;
  2666 + }
  2667 + var countnumber=0;
  2668 + var moduleImagePanel = $("div[id*='ImagePanel']");
  2669 +
  2670 + if (moduleImagePanel.length > 0) {
2574 2671  
2575   - var ctx = document.getElementById(moduleImagePanel[j].id);
2576   -
2577   - var pTop = ctx.offsetTop + ctx.offsetHeight + 10;
  2672 + if(moduleImagePanel.length<=2)
  2673 + {
  2674 + resetWidth=($(window).innerWidth()-30)/2;
  2675 + }
  2676 + else if(moduleImagePanel.length>=3)
  2677 + {
  2678 + resetWidth=($(window).innerWidth()-30)/3;
  2679 + }
  2680 +
  2681 + for (var j = 0; j < moduleImagePanel.length; j++) {
  2682 + countnumber=countnumber+1;
  2683 + var paneld=moduleImagePanel[j].id;
  2684 +
  2685 + //set max tiles 3 on screen width
  2686 + if(countnumber>1 && countnumber<4)
  2687 + {
  2688 + pLeft = pLeft+resetWidth+10;
  2689 + }
  2690 + else if(countnumber>=4)
  2691 + {
  2692 + countreset=countreset+1;
  2693 + countnumber=1;
  2694 + pTop = 70+10+countreset*520;
  2695 + pLeft = 5;
  2696 + if($location.url()== "/curriculum-builder-detail") {
  2697 + pTop = 35+10+countreset*520;
  2698 + pLeft = 10;
  2699 + }
2578 2700  
2579   - if (paneltopPosition < pTop) {
2580   - paneltopPosition = pTop+20;
  2701 + }
  2702 +
  2703 + $("#"+paneld).css('width',resetWidth);
  2704 + $("#"+paneld+' .jsPanel-content').css('width',resetWidth);
  2705 +
  2706 + $("#"+paneld).css('top',pTop);
  2707 + $("#"+paneld).css('left',pLeft);
  2708 +
  2709 + $("#"+paneld).css('z-index',j+1000);
  2710 + $scope.resetPanelPosition(paneld,resetWidth,pTop,pLeft);
2581 2711 }
2582 2712 }
  2713 +
2583 2714 }
2584   - else {
2585   - // first panel
2586   - paneltopPosition = 610;
  2715 +
  2716 + $scope.resetPanelPosition=function(paneld,resetWidth,pTop,pLeft)
  2717 + {
  2718 + $rootScope.UnsaveCurriculum = true;
  2719 + var len = (paneld).split("_").length;
  2720 + var MultiWinId = (paneld).split("_")[len - 1];
  2721 +
  2722 + if(paneld.match("daImagePanel"))
  2723 + {
  2724 + $("#"+paneld).css('height','520');
  2725 + $("#"+paneld+' .jsPanel-content').css('height','490');
  2726 +
  2727 + $('#canvasDivDA_' + MultiWinId).css('height', '440');
  2728 + $rootScope.SetDAwindowData(MultiWinId,'width',resetWidth);
  2729 + $rootScope.SetDAwindowData(MultiWinId,'height',520);
  2730 + $rootScope.SetDAwindowData(MultiWinId,'y',pTop);
  2731 + $rootScope.SetDAwindowData(MultiWinId,'x',pLeft);
  2732 +
2587 2733 }
  2734 + else if(paneld.match("AAImagePanel"))
  2735 + {
  2736 + $("#"+paneld).css('height','520');
  2737 + $("#"+paneld+' .jsPanel-content').css('height','490');
  2738 +
  2739 + $('#canvasAADiv_' + MultiWinId).css('height', '440');
  2740 + $rootScope.SetAAwindowData(MultiWinId,'width',resetWidth);
  2741 + $rootScope.SetAAwindowData(MultiWinId,'height',520);
  2742 + $rootScope.SetAAwindowData(MultiWinId,'y',pTop);
  2743 + $rootScope.SetAAwindowData(MultiWinId,'x',pLeft);
  2744 + }
  2745 + else if(paneld.match("ciImagePanel"))
  2746 + {
  2747 + $("#"+paneld).css('height','520');
  2748 + $("#"+paneld+' .jsPanel-content').css('height','490');
  2749 +
  2750 + $('#canvasDivCI_' + MultiWinId).css('height', '490');
  2751 + $rootScope.SetCIwindowData(MultiWinId,'width',resetWidth);
  2752 + $rootScope.SetCIwindowData(MultiWinId,'height',520);
  2753 + $rootScope.SetCIwindowData(MultiWinId,'y',pTop);
  2754 + $rootScope.SetCIwindowData(MultiWinId,'x',pLeft);
  2755 + }
  2756 + else if(paneld.match("aiImagePanel"))
  2757 + {
  2758 + $("#"+paneld).css('height','520');
  2759 + $("#"+paneld+' .jsPanel-content').css('height','490');
  2760 +
  2761 + $('#canvasDivAI_' + MultiWinId).css('height', '485');
  2762 + $rootScope.SetAIwindowData(MultiWinId,'width',resetWidth);
  2763 + $rootScope.SetAIwindowData(MultiWinId,'height',520);
  2764 + $rootScope.SetAIwindowData(MultiWinId,'y',pTop);
  2765 + $rootScope.SetAIwindowData(MultiWinId,'x',pLeft);
  2766 + }
  2767 + else if(paneld.match("picImagePanel"))
  2768 + {
  2769 + $("#"+paneld).css('height','520');
  2770 + $("#"+paneld+' .jsPanel-content').css('height','490');
  2771 +
  2772 + $('#canvasDivPIC_' + MultiWinId).css('height', '485');
  2773 + $rootScope.SetPICwindowData(MultiWinId,'width',resetWidth);
  2774 + $rootScope.SetPICwindowData(MultiWinId,'height',520);
  2775 + $rootScope.SetPICwindowData(MultiWinId,'y',pTop);
  2776 + $rootScope.SetPICwindowData(MultiWinId,'x',pLeft);
  2777 + }
  2778 + else if(paneld.match("ThreeDImagePanel"))
  2779 + {
  2780 + $("#"+paneld).css('height','520');
  2781 + $("#"+paneld+' .jsPanel-content').css('height','490');
  2782 +
  2783 + $rootScope.Set3DwindowData(MultiWinId,'width',resetWidth);
  2784 + $rootScope.Set3DwindowData(MultiWinId,'height',520);
  2785 + $rootScope.Set3DwindowData(MultiWinId,'y',pTop);
  2786 + $rootScope.Set3DwindowData(MultiWinId,'x',pLeft);
  2787 +
  2788 + }
  2789 + else if(paneld.match("caImagePanel"))
  2790 + {
  2791 + $("#"+paneld).css('height','520');
  2792 + $("#"+paneld+' .jsPanel-content').css('height','490');
  2793 +
  2794 + $('#playerinlineVideo_'+ MultiWinId ).css("height",370 );
  2795 +
  2796 + $rootScope.SetCAwindowData(MultiWinId,'width',resetWidth);
  2797 + $rootScope.SetCAwindowData(MultiWinId,'height',520);
  2798 + $rootScope.SetCAwindowData(MultiWinId,'y',pTop);
  2799 + $rootScope.SetCAwindowData(MultiWinId,'x',pLeft);
  2800 +
  2801 + }
  2802 + else if(paneld.match("vidImagePanel"))
  2803 + {
  2804 + $("#"+paneld).css('height','520');
  2805 + $("#"+paneld+' .jsPanel-content').css('height','490');
  2806 +
  2807 + $('#playerinlineVideo_'+ MultiWinId ).css("height",470 );
  2808 +
  2809 + $rootScope.SetVideowindowData(MultiWinId,'width',resetWidth);
  2810 + $rootScope.SetVideowindowData(MultiWinId,'height',520);
  2811 + $rootScope.SetVideowindowData(MultiWinId,'y',pTop);
  2812 + $rootScope.SetVideowindowData(MultiWinId,'x',pLeft);
  2813 +
  2814 + }
  2815 + else if(paneld.match("labImagePanel"))
  2816 + {
  2817 + $("#"+paneld).css('height','520');
  2818 + $("#"+paneld+' .jsPanel-content').css('height','490');
  2819 + $('#LabView_' + MultiWinId).css('height', 505);
  2820 + $('#panelbodyDiv_' + MultiWinId).css("height",380);
  2821 + $rootScope.SetLabwindowData(MultiWinId,'width',resetWidth);
  2822 + $rootScope.SetLabwindowData(MultiWinId,'height',520);
  2823 + $rootScope.SetLabwindowData(MultiWinId,'y',pTop);
  2824 + $rootScope.SetLabwindowData(MultiWinId,'x',pLeft);
  2825 +
  2826 + }
  2827 +
  2828 +
  2829 + }
2588 2830  
2589   - return paneltopPosition;
2590   - }
2591 2831 $rootScope.disableTopMenuOption=function()
2592 2832 {
2593 2833 $("#annotationButton").addClass("disableMenuoption");
... ... @@ -8319,7 +8559,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
8319 8559 }
8320 8560 else
8321 8561 {
8322   - $rootScope.errorMessage =AIAConstants.SETTING_SAVE_ERROR;
  8562 + $('#errorMessage').text(AIAConstants.SETTING_SAVE_ERROR);
8323 8563 $("#messageModal").modal('show');
8324 8564 }
8325 8565  
... ... @@ -8331,23 +8571,10 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
8331 8571 $('#modal-settings').css("display", "none");
8332 8572 $('#modelsettingsbackground').css('z-index', '12000000');
8333 8573 $("#modelsettingsbackground").css("display", "none");
8334   - $rootScope.errorMessage = error;
  8574 + $('#errorMessage').text(error);
8335 8575 $("#messageModal").modal('show');
8336 8576 }
8337   - // }
8338   - // else
8339   - // {
8340   - // $timeout(function () {
8341   - // $('#setting-spinner').css('visibility', 'hidden');
8342   - // $('#modal-settings').css("display", "none");
8343   - // $('#modelsettingsbackground').css('z-index', '12000000');
8344   - // $("#modelsettingsbackground").css("display", "none");
8345   - // $rootScope.UpdateSetting(Formatsetting);
8346   -
8347   - // }, 500);
8348   -
8349   - // }
8350   -
  8577 +
8351 8578 };
8352 8579  
8353 8580  
... ... @@ -8605,6 +8832,8 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
8605 8832 };
8606 8833  
8607 8834 $rootScope.ShowPrintWindow = function () { // Print Active Viewer
  8835 + $scope.Totalpage=0;
  8836 + $scope.pageCount=0;
8608 8837  
8609 8838 if ($('#printDivContent').html() != "") {
8610 8839 $('#printDivContent').empty();
... ... @@ -8618,14 +8847,9 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
8618 8847  
8619 8848 if (canvasDivElement == null || canvasDivElement == undefined) return;
8620 8849 var canvasDivId = canvasDivElement.id;
8621   -
  8850 + $scope.Totalpage=1;
8622 8851 CollectPrintData(canvasDivId, 1, panelTitle);
8623 8852  
8624   -
8625   - $timeout(function () {
8626   - SetFrameToPrint();
8627   - }, 500);
8628   -
8629 8853 };
8630 8854  
8631 8855  
... ... @@ -8636,14 +8860,18 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
8636 8860 }
8637 8861  
8638 8862 var multiprint = function (canvasId, page, title, delaytime) {
  8863 +
8639 8864 $timeout(function () { CollectPrintData(canvasId, page, title) }, delaytime);
8640 8865 };
8641 8866  
8642 8867 var pageno = 0;
  8868 + $scope.Totalpage=0;
  8869 + $scope.pageCount=0;
8643 8870 // select all open module div.
8644 8871 var modulePanel = $("#HomeContainerDiv").find("div[id*='ImagePanel']").not("div[id*='caImagePanel']").not("div[id*='ThreeDImagePanel']").not("div[id*='labImagePanel']").not("div[id*='vidImagePanel']");
8645 8872  
8646   - for (var i = 0 ; i < modulePanel.length; i++) {
  8873 + $scope.Totalpage=modulePanel.length;
  8874 + for (var i = 0 ; i < $scope.Totalpage; i++) {
8647 8875  
8648 8876 var paneld = modulePanel[i].id;
8649 8877  
... ... @@ -8655,21 +8883,11 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
8655 8883 var canvasDivId = canvasDivElement.id;
8656 8884 var panelTitle = document.getElementById(paneld).childNodes[0].innerText;
8657 8885  
8658   - var timeintrval = pageno * 400;
  8886 + pageno = pageno + 1;
  8887 + var timeintrval = pageno * 200;
8659 8888  
8660 8889 multiprint(canvasDivId, pageno, panelTitle,timeintrval);
8661 8890  
8662   - if(pageno==modulePanel.length-1)
8663   - {
8664   - $timeout(function () {
8665   - // working for all device
8666   - SetFrameToPrint();
8667   -
8668   - }, pageno * 400+500);
8669   -
8670   - }
8671   - pageno = pageno + 1;
8672   -
8673 8891 }
8674 8892  
8675 8893 }
... ... @@ -8681,6 +8899,23 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
8681 8899 html2canvas($("#" + canvasDivId), {
8682 8900 onrendered: function (canvas) {
8683 8901 var dataURL = canvas.toDataURL("image/jpeg");
  8902 + if (canvas.id.match("canvasDivDA")) {
  8903 + var curModule = 'DISSECTIBLE_ANATOMY';
  8904 + }
  8905 + else if (canvas.id.match("canvasAADiv")) {
  8906 + var curModule = 'ATLAS_ANATOMY';
  8907 + }
  8908 + else if (canvas.id.match("canvasDivCI")) {
  8909 + var curModule = 'CLINICAL_ILLUSTRATIONS';
  8910 + }
  8911 + else if (canvas.id.match("canvasDivAI")) {
  8912 + var curModule = 'ADAM_IMAGES';
  8913 + }
  8914 + else if (canvas.id.match("canvasDivPIC")) {
  8915 + var curModule = 'MY_PICTURES';
  8916 + }
  8917 +
  8918 + $scope.pageCount= $scope.pageCount+1;
8684 8919  
8685 8920 if (pageno == 1) {
8686 8921 $('#printDivContent').append("<div id='dvPortrait" + pageno + "'>");
... ... @@ -8694,15 +8929,21 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
8694 8929 $('#image_preview' + pageno).append("<div id='image_Header" + pageno + "' style='position: absolute; top: 0px; width:98%'>");
8695 8930  
8696 8931 //<!--Dynamic Print Header-->
8697   - var getHeader = "<div id='printHeader" + pageno + "'><div style='position: relative; float: left;'><span id='spnModule'>"+$rootScope.currentActiveModuleTitle+"</span> </div><div style='position: relative; float: right;margin-right: 20px;'><span id='spnBodyViewTitle" + pageno + " '>"+panelTitle+"</span></div></div>";
  8932 + var getHeader = "<div id='printHeader" + pageno + "'><div style='position: relative; float: left;'><span id='spnModule'>"+curModule+"</span> </div><div style='position: relative; float: right;margin-right: 20px;'><span id='spnBodyViewTitle" + pageno + " '>"+panelTitle+"</span></div></div>";
8698 8933  
8699 8934 $('#image_Header' + pageno).append(getHeader);
8700 8935  
8701 8936 if (canvas.height < 825) {
8702   - $('#image_preview' + pageno).append("<img id='snipImage" + pageno + "' alt='' class='logo-image' style='width: 90%;height:auto;top:20px ; position: relative;'>");
  8937 + if (canvas.width < 600) {
  8938 + $('#image_preview' + pageno).append("<img id='snipImage" + pageno + "' alt='' class='logo-image' style='width: 90%;height:90%;top:20px ; position: relative;'>");
  8939 + }
  8940 + else{
  8941 + $('#image_preview' + pageno).append("<img id='snipImage" + pageno + "' alt='' class='logo-image' style='width: 95%;height:auto;top:20px ; position: relative;'>");
  8942 + }
  8943 +
8703 8944 }
8704 8945 else {
8705   - $('#image_preview' + pageno).append("<img id='snipImage" + pageno + "' alt='' class='logo-image' style='width: 90%;height:92%; top:20px ; position: relative;'>");
  8946 + $('#image_preview' + pageno).append("<img id='snipImage" + pageno + "' alt='' class='logo-image' style='width: 95%;height:92%; top:20px ; position: relative;'>");
8706 8947  
8707 8948 }
8708 8949  
... ... @@ -8713,7 +8954,13 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
8713 8954 var getfooter = document.getElementById('printFooter').innerHTML;
8714 8955 $('#image_Footer' + pageno).append(getfooter);
8715 8956  
  8957 + if($scope.Totalpage==$scope.pageCount)
  8958 + {
  8959 + $timeout(function () {
  8960 + SetFrameToPrint();
  8961 + }, 300);
8716 8962  
  8963 + }
8717 8964 }
8718 8965 });
8719 8966  
... ... @@ -8742,7 +8989,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
8742 8989 window.frames["frame1"].focus();
8743 8990 window.frames["frame1"].print();
8744 8991 frame1.remove();
8745   - }, 500);
  8992 + }, 100);
8746 8993  
8747 8994 }
8748 8995  
... ... @@ -8773,10 +9020,22 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
8773 9020 if ($('#jsPanel-1').length > 0) {
8774 9021 // $('.jsPanel-btn-norm').attr('style', 'display: block');
8775 9022 }
8776   -
8777   - console.log('jsPanel loaded exist= ' + document.getElementById('jsPanel-1'));
8778   -
8779   - var curModule = $rootScope.currentActiveModuleTitle;
  9023 + if (canvas.id.match("canvasDivDA")) {
  9024 + var curModule = 'DISSECTIBLE_ANATOMY';
  9025 + }
  9026 + else if (canvas.id.match("canvasAADiv")) {
  9027 + var curModule = 'ATLAS_ANATOMY';
  9028 + }
  9029 + else if (canvas.id.match("canvasDivCI")) {
  9030 + var curModule = 'CLINICAL_ILLUSTRATIONS';
  9031 + }
  9032 + else if (canvas.id.match("canvasDivAI")) {
  9033 + var curModule = 'ADAM_IMAGES';
  9034 + }
  9035 + else if (canvas.id.match("canvasDivPIC")) {
  9036 + var curModule = 'MY_PICTURES';
  9037 + }
  9038 +
8780 9039 // var curPosture = $rootScope.getLocalStorageValue('currentViewTitle');
8781 9040 var curPosture = panelTitle;
8782 9041  
... ... @@ -8800,33 +9059,72 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
8800 9059 }, 520);
8801 9060 }
8802 9061 else {
8803   - setTimeout(function () {
8804   - // $("#btnPrint").attr("id", canvas.id.replace("#",""));
8805   - document.getElementById('imgPortrait').setAttribute('src', dataURL);
8806   - document.getElementById('imgLandscape').setAttribute('src', dataURL);
8807   -
8808   - if (canvas.height < 825) {
8809   -
8810   - document.getElementById('imgPortrait').setAttribute("style", "width:90%");
  9062 + var timeintval = null;
  9063 + timeintval = $interval(function () {
  9064 + var printPageContent = document.getElementById('imgPortrait');
  9065 + if (printPageContent!=null) {
  9066 + $scope.stopPreview();
  9067 + document.getElementById('imgPortrait').setAttribute('src', dataURL);
  9068 + document.getElementById('imgLandscape').setAttribute('src', dataURL);
  9069 +
  9070 + if (canvas.height < 825) {
  9071 + if (canvas.width < 560) {
  9072 + document.getElementById('imgPortrait').setAttribute("style", "width:80%;");
  9073 + }
  9074 + else if (canvas.width < 660)
  9075 + {
  9076 + document.getElementById('imgPortrait').setAttribute("style", "width:90%;");
  9077 + }
  9078 + else
  9079 + {
  9080 + document.getElementById('imgPortrait').setAttribute("style", "width:100%;");
  9081 + }
  9082 +
  9083 + }
  9084 + else {
  9085 + document.getElementById('imgPortrait').setAttribute("style", "width:90%");
  9086 +
  9087 + }
  9088 +
  9089 + ResizeImage(0);
  9090 +
  9091 + document.getElementById('spnModulePor').innerHTML = curModule;
  9092 + document.getElementById('spnBodyViewTitlePor').innerHTML = curPosture;
  9093 + document.getElementById('spnModuleLan').innerHTML = curModule;
  9094 + document.getElementById('spnBodyViewTitleLan').innerHTML = curPosture;
  9095 + if ($('#printcontainer').length > 0) {
  9096 + $("#printcontainer").css('width', $(window).outerWidth());
  9097 + $("#printcontainer").css('height', $(window).outerHeight());
  9098 + }
  9099 + var $ua = navigator.userAgent;
  9100 +
  9101 + if (($ua.match(/(iPod|iPhone|iPad|android)/i))) {
  9102 + $("#dvPortrait").css('left', "0%");
  9103 + $("#dvPortrait").css('transform', "translateX(0%)");
  9104 +
  9105 + }
  9106 + else
  9107 + {
  9108 + $("#dvPortrait").css('left', "50%");
  9109 + $("#dvPortrait").css('transform', "translateX(-50%)");
  9110 + }
  9111 +
  9112 + $(".currentyear").html($rootScope.current_year);
  9113 +
8811 9114 }
8812   - else {
8813   - document.getElementById('imgPortrait').setAttribute("style", "width:80%");
8814   -
  9115 + else
  9116 + {
  9117 + console.log("waiting for print Data");
8815 9118 }
  9119 + }, 100);
8816 9120  
8817   - ResizeImage(0);
8818   -
8819   - document.getElementById('spnModulePor').innerHTML = curModule;
8820   - document.getElementById('spnBodyViewTitlePor').innerHTML = curPosture;
8821   - document.getElementById('spnModuleLan').innerHTML = curModule;
8822   - document.getElementById('spnBodyViewTitleLan').innerHTML = curPosture;
8823   - if ($('#printcontainer').length > 0) {
8824   - $("#printcontainer").css('width', $(window).outerWidth());
8825   - $("#printcontainer").css('height', $(window).outerHeight());
  9121 + $scope.stopPreview = function () {
  9122 + if (angular.isDefined(timeintval)) {
  9123 + $interval.cancel(timeintval);
  9124 + timeintval = undefined;
8826 9125 }
8827   -
8828   - $(".currentyear").html($rootScope.current_year);
8829   - }, 520);
  9126 + };
  9127 +
8830 9128 }
8831 9129  
8832 9130 }
... ... @@ -8837,18 +9135,25 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
8837 9135  
8838 9136 $scope.printImagePreview = function (event) {
8839 9137  
8840   - PrintDivContentByID('printBoxPor');
  9138 + if($('#printBoxPor').css('display') == 'none'){
  9139 + PrintDivContentByID('printBoxLan');
  9140 + }
  9141 + else
  9142 + {
  9143 + PrintDivContentByID('printBoxPor');
  9144 + }
8841 9145  
8842 9146 }
8843 9147  
8844 9148 function PrintDivContentByID(id) {
8845   - if (id == 'printBoxPor') {
8846   - $("#printPSOptions").val("100%");
8847   - ResizeImage(1);
  9149 + if (id == 'printBoxPor' ||id == 'printBoxLan') {
  9150 + $("#printPSOptions").val("75%");
  9151 + ResizeImage(0);
8848 9152 }
8849 9153 var contents;
8850 9154 $(document).ready(function () {
8851 9155 contents = document.getElementById(id).innerHTML;
  9156 +
8852 9157 });
8853 9158 var frame1 = $('<iframe />');
8854 9159 frame1[0].name = "frame1";
... ... @@ -8862,6 +9167,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
8862 9167 //Append the external CSS file.
8863 9168 frameDoc.document.write('<link href="content/css/print-Portrait.css" rel="stylesheet" type="text/css" />');
8864 9169 frameDoc.document.write('<link href="content/css/print-main.css" rel="stylesheet" type="text/css" />');
  9170 + frameDoc.document.write('<style> #dvPortrait {width:650px !important} #dvLandscape {width:650px !important} </style>');
8865 9171 //Append the DIV contents.
8866 9172 frameDoc.document.write(contents);
8867 9173 frameDoc.document.write('</body></html>');
... ... @@ -8870,7 +9176,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
8870 9176 window.frames["frame1"].focus();
8871 9177 window.frames["frame1"].print();
8872 9178 frame1.remove();
8873   - }, 500);
  9179 + }, 100);
8874 9180  
8875 9181 }
8876 9182  
... ... @@ -8903,7 +9209,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
8903 9209 left: 1,
8904 9210 },
8905 9211 controls: { buttons: 'closeonly' },
8906   - size: { width: $(window).outerWidth() - 20, height: $(window).outerHeight() + 60 },
  9212 + size: { width: $(window).outerWidth() - 20, height: $(window).outerHeight() +60},
8907 9213 });
8908 9214 }
8909 9215 $rootScope.getLocalStorageValue = function (localStorageParam) {
... ... @@ -9067,9 +9373,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
9067 9373 $(document).on('click', '#dvOpenResourcePanel .jsglyph-remove', function () {
9068 9374  
9069 9375 $("#HomeContainerDiv").css({ "display": "block", "pointer-events": "auto", "opacity": "1" });
9070   - $(".navbar-fixed-top").css({ "display": "block", "pointer-events": "auto", "opacity": "1" });
9071   - $("#topMenuBar").css({ "display": "block", "pointer-events": "auto", "opacity": "1" });
9072   -
  9376 +
9073 9377 $('#dvOpenResourcePanel').remove();
9074 9378 sessionStorage.removeItem('isModuleOpenByOpenResource');
9075 9379 $("#jsPanel-min-container").removeAttr("style");
... ... @@ -9124,7 +9428,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
9124 9428 },
9125 9429 function (error) {
9126 9430 console.log(' Error in sending mail to admin support = ' + error.statusText);
9127   - $rootScope.errorMessage = AdminConstants.ERROR_IN_SENDING_MAIL;
  9431 + $('#errorMessage').text(AdminConstants.ERROR_IN_SENDING_MAIL);
9128 9432 $("#messageModal").modal('show');
9129 9433 });
9130 9434 };
... ... @@ -9384,7 +9688,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
9384 9688 }),
9385 9689 function (error) {
9386 9690 console.log(' Error in export Image to databse = ' + error.statusText);
9387   - $rootScope.errorMessage = error;
  9691 + $('#errorMessage').text(error);
9388 9692 $("#messageModal").modal('show');
9389 9693 }
9390 9694  
... ... @@ -9456,7 +9760,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
9456 9760 }),
9457 9761 function (error) {
9458 9762 console.log(' Error in export Image to databse = ' + error.statusText);
9459   - $rootScope.errorMessage = error;
  9763 + $('#errorMessage').text(error);
9460 9764 $("#messageModal").modal('show');
9461 9765 }
9462 9766  
... ... @@ -9497,8 +9801,7 @@ function OpenResourcePanel(iframe) {
9497 9801 function closeIFrame() {
9498 9802 $('#dvOpenResourcePanel').remove();
9499 9803 $("#HomeContainerDiv").css({ "display": "block", "pointer-events": "auto", "opacity": "1" });
9500   - $(".navbar-fixed-top").css({ "display": "block", "pointer-events": "auto", "opacity": "1" });
9501   - $("#topMenuBar").css({ "display": "block", "pointer-events": "auto", "opacity": "1" });
  9804 +
9502 9805 }
9503 9806  
9504 9807 function AIAModuleOpenResourceInfo(windowData) {
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js
  View file @ffd462c
... ... @@ -92,6 +92,17 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
92 92 }
93 93 }
94 94  
  95 + // access from home controller
  96 + $rootScope.SetLabwindowData=function(windowviewid,keyname,data) {
  97 + for(var x=0 ;x < $rootScope.LEWindowData.length;x++){
  98 +
  99 + if($rootScope.LEWindowData[x].multiwinid==windowviewid)
  100 + {
  101 + $rootScope.LEWindowData[x][keyname]=data;
  102 + }
  103 + }
  104 + }
  105 +
95 106 $scope.DisableUI = function () {
96 107  
97 108 var leImagePanelConetent = document.getElementsByClassName("jsPanel-content");
... ... @@ -215,8 +226,8 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
215 226 "id": excercise.Slug,
216 227 "mType": 'LAB_EXERCISE',
217 228 "windowTitle": excercise.Topic,
218   - "size": { height: 500, width: 900 },
219   - "position": { x: 300, y: 110 }
  229 + "size": { height: 600, width: 900 },
  230 + "position": { x: 10, y: 30 }
220 231 };
221 232  
222 233 window.parent.AIAModuleOpenResourceInfo(LEopenData);
... ... @@ -241,9 +252,10 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
241 252 }
242 253  
243 254 $rootScope.InitializeLabExerciseMain = function () {
244   - $scope.DisableUI();
245 255 if ($rootScope.isCallFromOtherModule) {
246 256 $scope.LEModuleData = ModuleService.getModuleData("LAB_EXERCISE");
  257 + if($scope.LEModuleData.length<1) return;
  258 + $scope.DisableUI();
247 259 $scope.readyToLoad = true;
248 260 $rootScope.LEWindowLoadComplete = false;
249 261 $scope.wincount = 1;
... ... @@ -281,6 +293,7 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
281 293  
282 294 }
283 295 else {
  296 + $scope.DisableUI();
284 297 $scope.InitializeLabExercise(null);
285 298 }
286 299 }
... ... @@ -356,10 +369,12 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
356 369 if ($scope.leOpenInOtherModules.position.x < 20)
357 370 $scope.jsPanelLeft = 20;
358 371 $scope.jsPanelTop = $scope.leOpenInOtherModules.position.y;
359   -
  372 + if ($scope.leOpenInOtherModules.position.y < 35)
  373 + $scope.jsPanelTop = 35;
  374 +
360 375 if($location.url()!= "/curriculum-builder-detail") {
361   - $scope.jsPanelLeft = 1;
362   - $scope.jsPanelTop = $rootScope.cBModulejsPanelTop();
  376 + $scope.jsPanelLeft = 20;
  377 + $scope.jsPanelTop = 100;
363 378 }
364 379  
365 380 }
... ... @@ -391,6 +406,9 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
391 406 height: $scope.jsPanelHeight
392 407 },
393 408 onminimized:function (panel) {
  409 + var pnlName=panel[0].id;
  410 + var len = (pnlName).split("_").length;
  411 + var windowviewid = (pnlName).split("_")[len - 1];
394 412 var isAutoCalled = $scope.GetLEwindowStoreData(windowviewid, 'minmaxAutoEvent');
395 413 if(!isAutoCalled)
396 414 {
... ... @@ -400,6 +418,9 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
400 418 $scope.SetLEwindowStoreData(windowviewid, 'maximised',false);
401 419 },
402 420 onmaximized:function (panel) {
  421 + var pnlName=panel[0].id;
  422 + var len = (pnlName).split("_").length;
  423 + var windowviewid = (pnlName).split("_")[len - 1];
403 424 var isAutoCalled = $scope.GetLEwindowStoreData(windowviewid, 'minmaxAutoEvent');
404 425 if(!isAutoCalled)
405 426 {
... ... @@ -410,8 +431,12 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
410 431 var canvasDIvHeight = parseInt($('#labImagePanel_' + windowviewid).outerHeight()) - 15;
411 432 $('#LabView_' + windowviewid).css('height', canvasDIvHeight);
412 433 $('#panelbodyDiv_' + windowviewid).css("height",canvasDIvHeight-125);
  434 + $rootScope.resetMenuOptionOnClick(pnlName);
413 435 },
414 436 onnormalized:function (panel) {
  437 + var pnlName=panel[0].id;
  438 + var len = (pnlName).split("_").length;
  439 + var windowviewid = (pnlName).split("_")[len - 1];
415 440 var isAutoCalled = $scope.GetLEwindowStoreData(windowviewid, 'minmaxAutoEvent');
416 441 if(!isAutoCalled)
417 442 {
... ... @@ -422,27 +447,34 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
422 447 var canvasDIvHeight = parseInt($('#labImagePanel_' + windowviewid).outerHeight()) - 15;
423 448 $('#LabView_' + windowviewid).css('height', canvasDIvHeight);
424 449 $('#panelbodyDiv_' + windowviewid).css("height",canvasDIvHeight-125);
  450 + $rootScope.resetMenuOptionOnClick(pnlName);
425 451 },
426 452 resizable: {
427 453 stop: function (event, ui) {
428   - var len = (event.currentTarget.id).split("_").length;
429   - var windowviewid = (event.currentTarget.id).split("_")[len - 1];
  454 + var pnlName=event.currentTarget.id;
  455 + var len = (pnlName).split("_").length;
  456 + var windowviewid = (pnlName).split("_")[len - 1];
430 457 $scope.SetLEwindowStoreData(windowviewid, 'width', ui.size.width);
431 458 $scope.SetLEwindowStoreData(windowviewid, 'height', ui.size.height);
  459 + $scope.SetLEwindowStoreData(windowviewid, 'y', ui.position.top);
  460 + $scope.SetLEwindowStoreData(windowviewid, 'x', ui.position.left);
432 461 $rootScope.UnsaveCurriculum = true;
433 462 var canvasDIvHeight = parseInt($('#labImagePanel_' + windowviewid).outerHeight()) - 15;
434 463 $('#LabView_' + windowviewid).css('height', canvasDIvHeight);
435 464 $('#panelbodyDiv_' + windowviewid).css("height",canvasDIvHeight-125);
  465 + $rootScope.resetMenuOptionOnClick(pnlName);
436 466 }
437 467  
438 468 },
439 469 draggable: {
440 470 stop: function( event, ui ) {
441   - var len = (event.currentTarget.id).split("_").length;
442   - var windowviewid = (event.currentTarget.id).split("_")[len - 1];
  471 + var pnlName=event.currentTarget.id;
  472 + var len = (pnlName).split("_").length;
  473 + var windowviewid = (pnlName).split("_")[len - 1];
443 474 $scope.SetLEwindowStoreData(windowviewid, 'y', ui.position.top);
444 475 $scope.SetLEwindowStoreData(windowviewid, 'x', ui.position.left);
445 476 $rootScope.UnsaveCurriculum = true;
  477 + $rootScope.resetMenuOptionOnClick(pnlName);
446 478  
447 479 }
448 480 },
... ... @@ -1584,7 +1616,7 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
1584 1616  
1585 1617 console.log(' Error in saving lab exercise = ' + error.statusText);
1586 1618 $rootScope.isVisibleLogin = true;
1587   - $rootScope.errorMessage = error;
  1619 + $('#errorMessage').text(error);
1588 1620 $("#messageModal").modal('show');
1589 1621 $('#messageModal').css('z-index', '12000001');
1590 1622 }
... ... @@ -2214,7 +2246,7 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
2214 2246 else {
2215 2247 $rootScope.closeLabExEmailModel("", windowviewid);
2216 2248 var message = LoginConstants.MAIL_NOT_SENT
2217   - $rootScope.errorMessage = message;
  2249 + $('#errorMessage').text(message);
2218 2250 $("#messageModal").modal('show');
2219 2251 $('#messageModal').css('z-index', '12000001');
2220 2252 }
... ... @@ -2222,7 +2254,7 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
2222 2254 },
2223 2255 function (error) {
2224 2256 var message = LoginConstants.MAIL_NOT_SENT
2225   - $rootScope.errorMessage = message;
  2257 + $('#errorMessage').text(message);
2226 2258 $("#messageModal").modal('show');
2227 2259 $('#messageModal').css('z-index', '12000001');
2228 2260 console.log(error.statusText);
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/MyAnimationController.js
  View file @ffd462c
... ... @@ -69,6 +69,17 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
69 69 }
70 70 }
71 71  
  72 + // access from home controller
  73 + $rootScope.SetVideowindowData=function(windowviewid,keyname,data) {
  74 + for(var x=0 ;x < $rootScope.VideoWindowData.length;x++){
  75 +
  76 + if($rootScope.VideoWindowData[x].multiwinid==windowviewid)
  77 + {
  78 + $rootScope.VideoWindowData[x][keyname]=data;
  79 + }
  80 + }
  81 + }
  82 +
72 83 $scope.DisableUI = function () {
73 84  
74 85 var aniImagePanelConetent = document.getElementsByClassName("jsPanel-content");
... ... @@ -146,8 +157,9 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
146 157  
147 158 $rootScope.OpenMyAnimationViewMain = function () {
148 159 if ($rootScope.isCallFromOtherModule) {
149   - $scope.DisableUI();
150 160 $scope.VideoModuleData = ModuleService.getModuleData("MY_ANIMATIONS");
  161 + if($scope.VideoModuleData.length<1) return;
  162 + $scope.DisableUI();
151 163 $scope.readyToLoad = true;
152 164 $rootScope.VideoLoadComplete = false;
153 165 $scope.wincount = 1;
... ... @@ -256,21 +268,23 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
256 268 if ($rootScope.isCallFromOtherModule) {
257 269 // open JS panel for curriculum with define cornonate in CB jason
258 270 $scope.jsPanelWidth = $scope.VidOpenInOtherModules.size.width;//1000;
259   - if ($scope.VidOpenInOtherModules.size.width < 800)
260   - $scope.jsPanelWidth = 800;
  271 + if ($scope.VidOpenInOtherModules.size.width < 500)
  272 + $scope.jsPanelWidth = 500;
261 273  
262 274 $scope.jsPanelHeight = $scope.VidOpenInOtherModules.size.height;
263   - if ($scope.VidOpenInOtherModules.size.height > 360)
264   - $scope.jsPanelHeight = 360;
  275 + if ($scope.VidOpenInOtherModules.size.height < 400)
  276 + $scope.jsPanelHeight = 400;
265 277  
266 278 $scope.jsPanelLeft = $scope.VidOpenInOtherModules.position.x;
267 279 if ($scope.VidOpenInOtherModules.position.x < 20)
268 280 $scope.jsPanelLeft = 20;
269 281 $scope.jsPanelTop = $scope.VidOpenInOtherModules.position.y;
270   -
  282 + if ($scope.VidOpenInOtherModules.position.y < 35)
  283 + $scope.jsPanelTop = 35;
  284 +
271 285 if($location.url()!= "/curriculum-builder-detail") {
272   - $scope.jsPanelLeft = 1;
273   - $scope.jsPanelTop = $rootScope.cBModulejsPanelTop();
  286 + $scope.jsPanelLeft = 20;
  287 + $scope.jsPanelTop = 100;
274 288 }
275 289  
276 290 }
... ... @@ -318,6 +332,9 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
318 332 height: $scope.jsPanelHeight
319 333 },
320 334 onminimized:function (panel) {
  335 + var pnlName=panel[0].id;
  336 + var len = (pnlName).split("_").length;
  337 + var windowviewid = (pnlName).split("_")[len - 1];
321 338 var isAutoCalled = $scope.GetVideowindowStoreData(windowviewid, 'minmaxAutoEvent');
322 339 if(!isAutoCalled)
323 340 {
... ... @@ -327,6 +344,9 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
327 344 $scope.SetVideowindowStoreData(windowviewid, 'maximised',false);
328 345 },
329 346 onmaximized:function (panel) {
  347 + var pnlName=panel[0].id;
  348 + var len = (pnlName).split("_").length;
  349 + var windowviewid = (pnlName).split("_")[len - 1];
330 350 var isAutoCalled = $scope.GetVideowindowStoreData(windowviewid, 'minmaxAutoEvent');
331 351 if(!isAutoCalled)
332 352 {
... ... @@ -336,8 +356,12 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
336 356 $scope.SetVideowindowStoreData(windowviewid, 'minimised',false);
337 357 var canvasDIvHeight = $('#vidImagePanel_' + windowviewid+ " .jsPanel-content").height();
338 358 $('#playerinlineVideo_'+ windowviewid ).css("height",canvasDIvHeight-20 );
  359 + $rootScope.resetMenuOptionOnClick(pnlName);
339 360 },
340 361 onnormalized:function (panel) {
  362 + var pnlName=panel[0].id;
  363 + var len = (pnlName).split("_").length;
  364 + var windowviewid = (pnlName).split("_")[len - 1];
341 365 var isAutoCalled = $scope.GetVideowindowStoreData(windowviewid, 'minmaxAutoEvent');
342 366 if(!isAutoCalled)
343 367 {
... ... @@ -347,26 +371,33 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
347 371 $scope.SetVideowindowStoreData(windowviewid, 'maximised',false);
348 372 var canvasDIvHeight = $('#vidImagePanel_' + windowviewid+ " .jsPanel-content").height();
349 373 $('#playerinlineVideo_'+ windowviewid ).css("height",canvasDIvHeight-20 );
  374 + $rootScope.resetMenuOptionOnClick(pnlName);
350 375 },
351 376 resizable: {
352 377 stop: function (event, ui) {
353   - var len = (event.currentTarget.id).split("_").length;
354   - var windowviewid = (event.currentTarget.id).split("_")[len - 1];
  378 + var pnlName=event.currentTarget.id;
  379 + var len = (pnlName).split("_").length;
  380 + var windowviewid = (pnlName).split("_")[len - 1];
355 381 $scope.SetVideowindowStoreData(windowviewid, 'width', ui.size.width);
356 382 $scope.SetVideowindowStoreData(windowviewid, 'height', ui.size.height);
  383 + $scope.SetVideowindowStoreData(windowviewid, 'y', ui.position.top);
  384 + $scope.SetVideowindowStoreData(windowviewid, 'x', ui.position.left);
357 385 $rootScope.UnsaveCurriculum = true;
358 386 var canvasDIvHeight = $('#vidImagePanel_' + windowviewid+ " .jsPanel-content").height();
359   - $('#playerinlineVideo_'+ windowviewid ).css("height",canvasDIvHeight-20 );
  387 + $('#playerinlineVideo_'+ windowviewid ).css("height",canvasDIvHeight-10 );
  388 + $rootScope.resetMenuOptionOnClick(pnlName);
360 389 }
361 390  
362 391 },
363 392 draggable: {
364 393 stop: function( event, ui ) {
365   - var len = (event.currentTarget.id).split("_").length;
366   - var windowviewid = (event.currentTarget.id).split("_")[len - 1];
  394 + var pnlName=event.currentTarget.id;
  395 + var len = (pnlName).split("_").length;
  396 + var windowviewid = (pnlName).split("_")[len - 1];
367 397 $scope.SetVideowindowStoreData(windowviewid, 'y', ui.position.top);
368 398 $scope.SetVideowindowStoreData(windowviewid, 'x', ui.position.left);
369 399 $rootScope.UnsaveCurriculum = true;
  400 + $rootScope.resetMenuOptionOnClick(pnlName);
370 401 }
371 402 },
372 403  
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/MyPictureController.js
  View file @ffd462c
... ... @@ -160,9 +160,10 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
160 160 }
161 161  
162 162 $rootScope.OpenMyPictureViewMain = function () {
163   - $scope.DisableUI();
164 163 if ($rootScope.isCallFromOtherModule) {
165 164 $scope.PicModuleData = ModuleService.getModuleData("MY_PICTURES");
  165 + if($scope.PicModuleData.length<1) return;
  166 + $scope.DisableUI();
166 167 $scope.readyToLoad = true;
167 168 $rootScope.PicLoadComplete = false;
168 169 $scope.wincount = 1;
... ... @@ -262,15 +263,17 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
262 263 $scope.jsPanelHeight = $scope.picOpenInOtherModules.size.height;
263 264 if ($scope.picOpenInOtherModules.size.height < 540)
264 265 $scope.jsPanelHeight = 540;
265   -
  266 +
266 267 $scope.jsPanelLeft = $scope.picOpenInOtherModules.position.x;
267 268 if ($scope.picOpenInOtherModules.position.x < 20)
268 269 $scope.jsPanelLeft = 20;
269 270 $scope.jsPanelTop = $scope.picOpenInOtherModules.position.y;
270   -
  271 + if ($scope.picOpenInOtherModules.position.y < 35)
  272 + $scope.jsPanelTop = 35;
  273 +
271 274 if($location.url()!= "/curriculum-builder-detail") {
272   - $scope.jsPanelLeft = 1;
273   - $scope.jsPanelTop = $rootScope.cBModulejsPanelTop();
  275 + $scope.jsPanelLeft = 20;
  276 + $scope.jsPanelTop = 100;
274 277 }
275 278  
276 279 $scope.jsPanelPIC = $.jsPanel({
... ... @@ -297,6 +300,9 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
297 300 height: $scope.jsPanelHeight
298 301 },
299 302 onminimized:function (panel) {
  303 + var pnlName=panel[0].id;
  304 + var len = (pnlName).split("_").length;
  305 + var windowviewid = (pnlName).split("_")[len - 1];
300 306 var isAutoCalled = $scope.GetPICwindowStoreData(windowviewid, 'minmaxAutoEvent');
301 307 if(!isAutoCalled)
302 308 {
... ... @@ -306,6 +312,9 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
306 312 $scope.SetPICwindowStoreData(windowviewid, 'maximised',false);
307 313 },
308 314 onmaximized:function (panel) {
  315 + var pnlName=panel[0].id;
  316 + var len = (pnlName).split("_").length;
  317 + var windowviewid = (pnlName).split("_")[len - 1];
309 318 var isAutoCalled = $scope.GetPICwindowStoreData(windowviewid, 'minmaxAutoEvent');
310 319 if(!isAutoCalled)
311 320 {
... ... @@ -315,8 +324,12 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
315 324 $scope.SetPICwindowStoreData(windowviewid, 'minimised',false);
316 325 var canvasDIvHeight = $('#picImagePanel_' + windowviewid+ " .jsPanel-content").height();
317 326 $('#canvasDivPIC_' + windowviewid).css('height', canvasDIvHeight-5);
  327 + $rootScope.resetMenuOptionOnClick(pnlName);
318 328 },
319 329 onnormalized:function (panel) {
  330 + var pnlName=panel[0].id;
  331 + var len = (pnlName).split("_").length;
  332 + var windowviewid = (pnlName).split("_")[len - 1];
320 333 var isAutoCalled = $scope.GetPICwindowStoreData(windowviewid, 'minmaxAutoEvent');
321 334 if(!isAutoCalled)
322 335 {
... ... @@ -326,26 +339,33 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
326 339 $scope.SetPICwindowStoreData(windowviewid, 'maximised',false);
327 340 var canvasDIvHeight = $('#picImagePanel_' + windowviewid+ " .jsPanel-content").height();
328 341 $('#canvasDivPIC_' + windowviewid).css('height', canvasDIvHeight-5);
  342 + $rootScope.resetMenuOptionOnClick(pnlName);
329 343 },
330 344 resizable: {
331 345 stop: function (event, ui) {
332   - var len = (event.currentTarget.id).split("_").length;
333   - var windowviewid = (event.currentTarget.id).split("_")[len - 1];
  346 + var pnlName=event.currentTarget.id;
  347 + var len = (pnlName).split("_").length;
  348 + var windowviewid = (pnlName).split("_")[len - 1];
334 349 $scope.SetPICwindowStoreData(windowviewid, 'width', ui.size.width);
335 350 $scope.SetPICwindowStoreData(windowviewid, 'height', ui.size.height);
  351 + $scope.SetPICwindowStoreData(windowviewid, 'y', ui.position.top);
  352 + $scope.SetPICwindowStoreData(windowviewid, 'x', ui.position.left);
336 353 $rootScope.UnsaveCurriculum = true;
337 354 var canvasDIvHeight = $('#picImagePanel_' + windowviewid+ " .jsPanel-content").height();
338 355 $('#canvasDivPIC_' + windowviewid).css('height', canvasDIvHeight-5);
  356 + $rootScope.resetMenuOptionOnClick(pnlName);
339 357 }
340 358  
341 359 },
342 360 draggable: {
343 361 stop: function( event, ui ) {
344   - var len = (event.currentTarget.id).split("_").length;
345   - var windowviewid = (event.currentTarget.id).split("_")[len - 1];
  362 + var pnlName=event.currentTarget.id;
  363 + var len = (pnlName).split("_").length;
  364 + var windowviewid = (pnlName).split("_")[len - 1];
346 365 $scope.SetPICwindowStoreData(windowviewid, 'y', ui.position.top);
347 366 $scope.SetPICwindowStoreData(windowviewid, 'x', ui.position.left);
348 367 $rootScope.UnsaveCurriculum = true;
  368 + $rootScope.resetMenuOptionOnClick(pnlName);
349 369 }
350 370 },
351 371  
... ... @@ -376,8 +396,8 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
376 396 $('.jsPanel-content .jsPanel-theme-success').css('overflow-y', 'auto !important')
377 397  
378 398 if (!$rootScope.isCallFromOtherModule) {
379   - $('#PicView').css("height", $(window).outerHeight() - 65);
380   - $('#PicView').css("width", $(window).outerWidth() - 15);
  399 + $('#PicView').css("height", $(window).innerHeight()-100);
  400 + $('#PicView').css("width",$(window).innerWidth()-100);
381 401 }
382 402  
383 403 var canvasDIvHeight = $('#picImagePanel_' + windowviewid+ " .jsPanel-content").height();
... ... @@ -386,23 +406,38 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
386 406 var canvas = document.getElementById("canvasPIC_" + windowviewid);
387 407 var canvasPaint = document.getElementById("canvasPaintPIC_" + windowviewid);
388 408  
389   - canvas.height = canvasDIvHeight;
390   - canvasPaint.height = canvasDIvHeight
391 409 var $ua = navigator.userAgent;
392 410 if (($ua.match(/(iPod|iPhone|iPad|android)/i))) {
393 411 canvas.width = screen.width-20;
394 412 canvasPaint.width = screen.width-20;
  413 + canvas.height = screen.height-130;
  414 + canvasPaint.height = screen.height-130;
395 415 }
396 416 else
397 417 {
  418 + canvas.height = screen.height-280;
  419 + canvasPaint.height = screen.height-280;
398 420 canvas.width = screen.width-40;
399 421 canvasPaint.width = screen.width-40;
  422 + if($location.url()== "/curriculum-builder-detail") {
  423 + canvas.height = screen.height-300;
  424 + canvasPaint.height = screen.height-300;
  425 + canvas.width = screen.width-370;
  426 + canvasPaint.width = screen.width-370;
  427 + }
  428 +
400 429 }
401 430  
402 431 var openedImage = document.getElementById('mypic_' + windowviewid );
403 432 openedImage.src = selectedpicture;
404 433 openedImage.onload = function () {
405 434 $scope.JsPanelclick(windowviewid);
  435 + //some time get big size image
  436 + if(this.height>780)
  437 + {
  438 + canvas.height = this.height;
  439 + canvasPaint.height = this.height;
  440 + }
406 441  
407 442 var annotationData= $scope.picOpenInOtherModules.annotationData;
408 443 // load annotation
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
  View file @ffd462c
... ... @@ -354,7 +354,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
354 354 "windowTitle": moduleItemDataToBeSaved,
355 355 "scaleIndex":100,
356 356 "size": { height: 600, width: 900 },
357   - "position": { x: 300, y: 110 }
  357 + "position": { x: 10, y: 30 }
358 358 };
359 359  
360 360 window.parent.AIAModuleOpenResourceInfo(AAopenData);
... ... @@ -415,13 +415,14 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
415 415 var OpenItemImagePath = "../../../content/images/aa/images/" +OpenedTileData[3];
416 416 $scope.SetAAwindowStoreData(windowviewid,'OpenItemImagePath',OpenItemImagePath);
417 417 $rootScope.listArray.push({ "imageName": OpenItemImagePath, "text": moduleItemDataToBeSaved });
418   - $("#viewList").append("<div class='col-xs-12 text-center' style='padding-bottom:15px;' id='demoView'><div class='col-xs-12' style='padding:10px;background-color:#fff;'><div class='col-xs-2' style='border:1px solid #000;padding:5px;color:#000;font-size:12px;'><div class='thumbnail' style='margin-bottom:10px;'><img style='width:auto;height:115px!important;' src=" + OpenItemImagePath + "></div><div class='col-xs-12' id='demoText' style='padding:0;'>" + moduleItemDataToBeSaved + "</div></div></div><a id=" + moduleItemDataToBeSavedID + " style='position:absolute;right:30px;bottom:34px;' onclick='openCurrentView(event)' href='javascript:void(0)' class='pull-right btn btn-primary'>Open</a></div>");
  418 + $("#viewList").append("<div class='col-xs-12 text-center' style='padding-bottom:15px;' id='demoView'><div class='col-xs-12' style='padding:10px;background-color:#fff;height:178px'><div class='col-xs-2' style='border:1px solid #000;padding:5px;color:#000;font-size:12px;'><div class='thumbnail' style='margin-bottom:10px;'><img style='width:auto;height:115px!important;' src=" + OpenItemImagePath + "></div><div class='col-xs-12' id='demoText' style='padding:0;'>" + moduleItemDataToBeSaved + "</div></div></div><a id=" + moduleItemDataToBeSavedID + " style='position:absolute;right:30px;bottom:34px;' onclick='openCurrentView(event)' href='javascript:void(0)' class='pull-right btn btn-primary'>Open</a></div>");
419 419 }
420 420  
421 421 $rootScope.openAAModuleItemMain = function () {
422   - $scope.DisableUI();
423 422 if ($rootScope.isCallFromOtherModule) {
424 423 $scope.AAModuleData = ModuleService.getModuleData("ATLAS_ANATOMY");
  424 + if($scope.AAModuleData.length<1) return;
  425 + $scope.DisableUI();
425 426 $scope.readyToLoad=true;
426 427 $rootScope.AAWindowLoadComplete = false;
427 428 $scope.wincount=1;
... ... @@ -462,6 +463,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
462 463  
463 464 }
464 465 else {
  466 + $scope.DisableUI();
465 467 $scope.openModuleItem(null);
466 468 }
467 469 }
... ... @@ -587,7 +589,6 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
587 589 if (moduleName == ATLAS_ANATOMY) {
588 590  
589 591 jsContentURL = 'app/views/aa/atlas-anatomy-detail.html';
590   - // moduleItemViewDivId = 'aaDetailPageDiv';
591 592 $scope.jsPanelID = 'AAImagePanel' + '_' + windowviewid;
592 593 }
593 594 else if (moduleName == CLINICAL_ANIMATION) {
... ... @@ -611,10 +612,12 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
611 612 if ($scope.aaOpenInOtherModules.position.x < 20)
612 613 $scope.jsPanelLeft = 20;
613 614 $scope.jsPanelTop = $scope.aaOpenInOtherModules.position.y;
614   -
  615 + if ($scope.aaOpenInOtherModules.position.y < 35)
  616 + $scope.jsPanelTop = 35;
  617 +
615 618 if($location.url()!= "/curriculum-builder-detail") {
616   - $scope.jsPanelLeft = 1;
617   - $scope.jsPanelTop = $rootScope.cBModulejsPanelTop();
  619 + $scope.jsPanelLeft = 20;
  620 + $scope.jsPanelTop = 100;
618 621 }
619 622  
620 623 }
... ... @@ -648,6 +651,9 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
648 651 height: $scope.jsPanelHeight
649 652 },
650 653 onminimized:function (panel) {
  654 + var pnlName=panel[0].id;
  655 + var len = (pnlName).split("_").length;
  656 + var windowviewid = (pnlName).split("_")[len - 1];
651 657 var isAutoCalled = $scope.GetAAwindowStoreData(windowviewid, 'minmaxAutoEvent');
652 658 if(!isAutoCalled)
653 659 {
... ... @@ -657,6 +663,9 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
657 663 $scope.SetAAwindowStoreData(windowviewid, 'maximised',false);
658 664 },
659 665 onmaximized:function (panel) {
  666 + var pnlName=panel[0].id;
  667 + var len = (pnlName).split("_").length;
  668 + var windowviewid = (pnlName).split("_")[len - 1];
660 669 var isAutoCalled = $scope.GetAAwindowStoreData(windowviewid, 'minmaxAutoEvent');
661 670 if(!isAutoCalled)
662 671 {
... ... @@ -666,8 +675,12 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
666 675 $scope.SetAAwindowStoreData(windowviewid, 'minimised',false);
667 676 var canvasDIvHeight = $('#AAImagePanel_' + windowviewid+ " .jsPanel-content").height()-50;
668 677 $('#canvasAADiv_' + windowviewid).css('height', canvasDIvHeight);
  678 + $rootScope.resetMenuOptionOnClick(pnlName);
669 679 },
670 680 onnormalized:function (panel) {
  681 + var pnlName=panel[0].id;
  682 + var len = (pnlName).split("_").length;
  683 + var windowviewid = (pnlName).split("_")[len - 1];
671 684 var isAutoCalled = $scope.GetAAwindowStoreData(windowviewid, 'minmaxAutoEvent');
672 685 if(!isAutoCalled)
673 686 {
... ... @@ -677,26 +690,33 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
677 690 $scope.SetAAwindowStoreData(windowviewid, 'maximised',false);
678 691 var canvasDIvHeight = $('#AAImagePanel_' + windowviewid+ " .jsPanel-content").height()-50;
679 692 $('#canvasAADiv_' + windowviewid).css('height', canvasDIvHeight);
  693 + $rootScope.resetMenuOptionOnClick(pnlName);
680 694 },
681 695 resizable: {
682 696 stop: function (event, ui) {
683   - var len = (event.currentTarget.id).split("_").length;
684   - var windowviewid = (event.currentTarget.id).split("_")[len - 1];
  697 + var pnlName=event.currentTarget.id;
  698 + var len = (pnlName).split("_").length;
  699 + var windowviewid = (pnlName).split("_")[len - 1];
685 700 $scope.SetAAwindowStoreData(windowviewid, 'width', ui.size.width);
686 701 $scope.SetAAwindowStoreData(windowviewid, 'height', ui.size.height);
  702 + $scope.SetAAwindowStoreData(windowviewid, 'y', ui.position.top);
  703 + $scope.SetAAwindowStoreData(windowviewid, 'x', ui.position.left);
687 704 $rootScope.UnsaveCurriculum = true;
688 705 var canvasDIvHeight = $('#AAImagePanel_' + windowviewid+ " .jsPanel-content").height()-50;
689 706 $('#canvasAADiv_' + windowviewid).css('height', canvasDIvHeight);
  707 + $rootScope.resetMenuOptionOnClick(pnlName);
690 708 }
691 709  
692 710 },
693 711 draggable: {
694 712 stop: function( event, ui ) {
695   - var len = (event.currentTarget.id).split("_").length;
696   - var windowviewid = (event.currentTarget.id).split("_")[len - 1];
  713 + var pnlName=event.currentTarget.id;
  714 + var len = (pnlName).split("_").length;
  715 + var windowviewid = (pnlName).split("_")[len - 1];
697 716 $scope.SetAAwindowStoreData(windowviewid, 'y', ui.position.top);
698 717 $scope.SetAAwindowStoreData(windowviewid, 'x', ui.position.left);
699 718 $rootScope.UnsaveCurriculum = true;
  719 + $rootScope.resetMenuOptionOnClick(pnlName);
700 720 }
701 721 },
702 722  
... ... @@ -763,13 +783,15 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
763 783 $scope.loadAAModule = function (windowviewid) {
764 784  
765 785 if (!$rootScope.isCallFromOtherModule) {
766   - $('#aaBodyView').css("height", $(window).outerHeight() - 65);
767   - $('#aaBodyView').css("width", $(window).outerWidth() - 15);
  786 + // $('#aaBodyView').css("height", $(window).outerHeight() - 65);
  787 + // $('#aaBodyView').css("width", $(window).outerWidth() - 15);
  788 + $('#aaBodyView').css("height", $(window).innerHeight()-100);
  789 + $('#aaBodyView').css("width",$(window).innerWidth()-100);
768 790 }
769 791  
770 792 var canvasDIvHeight = $('#AAImagePanel_' + windowviewid+ " .jsPanel-content").height()-50;
771 793 $('#canvasAADiv_' + windowviewid).css('height', canvasDIvHeight);
772   - $('.canvasDivClass').css("height", canvasDIvHeight);
  794 + // $('.canvasDivClass').css("height", canvasDIvHeight);
773 795  
774 796 $scope.convertToZoomValue(windowviewid);
775 797  
... ... @@ -940,7 +962,8 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
940 962 }
941 963  
942 964 $scope.setControlsIDs = function (windowviewid) {
943   -
  965 +
  966 + $("#aaDetailPageDiv").attr("id", "aaDetailPageDiv_" + windowviewid);
944 967 $("#canvasDiv").attr("id", "canvasAADiv_" + windowviewid);
945 968 $("#canvas").attr("id", "canvasAA_" + windowviewid);
946 969 $("#canvasPaint").attr("id", "canvasPaintAA_" + windowviewid);
... ... @@ -1680,8 +1703,8 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1680 1703 }
1681 1704 else
1682 1705 {
1683   - $('#ListViewDiv').css({"height":"490","overflow":"scroll"});
1684   - $('#grid-view').css({"height":"720","overflow":"scroll"});
  1706 + $('#ListViewDiv').css({"height":"460","overflow":"scroll"});
  1707 + $('#grid-view').css({"height":"696","overflow":"scroll"});
1685 1708 }
1686 1709  
1687 1710 }
... ... @@ -3391,8 +3414,8 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
3391 3414  
3392 3415  
3393 3416 function refreshTermListOnSystemSel(bodySystemId) {
3394   -
3395   - var rootScope = angular.element(document.getElementById("aaDetailPageDiv")).scope();
  3417 + var windowviewid = (bodySystemId).split("_")[1];
  3418 + var rootScope = angular.element(document.getElementById("aaDetailPageDiv_"+windowviewid)).scope();
3396 3419 rootScope.$apply(function () {
3397 3420 rootScope.refreshTermListOnAASystemSelection(bodySystemId);
3398 3421 });
... ...
400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js
  View file @ffd462c
... ... @@ -539,15 +539,30 @@ AIA.constant(&quot;UserModules&quot;, [
539 539  
540 540  
541 541 AIA.constant("AIAConstants", {
  542 + "File_API_Not_Supported": "The file API isn't supported on this browser yet.",
  543 + "File_No_Content_Found": "File couldn't find the element.",
  544 + "Browser_Not_Supported": "This browser doesn't seem to support the `files` property of file inputs.",
  545 + "Select_File": "Please select a file before clicking 'Load'.",
  546 + "Image_File_Format_Not_Supported": "This image file not supported 'jpg/jpeg or png' format.\n Please try again.",
  547 + "Animation_File_Size_Exceeded": "This Animation video size not allow more than 10MB.\n Please try again.",
  548 + "Animation_File_Format_Not_Supported": "This Animation video not supported mp4 format.\n Please try again.",
  549 + "CB_Password_Empty": "Password field is empty. Please try again.",
  550 + "CB_Password_Not_Match": "Password is not matched. Please try again.",
  551 + "CB_Password_Required": "password required.",
  552 + "CB_Confirm_Password": "confirm password required.",
  553 + "CB_Confirm_Password_Not_Match": "confirm password not matched.",
  554 + "CB_Add_Slide_First": "Please add slide first to export this section.",
  555 + "CB_Curriculum_Name_Empty": "Curriculum name is empty!",
  556 +
542 557 "NO_BODY_SYSTEM_AVAILABLE": "Selected body system is not available on this layer.",
543 558 "COOKIES_MESSAGE": "You need to enable your browser's cookies to run this application.",
544 559 "SAVED_LAB_EXERCISE_NOT_FOUND": "Saved Lab Exercise not found.",
545 560 "ERROR_IN_FECTHING_DETAILS": "Error in fecthing details.",
546 561 "PLEASE_ENTER_SEARCH_TEXT": "Please enter the text to search.",
547 562 "SETTINGS_SAVED": "Your current settings has been saved.",
548   - "SETTING_SAVE_ERROR":"There is some error in saving your current settings. Please try after sometime.",
549   - "SAVE_ANIMATION_ERROR":"There is some error while saving your animation. Please try after sometime.",
550   - "CB_FILE_FORMAT_ISSUE":"This Curriculum file is not supported! Please try again.",
  563 + "SETTING_SAVE_ERROR":"There is some error in saving your current settings.\n Please try after sometime.",
  564 + "SAVE_ANIMATION_ERROR":"There is some error while saving your animation.\n Please try after sometime.",
  565 + "CB_FILE_FORMAT_ISSUE":"This Curriculum file is not supported. Please try again.",
551 566 "CONVERT_CB_OLD_TO_NEW_ISSUE":"The system detected some legacy functionality in the selected curriculum that cannot be fully converted to the new format (.json). Please consider recreating the curriculum using the newer version of the curriculum builder, or contact ADAM.\nDo you want to proceed with the conversion?",
552 567 "OPEN_CB_OLD_TO_NEW_ISSUE":"The selected curriculum is in a legacy format. The system detected some legacy functionality in the curriculum that cannot be completely converted to the new format (.json), and it may not work correctly. Please consider recreating the curriculum using the newer version of the curriculum builder, or contact ADAM.\nDo you want to continue to open the curriculum?",
553 568 "IMPORT_CB_OLD_TO_NEW_ISSUE":"The selected curriculum is in a legacy format. The system detected some legacy functionality in the curriculum that cannot be completely converted to the new format (.json), and it may not work correctly. Please consider recreating the curriculum using the newer version of the curriculum builder, or contact ADAM.\nDo you want to continue to import the curriculum?",
... ...
400-SOURCECODE/AIAHTML5.Web/app/services/AuthenticationService.js
  View file @ffd462c
... ... @@ -16,7 +16,7 @@
16 16 deferred.reject(data);
17 17 $rootScope.isVisibleLogin = true;
18 18 $rootScope.LoginEnableUI();
19   - $rootScope.errorMessage = data;
  19 + $('#errorMessage').text(data);
20 20 $("#messageModal").modal('show');
21 21  
22 22 });
... ... @@ -37,7 +37,7 @@
37 37 }).error(function (data, status, headers, config) {
38 38 console.log('error')
39 39 deferred.reject(data);
40   - $rootScope.errorMessage = data;
  40 + $('#errorMessage').text( data);
41 41 $("#messageModal").modal('show');
42 42  
43 43 });
... ... @@ -59,7 +59,7 @@
59 59 $rootScope.isVisibleLogin = true;
60 60 $rootScope.LoginEnableUI();
61 61 deferred.reject(data);
62   - $rootScope.errorMessage = data;
  62 + $('#errorMessage').text(data);
63 63 $("#messageModal").modal('show');
64 64  
65 65 });
... ... @@ -80,9 +80,7 @@
80 80 }).error(function (data, status, headers, config) {
81 81 console.log('error')
82 82 deferred.reject(data);
83   - // $rootScope.errorMessage = data;
84   - // $("#messageModal").modal('show');
85   -
  83 +
86 84 });
87 85 return deferred.promise;
88 86 },
... ... @@ -105,7 +103,7 @@
105 103 $('#modal-settings').css("display", "none");
106 104 $('#modelsettingsbackground').css('zIndex', '12000000');
107 105 $("#modelsettingsbackground").css("display", "none");
108   - $rootScope.errorMessage = data;
  106 + $('#errorMessage').text(data);
109 107 $("#messageModal").modal('show');
110 108  
111 109 });
... ... @@ -149,7 +147,7 @@
149 147 deferred.reject(data);
150 148 $rootScope.isVisibleLogin = true;
151 149 $rootScope.LoginEnableUI();
152   - $rootScope.errorMessage = data;
  150 + $('#errorMessage').text(data);
153 151 $("#messageModal").modal('show');
154 152  
155 153 });
... ... @@ -173,7 +171,7 @@
173 171 deferred.reject(data);
174 172  
175 173 $rootScope.isVisibleLogin = true;
176   - $rootScope.errorMessage = data;
  174 + $('#errorMessage').text(data);
177 175 $("#messageModal").modal('show');
178 176 });
179 177 return deferred.promise;
... ... @@ -195,7 +193,7 @@
195 193 deferred.reject(data);
196 194  
197 195 $rootScope.isVisibleLogin = true;
198   - $rootScope.errorMessage = data;
  196 + $('#errorMessage').text(data);
199 197 $("#messageModal").modal('show');
200 198 });
201 199 return deferred.promise;
... ... @@ -217,7 +215,7 @@
217 215 deferred.reject(data);
218 216  
219 217 $rootScope.isVisibleLogin = true;
220   - $rootScope.errorMessage = data;
  218 + $('#errorMessage').text(data);
221 219 $("#messageModal").modal('show');
222 220 });
223 221 return deferred.promise;
... ... @@ -239,7 +237,7 @@
239 237 deferred.reject(data);
240 238  
241 239 $rootScope.isVisibleLogin = true;
242   - $rootScope.errorMessage = data;
  240 + $('#errorMessage').text(data);
243 241 $("#messageModal").modal('show');
244 242 });
245 243 return deferred.promise;
... ...
400-SOURCECODE/AIAHTML5.Web/app/services/LabExerciseService.js
  View file @ffd462c
... ... @@ -19,7 +19,7 @@
19 19 console.log('error')
20 20 deferred.reject(data);
21 21 $rootScope.isVisibleLogin = true;
22   - $rootScope.errorMessage = data;
  22 + $('#errorMessage').text(data);
23 23 $("#messageModal").modal('show');
24 24  
25 25 });
... ... @@ -43,7 +43,7 @@
43 43 console.log('error')
44 44 deferred.reject(data);
45 45 $rootScope.isVisibleLogin = true;
46   - $rootScope.errorMessage = data;
  46 + $('#errorMessage').text(data);
47 47 $("#messageModal").modal('show');
48 48  
49 49 });
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/3dA/3d-anatomy-details.html
  View file @ffd462c
1 1 <div>
2 2 <div ng-include="aap/widget/MainMenu.html"></div>
3 3 <div ng-init="Open3DModelBodyMain()" id="ThreeDView" class="threeDView" ng-controller="3dAController"></div>
4   -</div>
5 4 \ No newline at end of file
  5 +</div>
  6 +<div id="tdparentcustomDiv"></div>
6 7 \ No newline at end of file
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/Home/printPreview.html
  View file @ffd462c
... ... @@ -42,8 +42,8 @@
42 42 <span class="pull-right font12 span-font" id="spnBodyViewTitlePor"></span>
43 43 </div>
44 44 </div>
45   - <div class=" mar-top-25" align="center" id="dvPortrait" style="text-align: center;">
46   - <img src="" alt="" class="logo-image img-responsive" id="imgPortrait" style="width: 90%; " />
  45 + <div class=" mar-top-25" id="dvPortrait" align="center">
  46 + <img src="" alt="" class="logo-image img-responsive" id="imgPortrait" style="width: 100%; " />
47 47 </div>
48 48 <div>
49 49 <div class="pp-col-sm-4" style="position: absolute; bottom: 20px;">
... ... @@ -67,7 +67,7 @@
67 67 <span class="pull-right font12 span-font" id="spnBodyViewTitleLan"></span>
68 68 </div>
69 69 </div>
70   - <div class="" id="dvLandscape" align="center">
  70 + <div class="" id="dvLandscape" align="center" style="left: 50%;-ms-transform: translateX(-50%);transform: translateX(-50%);">
71 71 <img src="" alt="" class="logo-image img-responsive" id="imgLandscape" style="width: 100%;" />
72 72 </div>
73 73 <div class="print-footer-land">
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/LabExerc/lab-exercise-view.html
  View file @ffd462c
1 1 <div>
2 2 <div ng-include="aap/widget/MainMenu.html"></div>
3 3 <div ng-init="InitializeLabExerciseMain()" id="labBodyview" class="labBodyView" ng-controller="LabExercController"></div>
4   -</div>
5 4 \ No newline at end of file
  5 +</div>
  6 +<div id="labparentcustomDiv"></div>
6 7 \ No newline at end of file
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/MyAnimation/MyAnimation.html
  View file @ffd462c
1 1 <div>
2 2 <div ng-include="aap/widget/MainMenu.html"></div>
3 3 <div ng-init="OpenMyAnimationViewMain()" id="VideoView" class="videoView" ng-controller="MyAnimationController" style=" "></div> <!--position: absolute !important;-->
4   - <style>
5   - .jsPanel-content.jsPanel-theme-success {
6   - overflow-y: auto !important;
7   - }
8   - </style>
9 4 </div>
10 5 \ No newline at end of file
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/MyPicture/MyPicture.html
  View file @ffd462c
1 1 <div>
2 2 <div ng-include="aap/widget/MainMenu.html"></div>
3 3 <div ng-init="OpenMyPictureViewMain()" id="PicView" class="picView" ng-controller="MyPictureController" style=" "></div> <!--position: absolute !important;-->
4   - <style>
5   - .jsPanel-content.jsPanel-theme-success {
6   - overflow-y: auto !important;
7   - }
8   - </style>
9 4 </div>
10 5 \ No newline at end of file
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/aa/atlas-anatomy-detail.html
  View file @ffd462c
... ... @@ -144,7 +144,7 @@
144 144 <div class="container-fluid">
145 145 <div class="row">
146 146  
147   - <div class="img-thumbnail canvasDivClass" id="canvasDiv" style="overflow: scroll;width:100%;position:relative">
  147 + <div class="img-thumbnail" id="canvasDiv" style="overflow: scroll;width:100%;position:relative">
148 148 <canvas id="canvasPaint" ng-click="FreeStylePaint($event)" width="2277" height="1024" class="canvas-annotationStyle1"></canvas>
149 149 <canvas id="canvas" width="2277" height="1024" class="canvas-annotationStyle"></canvas>
150 150  
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/aa/module-item-view.html
  View file @ffd462c
1 1 <div>
2 2 <div ng-include="aap/widget/MainMenu.html"></div>
3 3 <div ng-init="openAAModuleItemMain()" id="aaBodyView" class="aaBodyView" ng-controller="TileViewListController"></div>
4   - <!--<div >
5   -
6   - </div>-->
7 4 </div>
  5 +<div id="aaparentcustomDiv"></div>
8 6 \ No newline at end of file
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/aa/tile-view.html
  View file @ffd462c
... ... @@ -114,7 +114,7 @@
114 114 </table>
115 115 </div>
116 116 <!--</div>-->
117   - <div class="col-sm-12" ng-show="hiderow" style="padding-left:25px;padding-top:10px;">
  117 + <div class="col-sm-12" ng-show="hiderow" style="padding-left:25px;padding-top:10px;height:174px">
118 118 <div class="row well">
119 119 <div title="{{SelectedAATitle}}" class="col-sm-3 col-lg-2 no-padding">
120 120 <div class="thumbnail no-margin">
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/ai/adam-images-detail.html
  View file @ffd462c
1 1 <div>
2 2 <div ng-include="aap/widget/MainMenu.html"></div>
3 3 <div ng-init="OpenAdamImageViewMain()" id="AIView" class="aiView" ng-controller="AIController" style=" "></div> <!--position: absolute !important;-->
4   - <style>
5   - .jsPanel-content.jsPanel-theme-success {
6   - overflow-y: auto !important;
7   - }
8   - </style>
9 4 </div>
  5 +<div id="aiparentcustomDiv"></div>
10 6 \ No newline at end of file
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/ai/ai-view.html
  View file @ffd462c
... ... @@ -81,7 +81,7 @@
81 81 </tbody>
82 82 </table>
83 83 </div>
84   - <div class="col-xs-12 text-center" ng-show="hiderow" style="padding-left:25px;">
  84 + <div class="col-xs-12 text-center" ng-show="hiderow" style="padding-left:25px;height:174px">
85 85 <div class="row well" style="margin-bottom: 0px;">
86 86 <div title="{{SelectedAITitle}}" class="col-sm-3 col-lg-2 no-padding">
87 87 <div class="thumbnail no-margin">
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/ca/ca-view.html
  View file @ffd462c
... ... @@ -105,7 +105,7 @@
105 105 </tbody>
106 106 </table>
107 107 </div>
108   - <div class="col-xs-12 text-center" ng-show="hiderow" style="padding-left:25px;">
  108 + <div class="col-xs-12 text-center" ng-show="hiderow" style="padding-left:25px;height:174px">
109 109 <div class="row well" style="margin-bottom: 0px;">
110 110 <div title="{{SelectedCATitle}}" class="col-sm-3 col-lg-2 no-padding">
111 111 <div class="thumbnail no-margin">
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/ca/clinical-animations-detail.html
  View file @ffd462c
... ... @@ -2,3 +2,4 @@
2 2 <div ng-include="aap/widget/MainMenu.html"></div>
3 3 <div ng-init="openCABodyViewMain()" id="CAView" class="caView" ng-controller="CAController"></div>
4 4 </div>
  5 +<div id="caparentcustomDiv"></div>
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/ci/ci-view.html
  View file @ffd462c
... ... @@ -131,7 +131,7 @@
131 131 </table>
132 132 </div>
133 133  
134   - <div class="col-xs-12 text-center" ng-show="hiderow" style="padding-left:25px;">
  134 + <div class="col-xs-12 text-center" ng-show="hiderow" style="padding-left:25px;height:174px">
135 135 <div class="row well" style="margin-bottom: 0px;">
136 136 <div title="{{SelectedCITitle}}" class="col-sm-3 col-lg-2 no-padding">
137 137 <div class="thumbnail no-margin">
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/ci/clinical-illustrations-detail.html
  View file @ffd462c
1 1 <div>
2 2 <div ng-include="aap/widget/MainMenu.html"></div>
3   - <div ng-init="openCIBodyViewMain()" id="CIView" class="ciView" ng-controller="CIController" style=" "></div> <!--position: absolute !important;-->
4   -
5   -
  3 + <div ng-init="openCIBodyViewMain()" id="CIView" class="ciView" ng-controller="CIController" style=" "></div> <!--position: absolute !important;-->
6 4 </div>
  5 +<div id="ciparentcustomDiv"></div>
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/da/da-body-view.html
  View file @ffd462c
1 1 <div>
2 2 <div ng-include="aap/widget/MainMenu.html"></div>
3 3 <div ng-init="openDABodyViewMain()" id="daBodyview" class="daBodyView" ng-controller="DAController"></div>
4   - <!--<div >
5   -
6   - </div>-->
7   -</div>
8 4 \ No newline at end of file
  5 +</div>
  6 +<div id="daparentcustomDiv"></div>
9 7 \ No newline at end of file
... ...
400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html
  View file @ffd462c
... ... @@ -20,6 +20,12 @@
20 20 <li id="printAVAnchor"><a href="" data-toggle="modal" ng-click="ShowPrintWindow()">Print Active Viewer</a></li>
21 21 <li id="printAllAVAnchor"><a href="#" data-toggle="modal" ng-click="ShowAllPrintWindow()">Print All Open Viewers</a></li>
22 22 <li id="printPreviewAnchor"><a href="" data-toggle="modal" ng-click="ShowPrintPreviewWindow()">Print Preview</a></li>
  23 + <li id="arragePannel"><a href="#" role="button" aria-haspopup="true" aria-expanded="false" > Arrange Window <span class="caret"></span></a>
  24 + <ul class="dropdown-content">
  25 + <li><a href="#" ng-click="arrangeCascadePanel()">Cascade View</a></li>
  26 + <li><a href="#" ng-click="arrangeTiledPanel()">Tiled View</a></li>
  27 + </ul>
  28 + </li>
23 29 </ul>
24 30 </li>
25 31 <!--#7904-->
... ...
400-SOURCECODE/AIAHTML5.Web/index.aspx
  View file @ffd462c
... ... @@ -1377,7 +1377,8 @@
1377 1377 </div>
1378 1378 <div class="modal-body" style=" height: 160px; overflow-x: auto;">
1379 1379 <div class="panel-body">
1380   - <div style="font-size: 15px;float: left;text-align: left;" data-ng-bind="errorMessage"></div>
  1380 + <div id="errorMessage" style="font-size: 15px;float: left;text-align: left;white-space: pre-wrap;">
  1381 + </div>
1381 1382 </div>
1382 1383 </div>
1383 1384 <div class="modal-footer ui-draggable-handle" style="background-color: #f1e8e8;">
... ...
400-SOURCECODE/AIAHTML5.Web/libs/jquery/jquery_plugin/jsPanel/jspanel/jquery.jspanel.js
  View file @ffd462c
... ... @@ -859,10 +859,10 @@ var jsPanel = {
859 859 var currentController = panel.option.currentController;
860 860 if (pathname == "/curriculum-builder-detail")
861 861 {
862   - var ht=$("#cbdivarea").height()-100;
  862 + var ht=$("#cbdivarea").height()-60;
863 863 var wt= $("#cbdivarea").width();
864 864 panel.css({
865   - top: parseInt(80),
  865 + top: parseInt(35),
866 866 left:parseInt(10),
867 867 width: wt,
868 868 height:ht,
... ...
400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
  View file @ffd462c
... ... @@ -1453,8 +1453,24 @@ footer .browserIcons
1453 1453  
1454 1454 filter: Alpha(opacity=50); /* IE8 and earlier */
1455 1455 }
  1456 +#arragePannel:hover > .dropdown-content {
  1457 + display: block;
  1458 + }
  1459 + .dropdown-content {
  1460 + display: none;
  1461 + min-width: 160px;
  1462 + color:black;
  1463 + }
  1464 +.dropdown-content a {
  1465 + padding: 3px 0px;
  1466 + text-decoration: none;
  1467 + display: block;
  1468 + color:black;
  1469 + }
  1470 + .dropdown-content a:hover {
  1471 + background-color: #0095da;
  1472 + }
1456 1473  
1457   -
1458 1474 #cbModelRenameId
1459 1475 {
1460 1476 display:none;
... ...