ADAM / AIAHTML5

Commit 855166ba98c94e2a5edc5b338cee18f78e880b08

Authored by Birendra
1 parent 607d0cb9

fix some ui issue in all modules

Inline Side-by-side
Showing 14 changed files with 984 additions and 530 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/AIController.js
  View file @855166b
... ... @@ -1115,11 +1115,10 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
1115 1115 }
1116 1116  
1117 1117 $scope.jsPanelID = 'aiImagePanel' + '_' + windowviewid;
1118   - var selectedCIImage = $scope.GetAIwindowStoreData(windowviewid, 'AIImagePath');
  1118 + var selectedAIImage = $scope.GetAIwindowStoreData(windowviewid, 'AIImagePath');
1119 1119  
1120 1120 var tittle = $scope.GetAIwindowStoreData(windowviewid, 'currentViewTitle');
1121   - var imageId = $scope.GetAIwindowStoreData(windowviewid, 'imageId');
1122   -
  1121 +
1123 1122 if ($rootScope.isCallFromOtherModule) {
1124 1123 // open JS panel for curriculum with define cornonate in CB jason
1125 1124 $scope.jsPanelWidth = $scope.aiOpenInOtherModules.size.width;//1000;
... ... @@ -1139,23 +1138,25 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
1139 1138 }
1140 1139 else {
1141 1140 $scope.jsPanelWidth = $(window).outerWidth() - 30;
1142   - $scope.jsPanelHeight = $(window).outerHeight() - 125;
  1141 + $scope.jsPanelHeight = $(window).outerHeight() - 150;
1143 1142 $scope.jsPanelLeft = 15;
1144 1143 $scope.jsPanelTop = 70;
1145 1144 }
1146 1145  
1147   - if (selectedCIImage.length > 0) {
  1146 + if (selectedAIImage.length > 0) {
1148 1147 $scope.jsPanelAI = $.jsPanel({
1149 1148 id: $scope.jsPanelID,
1150 1149 selector: '.aiView',
1151 1150 theme: 'success',
1152 1151 currentController: 'AIController',
1153 1152 parentSlug: $scope.GetAIwindowStoreData(windowviewid, 'parentSlugName'),
1154   - content: '<div class="row" id="canvasDivAI_' + windowviewid + '"><canvas id="canvasPaintAI_' + windowviewid + '" ng-click="FreeStylePaint($event)" width="2277" height="800" class="canvas-annotationStyle1" style="position: absolute;z-index:0;left:0px"></canvas><canvas id="canvasAI_' + windowviewid + '" ng-click="onDrawingCanvasClick($event)" width="2277" height="800" class="canvas-annotationStyle" style="position: absolute; background-color: transparent;z-index:1;left:0px "></canvas>' +
1155   - '<div class="col-sm-12 img-thumbnail" align="center">' +
1156   - '<img src="' + selectedCIImage + '" id="aimage" alt="" title="" class="img-responsive " style="height:80%;">' +
1157   -
1158   - '</div></div>',
  1153 + content: '<div class="col-sm-12">'+
  1154 + ' <div class="container-fluid">'+
  1155 + ' <div class="row">'+
  1156 + '<div class=" col-sm-12 img-thumbnail" style="overflow: scroll;" id="canvasDivAI_' + windowviewid + '" ><canvas id="canvasPaintAI_' + windowviewid + '" ng-click="FreeStylePaint($event)" width="2270" height="800" class="canvas-annotationStyle1" style="position: absolute;z-index:0;left:0px"></canvas><canvas id="canvasAI_' + windowviewid + '" ng-click="onDrawingCanvasClick($event)" width="2270" height="800" class="canvas-annotationStyle" style="position: absolute; background-color: transparent;z-index:1;left:0px "></canvas>' +
  1157 + '<img id="aimage_' + windowviewid + '" alt="" title="" style="left:0px;top:0px;position:absolute;visibility:hidden">' +
  1158 + '</div>'+
  1159 + '</div></div></div>',
1159 1160  
1160 1161 title: tittle,
1161 1162 position: {
... ... @@ -1201,6 +1202,8 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
1201 1202 $scope.SetAIwindowStoreData(windowviewid, 'width', ui.size.width);
1202 1203 $scope.SetAIwindowStoreData(windowviewid, 'height', ui.size.height);
1203 1204 $rootScope.UnsaveCurriculum = true;
  1205 + var canvasDIvHeight = $('#aiImagePanel_' + windowviewid+ " .jsPanel-content").height();
  1206 + $('#canvasDivAI_' + windowviewid).css('height', canvasDIvHeight);
1204 1207 }
1205 1208  
1206 1209 },
... ... @@ -1216,7 +1219,6 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
1216 1219  
1217 1220 });
1218 1221  
1219   - $('#canvasDivAI_' + windowviewid + ' img').load(function () {
1220 1222 var isMaximize = $scope.GetAIwindowStoreData(windowviewid, 'maximised');
1221 1223 var isMinimize = $scope.GetAIwindowStoreData(windowviewid, 'minimised');
1222 1224 if (isMaximize) {
... ... @@ -1234,53 +1236,67 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
1234 1236 $scope.SetAIwindowStoreData(windowviewid, 'x', $scope.jsPanelLeft);
1235 1237 $scope.SetAIwindowStoreData(windowviewid, 'width', $scope.jsPanelWidth);
1236 1238 $scope.SetAIwindowStoreData(windowviewid, 'height', $scope.jsPanelHeight);
1237   - $scope.EnableUI();
1238   - $scope.JsPanelclick(windowviewid);
1239 1239  
1240   - var canvas = document.getElementById("canvasAI_" + windowviewid);
1241   - var canvasPaint = document.getElementById("canvasPaintAI_" + windowviewid);
1242   -
1243   - var canvasDIvHeight = $("#" + $scope.jsPanelID + " .jsPanel-content").height();
1244   -
1245   - $('#canvasDivAI_' + windowviewid).css('height', canvasDIvHeight);
1246   - $("#" + $scope.jsPanelID + " .img-thumbnail").css("height", canvasDIvHeight);
1247   -
1248   - canvas.height = canvasDIvHeight;
1249   - canvasPaint.height = canvasDIvHeight;
1250   - if ($rootScope.isCallFromOtherModule) {
1251   - var annotationData= $scope.aiOpenInOtherModules.annotationData;
1252   - // load annotation
1253   - if(annotationData!="" && annotationData!=undefined)
1254   - {
1255   - if(annotationData.shapeStates.length>0||annotationData.paintCanvasState.length>0)
1256   - {
1257   - //first draw shape and then store in object
1258   - $rootScope.LoadCBSavedAnnotation("canvasAI_"+windowviewid,"canvasPaintAI_"+windowviewid,annotationData);
1259   - }
1260   - }
1261   -
1262   - }
1263   - $rootScope.AIWindowLoadComplete = true;
1264   - });
1265   -
1266   - $scope.SetAIwindowStoreData(windowviewid, 'currentSlug', 'adam-images-detail');
1267   - $rootScope.openViews.push(
1268   - {
1269   - "module": $rootScope.currentActiveModuleTitle, "bodyView": tittle, "state": 'max', "BodyViewId": imageId,
1270   - "slug": $scope.GetAIwindowStoreData(windowviewid, 'currentSlug')
1271   - });
1272   -
1273   -
  1240 + $timeout(function () {
  1241 +
1274 1242 $('.jsPanel-content .jsPanel-theme-success').css('overflow-y', 'auto !important')
1275   -
  1243 + var canvasDIvHeight = $('#aiImagePanel_' + windowviewid+ " .jsPanel-content").height();
1276 1244 // console.log($rootScope.OpenAdamImages);
1277 1245 $('#AIView').css("height", $(window).outerHeight() - 65);
1278 1246  
1279 1247 $('#AIView').css("width", $(window).outerWidth() - 15);
  1248 +
  1249 + $('#canvasDivAI_' + windowviewid).css('height', canvasDIvHeight);
  1250 +
  1251 + if (!$rootScope.isCallFromOtherModule) {
  1252 + var canvas = document.getElementById("canvasAI_" + windowviewid);
  1253 + var canvasPaint = document.getElementById("canvasPaintAI_" + windowviewid);
  1254 +
  1255 + canvas.height = canvasDIvHeight-20;
  1256 + canvasPaint.height = canvasDIvHeight-20;
  1257 + canvas.width = screen.width-70;
  1258 + canvasPaint.width = screen.width-70;
  1259 + }
1280 1260  
  1261 +
  1262 + $scope.SetAIwindowStoreData(windowviewid, 'currentSlug', 'adam-images-detail');
  1263 + var openedImage = document.getElementById('aimage_' + windowviewid );
  1264 + openedImage.src = selectedAIImage;
  1265 + openedImage.onload = function () {
  1266 + if (!$rootScope.isCallFromOtherModule) {
  1267 + $("#aimage_"+windowviewid).css("left", (screen.width-this.width-70)/2 + "px");
  1268 + }
  1269 + $("#aimage_"+windowviewid).css("visibility","visible");
  1270 + // $("#aimage_"+windowviewid).css("width", this.width + "px");
  1271 + // $("#aimage_"+windowviewid).css("height", this.height + "px");
  1272 +
  1273 +
  1274 + $scope.JsPanelclick(windowviewid);
  1275 +
  1276 + if ($rootScope.isCallFromOtherModule) {
  1277 + var annotationData= $scope.aiOpenInOtherModules.annotationData;
  1278 + // load annotation
  1279 + if(annotationData!="" && annotationData!=undefined)
  1280 + {
  1281 + if(annotationData.shapeStates.length>0||annotationData.paintCanvasState.length>0)
  1282 + {
  1283 + //first draw shape and then store in object
  1284 + $rootScope.LoadCBSavedAnnotation("canvasAI_"+windowviewid,"canvasPaintAI_"+windowviewid,annotationData);
  1285 + }
  1286 + }
  1287 +
  1288 + }
  1289 +
  1290 + $scope.EnableUI();
  1291 + $rootScope.AIWindowLoadComplete = true;
  1292 + };
  1293 +
  1294 + $scope.PanelActivity();
  1295 +
  1296 + },300)
1281 1297  
1282 1298 }
1283   - $scope.PanelActivity();
  1299 +
1284 1300 }
1285 1301 $rootScope.aiAnnotationToolEvent = function (windowviewid) {
1286 1302  
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
  View file @855166b
... ... @@ -938,7 +938,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
938 938 currentController: 'CAController',
939 939 parentSlug: $scope.GetCAwindowStoreData(windowviewid, 'parentSlugName'),
940 940 content: '<script src="' + playerScript + '"></script><script>$(document).ready(function(){videojs("#playerinlineVideo_' + windowviewid + '").pause();$("#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");} GetTextVisibityCA(event); });});</script>' +
941   - '<div id="pid" class="row"><div id="divplayerinlineVideo_' + windowviewid + '" class="col-sm-12" align="center" width="640" height="480"><video width="60%" height="400"' +
  941 + '<div id="pid" class="row"><div id="divplayerinlineVideo_' + windowviewid + '" class="col-sm-12" align="center" width="640" height="480"><video width="70%" height="400"' +
942 942 'class="ADAM_Video video-js vjs-default-skin vjs-big-play-centered" type="$videoType" id="playerinlineVideo_' + windowviewid + '" onloadstart="videoOnLoad(event)"' +
943 943 ' poster="' + poster + '"' +
944 944 'controls="true" preload="none" allowfullscreen="true" allowscriptaccess="always" ' +
... ... @@ -999,6 +999,8 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
999 999 $scope.SetCAwindowStoreData(windowviewid, 'width', ui.size.width);
1000 1000 $scope.SetCAwindowStoreData(windowviewid, 'height', ui.size.height);
1001 1001 $rootScope.UnsaveCurriculum = true;
  1002 + var canvasDIvHeight = $('#caImagePanel_' + windowviewid+ " .jsPanel-content").height();
  1003 + $('#playerinlineVideo_'+ windowviewid ).css("height",canvasDIvHeight-120 );
1002 1004 }
1003 1005  
1004 1006 },
... ... @@ -1041,8 +1043,8 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
1041 1043 "slug": $scope.GetCAwindowStoreData(windowviewid, 'currentSlug')
1042 1044 });
1043 1045  
  1046 + var canvasDIvHeight = $('#caImagePanel_' + windowviewid+ " .jsPanel-content").height();
1044 1047  
1045   - var canvasDIvHeight = $("#" + $scope.jsPanelID + " .jsPanel-content").height();
1046 1048 $('#playerinlineVideo_'+ windowviewid ).css("height",canvasDIvHeight-120 );
1047 1049  
1048 1050 var videoHeight = $('#playerinlineVideo_'+ windowviewid ).height();
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
  View file @855166b
... ... @@ -892,8 +892,8 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
892 892  
893 893 }
894 894 else {
895   - $scope.jsPanelWidth = $(window).outerWidth() - 30;
896   - $scope.jsPanelHeight = $(window).outerHeight() - 125;
  895 + $scope.jsPanelWidth = $(window).outerWidth() - 5;
  896 + $scope.jsPanelHeight = $(window).outerHeight() - 140;
897 897 $scope.jsPanelLeft = 15;
898 898 $scope.jsPanelTop = 70;
899 899 }
... ... @@ -904,12 +904,17 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
904 904 theme: 'success',
905 905 currentController: 'CIController',
906 906 parentSlug: $scope.GetCIwindowStoreData(windowviewid, 'parentSlugName'),
907   - content: '<div class="row" id="canvasDivCI_' + windowviewid + '"> <canvas id="canvasPaintCI_' + windowviewid + '" ng-click="FreeStylePaint($event)" width="2277" height="325" class="canvas-annotationStyle1" style="position: absolute;z-index:0;left:0px"></canvas><canvas id="canvasCI_' + windowviewid + '" ng-click="onDrawingCanvasClick($event)" width="2277" height="325" class="canvas-annotationStyle" style="position: absolute; background-color: transparent;z-index:1;left:0px "></canvas>' +
908   - '<div class="col-sm-12 img-thumbnail" align="center">' +
909   - '<img src="' + selectedCIImage + '" alt="" title="" class="img-responsive " style="height: 75%; overflow: scroll;"><div class="col-sm-12 well img-subtitle" style="height: 150px; overflow: scroll;">' +
  907 + content:'<div class="col-sm-12">'+
  908 + ' <div class="container-fluid">'+
  909 + ' <div class="row">'+
  910 + '<div class=" col-sm-12 img-thumbnail" style="overflow: scroll;" 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>' +
  911 + //'<div class="col-sm-12 img-thumbnail" align="center">' +
  912 + '<img id="ciimage_' + windowviewid + '" alt="" title="" style="left:0px;top:0px;position:absolute;visibility:hidden">' +
  913 + '<div id="summary_' + windowviewid + '" class="col-sm-12 well img-subtitle" style="left:0px;height: 150px; overflow: scroll;bottom:0px;position:absolute">' +
910 914 '<div align="left" id="sid_' + windowviewid + '"><p>' + selectedImageCISummary + '</p></div><button id="btnTxtOnOff_' + windowviewid + '" class="btn btn-primary pull-right">Text Off</button>' +
911 915 '<script>$(document).ready(function(){ var $ua = navigator.userAgent;if(($ua.match(/(iPod|iPhone|iPad|android)/i))) { var jspanelContainerWidth = $(".jsPanel-content").css("width"); $(".jsPanel-content").css({ "width": "100%", "min-width": jspanelContainerWidth });$("#' + $scope.jsPanelID + '").css("width", "100%"); }$("#btnTxtOnOff_' + windowviewid + '").click(function(){if($.trim($(this).text()) === "Text Off"){$(this).text("Text On");$("#sid_' + windowviewid + '").css("visibility","hidden");}else{$(this).text("Text Off");$("#sid_' + windowviewid + '").css("visibility","visible");} GetTextVisibityCI(event);});});</script></div>' +
912   - '</div></div>',
  916 + '</div>'+
  917 + '</div></div></div>',
913 918 title: tittle,
914 919 position: {
915 920 top: $scope.jsPanelTop,
... ... @@ -954,6 +959,19 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
954 959 $scope.SetCIwindowStoreData(windowviewid, 'width', ui.size.width);
955 960 $scope.SetCIwindowStoreData(windowviewid, 'height', ui.size.height);
956 961 $rootScope.UnsaveCurriculum = true;
  962 + var canvasDIvHeight = $('#ciImagePanel_' + windowviewid+ " .jsPanel-content").height();
  963 + //annotation lost after resize paint canvas
  964 + // var canvasDIvWidth = $('#ciImagePanel_' + windowviewid+ " .jsPanel-content").width()-50;
  965 + // var canvas = document.getElementById("canvasCI_" + windowviewid);
  966 + // var canvasPaint = document.getElementById("canvasPaintCI_" + windowviewid);
  967 + //canvas.height = canvasDIvHeight-200;
  968 + // canvasPaint.height = canvasDIvHeight-200;
  969 + // canvas.width = canvasDIvWidth;
  970 + // canvasPaint.width = canvasDIvWidth;
  971 +
  972 + $('#canvasDivCI_' + windowviewid).css('height', canvasDIvHeight);
  973 +
  974 +
957 975 }
958 976  
959 977 },
... ... @@ -989,72 +1007,79 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
989 1007  
990 1008  
991 1009 $scope.SetCIwindowStoreData(windowviewid, 'currentSlug', 'clinical-illustrations-detail');
  1010 + $timeout(function () {
992 1011  
993   - $rootScope.openViews.push(
994   - {
995   - "module": $rootScope.currentActiveModuleTitle, "bodyView": tittle, "state": 'max', "BodyViewId": imageId,
996   - "slug": $scope.GetCIwindowStoreData(windowviewid, 'currentSlug')
997   - });
998   -
999   -
1000   - $("#" + $scope.jsPanelID + " .img-thumbnail").css("height", $("#" + $scope.jsPanelID + " .jsPanel-content").height());
  1012 + var canvasDIvHeight = $('#ciImagePanel_' + windowviewid+ " .jsPanel-content").height();
  1013 +
  1014 + $('#canvasDivCI_' + windowviewid).css('height', canvasDIvHeight);
  1015 +
  1016 + if (!$rootScope.isCallFromOtherModule) {
  1017 + $('#CIView').css("height", $(window).outerHeight() - 65);
  1018 + $('#CIView').css("width", $(window).outerWidth() - 15);
  1019 +
  1020 + var canvas = document.getElementById("canvasCI_" + windowviewid);
  1021 + var canvasPaint = document.getElementById("canvasPaintCI_" + windowviewid);
  1022 + canvas.height = canvasDIvHeight-200;
  1023 + canvasPaint.height = canvasDIvHeight-200;
  1024 + canvas.width = screen.width-70;
  1025 + canvasPaint.width = screen.width-70;
1001 1026  
1002   - if (!$rootScope.isCallFromOtherModule) {
1003   - $('#CIView').css("height", $(window).outerHeight() - 65);
1004   -
1005   - $('#CIView').css("width", $(window).outerWidth() - 46);
1006   -
1007   -
1008   - }
1009   -
1010   - if ($rootScope.isCallFromOtherModule) {
1011   - var canvasDIvHeight = parseInt($("#" + $scope.jsPanelID).outerHeight()) - 40;
1012   - }
1013   - else {
1014   - var canvasDIvHeight = parseInt($("#" + $scope.jsPanelID).outerHeight()) - 90;
1015   - }
1016   -
1017   - $('#canvasDivCI_' + windowviewid).css('height', canvasDIvHeight);
1018   -
1019   -
1020   - $('#canvasDivCI_' + windowviewid + ' img').load(function () {
1021   - $scope.EnableUI();
1022   - var imgheight= $("#" + $scope.jsPanelID + " .img-thumbnail img").height();
1023   - var canvas = document.getElementById("canvasCI_" + windowviewid);
1024   - var canvasPaint = document.getElementById("canvasPaintCI_" + windowviewid);
1025   - canvas.height = imgheight;
1026   - canvasPaint.height = imgheight;
1027   -
1028   - $scope.JsPanelclick(windowviewid);
1029   -
1030   - var isTextVisible = $scope.GetCIwindowStoreData(windowviewid, 'isTextVisible');
1031   -
1032   - if (isTextVisible) {
1033   - $("#btnTxtOnOff_" + windowviewid).text("Text Off"); $("#sid_" + windowviewid).css("visibility", "visible");
1034   - }
1035   - else {
1036   - $("#btnTxtOnOff_" + windowviewid).text("Text On"); $("#sid_" + windowviewid).css("visibility", "hidden");
1037 1027 }
1038   - if ($rootScope.isCallFromOtherModule) {
1039   - var annotationData= $scope.ciOpenInOtherModules.annotationData;
1040   - // load annotation
1041   - if(annotationData!="" && annotationData!=undefined)
1042   - {
1043   - if(annotationData.shapeStates.length>0||annotationData.paintCanvasState.length>0)
1044   - {
1045   - //first draw shape and then store in object
1046   - $rootScope.LoadCBSavedAnnotation("canvasCI_"+windowviewid,"canvasPaintCI_"+windowviewid,annotationData);
1047   - }
1048   - }
  1028 +
  1029 + var openedImage = document.getElementById('ciimage_' + windowviewid );
  1030 + openedImage.src = selectedCIImage;
  1031 + openedImage.onload = function () {
  1032 + if (!$rootScope.isCallFromOtherModule) {
  1033 + $("#ciimage_"+windowviewid).css("left", (screen.width-this.width-70)/2 + "px");
  1034 + }
  1035 + $("#ciimage_"+windowviewid).css("visibility","visible");
  1036 + // $("#ciimage_"+windowviewid).css("width", this.width + "px");
  1037 + // $("#ciimage_"+windowviewid).css("height", this.height + "px");
  1038 +
  1039 + var canvasZIndex = $("#canvasCI_" + windowviewid).css("z-index");
  1040 + var canvasPaintZIndex = $("#canvasPaintCI_" + windowviewid).css("z-index");
  1041 +
  1042 + if (parseInt(canvasZIndex) < parseInt(canvasPaintZIndex)) {
  1043 + canvasPaintZIndex = parseInt(canvasPaintZIndex) + 1;
  1044 + $('#summary_' + windowviewid).css("z-index", canvasPaintZIndex);
  1045 + }
  1046 + else {
  1047 + canvasZIndex = parseInt(canvasZIndex) + 1;
  1048 + $('#summary_' + windowviewid).css("z-index", canvasZIndex);
  1049 + }
  1050 +
  1051 + $scope.JsPanelclick(windowviewid);
  1052 +
  1053 + var isTextVisible = $scope.GetCIwindowStoreData(windowviewid, 'isTextVisible');
1049 1054  
1050   - }
1051   -
1052   - $rootScope.CIWindowLoadComplete = true;
1053   -
1054   - });
  1055 + if (isTextVisible) {
  1056 + $("#btnTxtOnOff_" + windowviewid).text("Text Off"); $("#sid_" + windowviewid).css("visibility", "visible");
  1057 + }
  1058 + else {
  1059 + $("#btnTxtOnOff_" + windowviewid).text("Text On"); $("#sid_" + windowviewid).css("visibility", "hidden");
  1060 + }
  1061 + if ($rootScope.isCallFromOtherModule) {
  1062 + var annotationData= $scope.ciOpenInOtherModules.annotationData;
  1063 + // load annotation
  1064 + if(annotationData!="" && annotationData!=undefined)
  1065 + {
  1066 + if(annotationData.shapeStates.length>0||annotationData.paintCanvasState.length>0)
  1067 + {
  1068 + //first draw shape and then store in object
  1069 + $rootScope.LoadCBSavedAnnotation("canvasCI_"+windowviewid,"canvasPaintCI_"+windowviewid,annotationData);
  1070 + }
  1071 + }
  1072 +
  1073 + }
  1074 + $scope.EnableUI();
  1075 + $rootScope.CIWindowLoadComplete = true;
  1076 +
  1077 + };
  1078 +
  1079 + $scope.PanelActivity();
  1080 +
  1081 + },300)
1055 1082  
1056   - //Calling methode for save Js Panel Activity for SaveCB
1057   - $scope.PanelActivity();
1058 1083 }
1059 1084  
1060 1085 $rootScope.ciAnnotationToolEvent = function (windowviewid) {
... ... @@ -1142,7 +1167,6 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
1142 1167 isVisible = true;
1143 1168 $scope.SetCIwindowStoreData(windowviewid, 'isTextVisible', isVisible);
1144 1169 }
1145   - //$rootScope.saveCIWindowActivity("textVisible", isVisible);
1146 1170 }
1147 1171  
1148 1172 $scope.RemoveJSPanel = function (panelid) {
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js
  View file @855166b
... ... @@ -308,8 +308,10 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
308 308 objFileRead.onload = receivedFile;
309 309 objFileRead.readAsText(file);
310 310 }, 300);
311   - } else {
312   - alert("Please select exported\saved Curriculum Builder Json file!");
  311 + }
  312 + else
  313 + {
  314 + alert("This Curriculum is not supported format!.Please try again");
313 315 }
314 316  
315 317 }
... ... @@ -1331,7 +1333,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
1331 1333 objFileRead.readAsText(file);
1332 1334 }, 300);
1333 1335 } else {
1334   - alert("Please select exported\saved Curriculum Builder Json file!");
  1336 + alert("This Curriculum not in supported format");
1335 1337 }
1336 1338  
1337 1339 }
... ... @@ -1613,15 +1615,15 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
1613 1615 window.navigator.msSaveOrOpenBlob(blob, filename);
1614 1616 }
1615 1617 else {
1616   - document.execCommand("SaveAs", true, filename);
  1618 + document.execCommand("SaveAs", true, filename);
1617 1619  
1618   - var event = document.createEvent('MouseEvents'),
1619   - saveElement = document.createElement('a');
1620   - saveElement.download = filename;
1621   - saveElement.href = window.URL.createObjectURL(blob);
1622   - saveElement.dataset.downloadurl = ['text/json', saveElement.download, saveElement.href].join(':');
1623   - event.initEvent('click', true, false, window, 0, 0, 0, 0, 0, false, false, false, false, 0, null);
1624   - saveElement.dispatchEvent(event);
  1620 + var event = document.createEvent('MouseEvents'),
  1621 + saveElement = document.createElement('a');
  1622 + saveElement.download = filename;
  1623 + saveElement.href = window.URL.createObjectURL(blob);
  1624 + saveElement.dataset.downloadurl = ['text/json', saveElement.download, saveElement.href].join(':');
  1625 + event.initEvent('click', true, false, window, 0, 0, 0, 0, 0, false, false, false, false, 0, null);
  1626 + saveElement.dispatchEvent(event);
1625 1627  
1626 1628 }
1627 1629 $scope.SectionContentForExportCB=[];
... ... @@ -2268,7 +2270,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
2268 2270 var paintCanvasState = 'paintCanvasState';
2269 2271 if (!annotation.hasOwnProperty(shapeStates) || !annotation.hasOwnProperty(paintCanvasState))
2270 2272 {
2271   - alert('This slide has old annotations on view.Please use Annotation Tool to draw annotations again.')
  2273 + alert('This slide has old annotations.Please use Annotation Tool to draw annotations again.')
2272 2274 windowData.annotationData="";
2273 2275 }
2274 2276  
... ... @@ -2681,7 +2683,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
2681 2683 var isLabExChanged= $rootScope.LEWindowData[i].isLabExChanged;
2682 2684 if(isLabExChanged)
2683 2685 {
2684   - if (confirm("Do you want to save Exercise changes?")) {
  2686 + if (confirm("Do you want to save Lab Exercise changes?")) {
2685 2687 //save to database
2686 2688 var windowid= $rootScope.LEWindowData[i].multiwinid;
2687 2689 $rootScope.SaveAnswer(undefined,windowid);
... ... @@ -2975,16 +2977,16 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
2975 2977 bodySystemId: $rootScope.AAWindowData[i].SelectedSystemID,
2976 2978 windowListId: "0",//N
2977 2979 imageId: $rootScope.AAWindowData[i].imageId,
2978   - //position: { x: 840, y: 263 },
2979 2980 position: {
2980 2981 y: $rootScope.AAWindowData[i].y,
2981 2982 x: $rootScope.AAWindowData[i].x,
2982 2983 },
2983 2984 mType: $rootScope.AAWindowData[i].moduleName,
2984 2985 containsCapturedContent: true,
  2986 + showHideAnnotations: $rootScope.AAWindowData[i].showHideAnnotations,
2985 2987 contextMenu: { hideLeftBar: false, hideTitleBar: false, hideTopToolBar: false, lockResize: false },
2986 2988 //activePinArray: $rootScope.AAWindowData[i].activePinArray,
2987   - selectedSearchId: $rootScope.AAWindowData[i].selectedSearchId
  2989 + //selectedSearchId: $rootScope.AAWindowData[i].selectedSearchId
2988 2990 //typeOfEvent: $rootScope.AAWindowData[i].typeOfEvent
2989 2991  
2990 2992  
... ... @@ -3018,11 +3020,6 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
3018 3020 clickedTermList: $rootScope.DaWindowData[i].fullTermlist,
3019 3021 minimised: $rootScope.DaWindowData[i].minimised,
3020 3022 windowTitle: $rootScope.DaWindowData[i].currentViewTitle,
3021   - //scrollPosition: {
3022   - // vertical: $rootScope.DaWindowData[i].verticalScroll,
3023   - // horizontal: $rootScope.DaWindowData[i].horizontalScroll
3024   - //},
3025   -
3026 3023 maximised: $rootScope.DaWindowData[i].maximised,
3027 3024 size: {
3028 3025 width: $rootScope.DaWindowData[i].width,
... ... @@ -3036,10 +3033,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
3036 3033 x: $rootScope.DaWindowData[i].x,
3037 3034 },
3038 3035 mType: $rootScope.DaWindowData[i].moduleName,
3039   - containsCapturedContent: true,
3040   - //contextMenu: { hideLeftBar: false, hideTitleBar: false, hideTopToolBar: false, lockResize: false },
3041   - //activePinArray: $rootScope.DaWindowData[i].activePinArray, // Selected PINID on Body
3042   - //sliderVal: $rootScope.DaWindowData[i].sliderVal,
  3036 + containsCapturedContent: true,
3043 3037 zoom: $rootScope.DaWindowData[i].zoomInOut,
3044 3038 skinId: $rootScope.DaWindowData[i].curentEthnicity,
3045 3039 isResizeLock: false , //N
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @855166b
... ... @@ -147,7 +147,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
147 147 'transparencyX': 0,
148 148 'transparencyY': 0,
149 149 'isTransparent': false,
150   - 'showHideAnnotations': ''
  150 + 'showHideAnnotations': 'showAnnotationStructure'
151 151  
152 152 };
153 153 return windata;
... ... @@ -436,7 +436,8 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
436 436  
437 437 var daImagePanelConetent = document.getElementsByClassName("jsPanel-content");
438 438 for (var i = 0; i < daImagePanelConetent.length; i++) {
439   - var panelpointevent = $("#"+ $scope.jsPanelID).css('pointer-events');
  439 + var dapanal=daImagePanelConetent[i].parentElement;
  440 + var panelpointevent = $("#"+ dapanal.id).css('pointer-events');
440 441 if(panelpointevent=="none")
441 442 {
442 443 //using for slide lock in cb
... ... @@ -779,8 +780,12 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
779 780 }
780 781 if ($scope.daOpenInOtherModules.layerNumberTransparency == 1 && $scope.GetwindowStoreData(windowviewid, 'layerNumber') != 0) {
781 782 $scope.SetwindowStoreData(windowviewid, 'layerNumberTransparency', $scope.daOpenInOtherModules.layerNumber);
782   - }
783   - $scope.SetwindowStoreData(windowviewid, 'showHideAnnotations', $scope.daOpenInOtherModules.showHideAnnotations);
  783 + }
  784 +
  785 + if ($scope.daOpenInOtherModules.showHideAnnotations != undefined && $scope.daOpenInOtherModules.showHideAnnotations != "") {
  786 + $scope.SetwindowStoreData(windowviewid, 'showHideAnnotations', $scope.daOpenInOtherModules.showHideAnnotations);
  787 + }
  788 +
784 789  
785 790 //store annotation data due long execution of DA moduel
786 791 var annotationData=$scope.daOpenInOtherModules.annotationData
... ... @@ -944,7 +949,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
944 949 $scope.jsPanelTop = 70;
945 950 }
946 951  
947   - $scope.jsPanelDA = $.jsPanel({
  952 + $scope.jsPanelDA = $.jsPanel({
948 953 id: $scope.jsPanelID,
949 954 selector: '.daBodyView',
950 955 theme: 'success',
... ... @@ -997,7 +1002,9 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
997 1002 var windowviewid = (event.currentTarget.id).split("_")[len - 1];
998 1003 $scope.SetwindowStoreData(windowviewid, 'width', ui.size.width);
999 1004 $scope.SetwindowStoreData(windowviewid, 'height', ui.size.height);
1000   - $rootScope.UnsaveCurriculum = true;
  1005 + $rootScope.UnsaveCurriculum = true;
  1006 + var canvasDIvHeight = parseInt($('#daImagePanel_' + windowviewid).outerHeight()) - 130;
  1007 + $('#canvasDivDA_' + windowviewid).css('height', canvasDIvHeight);
1001 1008 }
1002 1009  
1003 1010 },
... ... @@ -1047,9 +1054,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
1047 1054  
1048 1055 $timeout(function () {
1049 1056 $compile(daBodyviewElement.contents())($scope);
1050   -
1051 1057 //set ids
1052   -
1053 1058 $scope.daViewID = "daView";
1054 1059 $scope.btnIdentifyID = "btnIdentify";
1055 1060 $scope.btnZoomID = "btnZoom";
... ... @@ -1091,25 +1096,34 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
1091 1096 $scope.IdMale = "IdMale";
1092 1097 $scope.IdFemale = "IdFemale";
1093 1098  
  1099 + $scope.setControlIDs(windowviewid);
  1100 +
  1101 + var timeintval = null;
  1102 + timeintval = $interval(function () {
  1103 + var bodySystemListObj = document.getElementById("structureDropdownDA_" + windowviewid);
  1104 + var len = bodySystemListObj!=null?(bodySystemListObj.id).split("_").length:0;
  1105 + if (len>1) {
  1106 + $scope.stopIntervalLoader();
  1107 + //wait until DOM element load of DA
  1108 + $scope.daViewLoader(windowviewid);
  1109 + }
  1110 + else
  1111 + {
  1112 + $scope.setControlIDs(windowviewid);
  1113 + console.log("waiting for loading module");
  1114 + }
  1115 + }, 200);
  1116 + $scope.stopIntervalLoader = function () {
  1117 + if (angular.isDefined(timeintval)) {
  1118 + $interval.cancel(timeintval);
  1119 + timeintval = undefined;
  1120 + }
  1121 + };
1094 1122  
1095   - $scope.setControlIDs();
1096   -
1097   - $scope.JsPanelclick(windowviewid);
1098   -
1099   - $scope.NavigatorDraggable(windowviewid)
1100   - $scope.loadbtnNavigator(windowviewid);
1101   - // set slider control
1102   - $scope.Setslider(windowviewid);
1103   -
1104   - $scope.TbSelSlider(windowviewid);
1105   -
1106   - $scope.loadView(windowviewid);
1107   - var viewtitlename=$scope.GetwindowStoreData(windowviewid,'currentViewTitle');
1108   - $scope.switchGender(windowviewid,viewtitlename);
1109   -
1110   - $scope.setActiveview(windowviewid,viewtitlename);
1111 1123  
1112   - }, 350);
  1124 +
  1125 +
  1126 + }, 500);
1113 1127 }
1114 1128 }
1115 1129 else {
... ... @@ -1118,10 +1132,27 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
1118 1132  
1119 1133 $location.path('/');
1120 1134 }
1121   - //Calling methode for save Js Panel Activity for SaveCB
1122   - $scope.PanelActivity();
  1135 +
1123 1136 }
1124 1137  
  1138 + $scope.daViewLoader = function (windowviewid) {
  1139 + $scope.PanelActivity(windowviewid);
  1140 + $scope.JsPanelclick(windowviewid);
  1141 +
  1142 + $scope.NavigatorDraggable(windowviewid)
  1143 + $scope.loadbtnNavigator(windowviewid);
  1144 + // set slider control
  1145 + $scope.Setslider(windowviewid);
  1146 +
  1147 + $scope.TbSelSlider(windowviewid);
  1148 + var viewtitlename=$scope.GetwindowStoreData(windowviewid,'currentViewTitle');
  1149 + $scope.switchGender(windowviewid,viewtitlename);
  1150 +
  1151 + $scope.setActiveview(windowviewid,viewtitlename);
  1152 +
  1153 + $scope.loadView(windowviewid);
  1154 +
  1155 + }
1125 1156 // we are loading most of alll data used in DA by this function so that at the time of any functionality delay in data laod will not happened.
1126 1157 $scope.loadView = function (windowviewid) {
1127 1158 $scope.DisableUI();
... ... @@ -1134,7 +1165,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
1134 1165 // view, now we are programmatically closing the hung view and when user will reopen the DA view from tile then it will
1135 1166 // open without any issue.
1136 1167  
1137   - var jsPanelCloseBtnID = $scope.jsPanelID + " " + ".jsglyph-remove"
  1168 + var jsPanelCloseBtnID = 'daImagePanel_' + windowviewid; + " " + ".jsglyph-remove"
1138 1169 $("#" + jsPanelCloseBtnID).click();
1139 1170  
1140 1171 }
... ... @@ -1271,6 +1302,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
1271 1302 if ($scope.GetwindowStoreData(windviewid, 'isTransparent')) {
1272 1303 $scope.SetwindowStoreData(windowviewid, 'layerNumberTransparency', slideVal);
1273 1304 }
  1305 + $rootScope.UnsaveCurriculum = true;
1274 1306 $scope.SetwindowStoreData(windviewid,'layerNumber',slideVal);
1275 1307 scope.LayerChange(windviewid);
1276 1308 $("#annotationpaintbrushsize").removeClass("activebtncolor");
... ... @@ -1323,143 +1355,137 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
1323 1355 });
1324 1356 }
1325 1357  
1326   - $scope.setControlIDs = function () {
1327   -
1328   - $("#daView").attr("id", "daViewDA_" + $rootScope.MULTI_VIEW_ID);
1329   - $scope.daViewID = "daViewDA_" + $rootScope.MULTI_VIEW_ID;
1330   -
1331   - $("#navigatorDiv").attr("id", "navigatorDiv_" + $rootScope.MULTI_VIEW_ID);
1332   - $scope.navigatorDivID = "navigatorDiv_" + $rootScope.MULTI_VIEW_ID;
  1358 + $scope.setControlIDs = function (windowviewid) {
1333 1359  
1334   - $("#navDiv").attr("id", "navDiv_" + $rootScope.MULTI_VIEW_ID);
1335   - $scope.navDivID = "navDiv_" + $rootScope.MULTI_VIEW_ID;
  1360 + $("#daView").attr("id", "daViewDA_" + windowviewid);
  1361 + $scope.daViewID = "daViewDA_" + windowviewid;
1336 1362  
1337   - $("#navimg").attr("id", "navimg_" + $rootScope.MULTI_VIEW_ID);
1338   - $scope.navimgID = "navimg_" + $rootScope.MULTI_VIEW_ID;
  1363 + $("#navigatorDiv").attr("id", "navigatorDiv_" + windowviewid);
  1364 + $scope.navigatorDivID = "navigatorDiv_" + windowviewid;
1339 1365  
1340   - $("#txtlayerNumber").attr("id", "txtLayerNumberDA_" + $rootScope.MULTI_VIEW_ID);
1341   - $scope.txtLayerNumberID = "txtLayerNumberDA_" + $rootScope.MULTI_VIEW_ID;
  1366 + $("#navDiv").attr("id", "navDiv_" + windowviewid);
  1367 + $scope.navDivID = "navDiv_" + windowviewid;
1342 1368  
1343   - $("#layerChangeSlider").attr("id", "layerChangeSliderDA_" + $rootScope.MULTI_VIEW_ID);
1344   - $scope.layerChangeSliderID = "layerChangeSliderDA_" + $rootScope.MULTI_VIEW_ID;
  1369 + $("#navimg").attr("id", "navimg_" + windowviewid);
  1370 + $scope.navimgID = "navimg_" + windowviewid;
1345 1371  
1346   - $("#canvasDiv").attr("id", "canvasDivDA_" + $rootScope.MULTI_VIEW_ID);
1347   - $scope.canvasDivID = "canvasDivDA_" + $rootScope.MULTI_VIEW_ID;
  1372 + $("#txtlayerNumber").attr("id", "txtLayerNumberDA_" + windowviewid);
  1373 + $scope.txtLayerNumberID = "txtLayerNumberDA_" + windowviewid;
1348 1374  
1349   - //$("#canvas").attr("id", "canvasDA_" + $rootScope.MULTI_VIEW_ID);
1350   - // $scope.canvasID = "canvasDA_" + $rootScope.MULTI_VIEW_ID;
  1375 + $("#layerChangeSlider").attr("id", "layerChangeSliderDA_" +windowviewid);
  1376 + $scope.layerChangeSliderID = "layerChangeSliderDA_" + windowviewid;
1351 1377  
1352   - // $("#canvasPaint").attr("id", "canvasPaintDA_" + $rootScope.MULTI_VIEW_ID);
1353   - // $scope.canvasPaintID = "canvasPaintDA_" + $rootScope.MULTI_VIEW_ID;
  1378 + $("#canvasDiv").attr("id", "canvasDivDA_" + windowviewid);
  1379 + $scope.canvasDivID = "canvasDivDA_" + windowviewid;
1354 1380  
1355   - $("#btnIdentify").attr("id", "btnIdentify_" + $rootScope.MULTI_VIEW_ID);
1356   - $scope.btnIdentifyID = "btnIdentify_" + $rootScope.MULTI_VIEW_ID;
  1381 + $("#btnIdentify").attr("id", "btnIdentify_" + windowviewid);
  1382 + $scope.btnIdentifyID = "btnIdentify_" + windowviewid;
1357 1383  
1358   - $("#btnZoom").attr("id", "btnZoom_" + $rootScope.MULTI_VIEW_ID);
1359   - $scope.btnZoomID = "btnZoom_" + $rootScope.MULTI_VIEW_ID;
  1384 + $("#btnZoom").attr("id", "btnZoom_" + windowviewid);
  1385 + $scope.btnZoomID = "btnZoom_" + windowviewid;
1360 1386  
1361   - $("#zoomValue").attr("id", "zoomValueDA_" + $rootScope.MULTI_VIEW_ID);
1362   - $scope.zoomValueID = "zoomValueDA_" + $rootScope.MULTI_VIEW_ID;
  1387 + $("#zoomValue").attr("id", "zoomValueDA_" + windowviewid);
  1388 + $scope.zoomValueID = "zoomValueDA_" + windowviewid;
1363 1389  
1364   - $("#btnTranparency").attr("id", "btnTranparency_" + $rootScope.MULTI_VIEW_ID);
1365   - $scope.btnTranparencyID = "btnTranparency_" + $rootScope.MULTI_VIEW_ID;
  1390 + $("#btnTranparency").attr("id", "btnTranparency_" + windowviewid);
  1391 + $scope.btnTranparencyID = "btnTranparency_" + windowviewid;
1366 1392  
1367   - $("#btnNormalMode").attr("id", "btnNormalMode_" + $rootScope.MULTI_VIEW_ID);
1368   - $scope.btnNormalModeID = "btnNormalMode_" + $rootScope.MULTI_VIEW_ID;
  1393 + $("#btnNormalMode").attr("id", "btnNormalMode_" + windowviewid);
  1394 + $scope.btnNormalModeID = "btnNormalMode_" + windowviewid;
1369 1395  
1370   - $("#btnExtract").attr("id", "btnExtract_" + $rootScope.MULTI_VIEW_ID);
1371   - $scope.btnExtractID = "btnExtract_" + $rootScope.MULTI_VIEW_ID;
  1396 + $("#btnExtract").attr("id", "btnExtract_" + windowviewid);
  1397 + $scope.btnExtractID = "btnExtract_" + windowviewid;
1372 1398  
1373   - $("#btnHighLight").attr("id", "btnHighLight_" + $rootScope.MULTI_VIEW_ID);
1374   - $scope.btnHighLightID = "btnHighLight_" + $rootScope.MULTI_VIEW_ID;
  1399 + $("#btnHighLight").attr("id", "btnHighLight_" + windowviewid);
  1400 + $scope.btnHighLightID = "btnHighLight_" + windowviewid;
1375 1401  
1376   - $("#genderChangeId").attr("id", "genderChangeIdDA_" + $rootScope.MULTI_VIEW_ID);
1377   - $scope.genderChangeID = "genderChangeIdDA_" + $rootScope.MULTI_VIEW_ID;
  1402 + $("#genderChangeId").attr("id", "genderChangeIdDA_" + windowviewid);
  1403 + $scope.genderChangeID = "genderChangeIdDA_" + windowviewid;
1378 1404  
1379   - $("#dropdownMenu4").attr("id", "dropdownMenu4_" + $rootScope.MULTI_VIEW_ID);
1380   - //$scope.dropdownMenu4ID = "dropdownMenu4_" + $rootScope.MULTI_VIEW_ID;
  1405 + $("#dropdownMenu4").attr("id", "dropdownMenu4_" + windowviewid);
  1406 + //$scope.dropdownMenu4ID = "dropdownMenu4_" + windowviewid;
1381 1407  
1382   - $("#structureDropdown").attr("id", "structureDropdownDA_" + $rootScope.MULTI_VIEW_ID);
1383   - $scope.structureDropdownID = "structureDropdownDA_" + $rootScope.MULTI_VIEW_ID;
  1408 + $("#structureDropdown").attr("id", "structureDropdownDA_" + windowviewid);
  1409 + $scope.structureDropdownID = "structureDropdownDA_" + windowviewid;
1384 1410  
1385   - $("#viewChangeID").attr("id", "viewChangeIDDA_" + $rootScope.MULTI_VIEW_ID);
1386   - $scope.viewChangeID = "viewChangeIDDA_" + $rootScope.MULTI_VIEW_ID;
  1411 + $("#viewChangeID").attr("id", "viewChangeIDDA_" + windowviewid);
  1412 + $scope.viewChangeID = "viewChangeIDDA_" + windowviewid;
1387 1413  
1388   - $("#btnStrutureBox").attr("id", "btnStrutureBox_" + $rootScope.MULTI_VIEW_ID);
1389   - $scope.btnStrutureBoxID = "btnStrutureBox_" + $rootScope.MULTI_VIEW_ID;
  1414 + $("#btnStrutureBox").attr("id", "btnStrutureBox_" + windowviewid);
  1415 + $scope.btnStrutureBoxID = "btnStrutureBox_" + windowviewid;
1390 1416  
1391   - $("#typedTermName").attr("id", "typedTermName_" + $rootScope.MULTI_VIEW_ID);
1392   - $scope.typedTermNameID = "typedTermName_" + $rootScope.MULTI_VIEW_ID;
  1417 + $("#typedTermName").attr("id", "typedTermName_" + windowviewid);
  1418 + $scope.typedTermNameID = "typedTermName_" + windowviewid;
1393 1419  
1394   - $("#da-input").attr("id", "da-input_" + $rootScope.MULTI_VIEW_ID);
  1420 + $("#da-input").attr("id", "da-input_" + windowviewid);
1395 1421  
1396   - $("#searchListDiv").attr("id", "searchListDiv_" + $rootScope.MULTI_VIEW_ID);
1397   - $scope.searchListDivID = "searchListDiv_" + $rootScope.MULTI_VIEW_ID;
  1422 + $("#searchListDiv").attr("id", "searchListDiv_" + windowviewid);
  1423 + $scope.searchListDivID = "searchListDiv_" + windowviewid;
1398 1424  
1399   - $("#btnDATermSearch").attr("id", "btnDATermSearch_" + $rootScope.MULTI_VIEW_ID);
1400   - $("#navigatorBtn").attr("id", "navigatorBtn_" + $rootScope.MULTI_VIEW_ID);
1401   - $scope.navigatorBtnID = "navigatorBtn_" + $rootScope.MULTI_VIEW_ID;
  1425 + $("#btnDATermSearch").attr("id", "btnDATermSearch_" + windowviewid);
  1426 + $("#navigatorBtn").attr("id", "navigatorBtn_" + windowviewid);
  1427 + $scope.navigatorBtnID = "navigatorBtn_" + windowviewid;
1402 1428  
1403   - $("#transparencyScale").attr("id", "transparencyScale_" + $rootScope.MULTI_VIEW_ID);
1404   - $scope.transparencyScaleID = "transparencyScale_" + $rootScope.MULTI_VIEW_ID;
  1429 + $("#transparencyScale").attr("id", "transparencyScale_" + windowviewid);
  1430 + $scope.transparencyScaleID = "transparencyScale_" + windowviewid;
1405 1431  
1406   - $("#btnTBoxClose").attr("id", "btnTBoxClose_" + $rootScope.MULTI_VIEW_ID);
1407   - $scope.btnTBoxCloseID = "btnTBoxClose_" + $rootScope.MULTI_VIEW_ID;
  1432 + $("#btnTBoxClose").attr("id", "btnTBoxClose_" + windowviewid);
  1433 + $scope.btnTBoxCloseID = "btnTBoxClose_" + windowviewid;
1408 1434  
1409   - $('body').find('#daBodyview').find("#canvasDiv").attr("id", "canvasDivDA_" + $rootScope.MULTI_VIEW_ID);
  1435 + $('body').find('#daBodyview').find("#canvasDiv").attr("id", "canvasDivDA_" + windowviewid);
1410 1436  
1411   - $("#dropdownMenu3").attr("id", "dropdownMenu3_" + $rootScope.MULTI_VIEW_ID);
1412   - $("#dropdownMenu2").attr("id", "dropdownMenu2_" + $rootScope.MULTI_VIEW_ID);
  1437 + $("#dropdownMenu3").attr("id", "dropdownMenu3_" + windowviewid);
  1438 + $("#dropdownMenu2").attr("id", "dropdownMenu2_" + windowviewid);
1413 1439  
1414   - $("#draggable").attr("id", "draggable_" + $rootScope.MULTI_VIEW_ID);
1415   - $scope.draggableID = "draggable_" + $rootScope.MULTI_VIEW_ID;
  1440 + $("#draggable").attr("id", "draggable_" + windowviewid);
  1441 + $scope.draggableID = "draggable_" + windowviewid;
1416 1442  
1417 1443  
1418   - $("#leftToolBar").attr("id", "leftToolBarDA_" + $rootScope.MULTI_VIEW_ID);
  1444 + $("#leftToolBar").attr("id", "leftToolBarDA_" + windowviewid);
1419 1445  
1420 1446  
1421   - $("#searchedTermListPopUp").attr("id", "searchedTermListPopUp_" + $rootScope.MULTI_VIEW_ID);
1422   - $scope.searchedTermListPopUpID = "searchedTermListPopUp_" + $rootScope.MULTI_VIEW_ID;
  1447 + $("#searchedTermListPopUp").attr("id", "searchedTermListPopUp_" + windowviewid);
  1448 + $scope.searchedTermListPopUpID = "searchedTermListPopUp_" + windowviewid;
1423 1449  
1424   - $("#searchTermListUl").attr("id", "searchTermListUl_" + $rootScope.MULTI_VIEW_ID);
1425   - $scope.searchTermListUlId = "searchTermListUl_" + $rootScope.MULTI_VIEW_ID;
  1450 + $("#searchTermListUl").attr("id", "searchTermListUl_" + windowviewid);
  1451 + $scope.searchTermListUlId = "searchTermListUl_" + windowviewid;
1426 1452  
1427   - $("#btnSearchList").attr("id", "btnSearchList_" + $rootScope.MULTI_VIEW_ID);
  1453 + $("#btnSearchList").attr("id", "btnSearchList_" + windowviewid);
1428 1454  
1429   - $("#tbSlider").attr("id", "tbSlider_" + $rootScope.MULTI_VIEW_ID);
  1455 + $("#tbSlider").attr("id", "tbSlider_" + windowviewid);
1430 1456  
1431   - $("#IdMale").attr("id", "IdMale_" + $rootScope.MULTI_VIEW_ID);
  1457 + $("#IdMale").attr("id", "IdMale_" + windowviewid);
1432 1458  
1433   - $("#IdFemale").attr("id", "IdFemale_" + $rootScope.MULTI_VIEW_ID);
  1459 + $("#IdFemale").attr("id", "IdFemale_" + windowviewid);
1434 1460  
1435 1461 // side bar toggle
1436   - $("#sidebarId").attr("id", "sidebarId_" + $rootScope.MULTI_VIEW_ID);
  1462 + $("#sidebarId").attr("id", "sidebarId_" + windowviewid);
1437 1463  
1438 1464  
1439 1465 // bodyview id
1440   - $("#Anterior").attr("id", "Anterior_" + $rootScope.MULTI_VIEW_ID);
1441   - $("#Lateral").attr("id", "Lateral_" + $rootScope.MULTI_VIEW_ID);
1442   - $("#Medial").attr("id", "Medial_" + $rootScope.MULTI_VIEW_ID);
1443   - $("#Posterior").attr("id", "Posterior_" + $rootScope.MULTI_VIEW_ID);
1444   - $("#LateralArm").attr("id", "LateralArm_" + $rootScope.MULTI_VIEW_ID);
1445   - $("#MedialArm").attr("id", "MedialArm_" + $rootScope.MULTI_VIEW_ID);
  1466 + $("#Anterior").attr("id", "Anterior_" + windowviewid);
  1467 + $("#Lateral").attr("id", "Lateral_" + windowviewid);
  1468 + $("#Medial").attr("id", "Medial_" + windowviewid);
  1469 + $("#Posterior").attr("id", "Posterior_" + windowviewid);
  1470 + $("#LateralArm").attr("id", "LateralArm_" + windowviewid);
  1471 + $("#MedialArm").attr("id", "MedialArm_" + windowviewid);
1446 1472  
1447 1473 // bodyview id
1448   - $("#CurrentStructure").attr("id", "CurrentStructure_" + $rootScope.MULTI_VIEW_ID);
1449   - $("#Cardiovascular").attr("id", "Cardiovascular_" + $rootScope.MULTI_VIEW_ID);
1450   - $("#Digestive").attr("id", "Digestive_" + $rootScope.MULTI_VIEW_ID);
1451   - $("#Endocrine").attr("id", "Endocrine_" + $rootScope.MULTI_VIEW_ID);
1452   - $("#Immune").attr("id", "Immune_" + $rootScope.MULTI_VIEW_ID);
1453   - $("#Integumentary").attr("id", "Integumentary_" + $rootScope.MULTI_VIEW_ID);
1454   - $("#Lymphatic").attr("id", "Lymphatic_" + $rootScope.MULTI_VIEW_ID);
1455   - $("#Muscular").attr("id", "Muscular_" + $rootScope.MULTI_VIEW_ID);
1456   - $("#Nervous").attr("id", "Nervous_" + $rootScope.MULTI_VIEW_ID);
1457   - $("#Reproductive").attr("id", "Reproductive_" + $rootScope.MULTI_VIEW_ID);
1458   - $("#Respiratory").attr("id", "Respiratory_" + $rootScope.MULTI_VIEW_ID);
1459   - $("#Skeletal").attr("id", "Skeletal_" + $rootScope.MULTI_VIEW_ID);
1460   - $("#Urinary").attr("id", "Urinary_" + $rootScope.MULTI_VIEW_ID);
1461   -
1462   - var $all = $("#da-input_" + $rootScope.MULTI_VIEW_ID).prepend('<input type="text" class="form-control input-sm pull-left da-search" id="typedTermName_' + $rootScope.MULTI_VIEW_ID + '" onclick="OnSearch(event)" ondblclick="OnSearch(event)" ng-model="searchFilter" ng-keyup="resetSearchListView($event)" ng-blur="HideSearch()" placeholder=" search..." />')
  1474 + $("#CurrentStructure").attr("id", "CurrentStructure_" + windowviewid);
  1475 + $("#Cardiovascular").attr("id", "Cardiovascular_" + windowviewid);
  1476 + $("#Digestive").attr("id", "Digestive_" + windowviewid);
  1477 + $("#Endocrine").attr("id", "Endocrine_" + windowviewid);
  1478 + $("#Immune").attr("id", "Immune_" + windowviewid);
  1479 + $("#Integumentary").attr("id", "Integumentary_" + windowviewid);
  1480 + $("#Lymphatic").attr("id", "Lymphatic_" + windowviewid);
  1481 + $("#Muscular").attr("id", "Muscular_" + windowviewid);
  1482 + $("#Nervous").attr("id", "Nervous_" + windowviewid);
  1483 + $("#Reproductive").attr("id", "Reproductive_" + windowviewid);
  1484 + $("#Respiratory").attr("id", "Respiratory_" + windowviewid);
  1485 + $("#Skeletal").attr("id", "Skeletal_" + windowviewid);
  1486 + $("#Urinary").attr("id", "Urinary_" + windowviewid);
  1487 +
  1488 + var $all = $("#da-input_" +windowviewid).prepend('<input type="text" class="form-control input-sm pull-left da-search" id="typedTermName_' + windowviewid + '" onclick="OnSearch(event)" ondblclick="OnSearch(event)" ng-model="searchFilter" ng-keyup="resetSearchListView($event)" ng-blur="HideSearch()" placeholder=" search..." />')
1463 1489 $compile($all)($scope);
1464 1490  
1465 1491 }
... ... @@ -2063,7 +2089,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
2063 2089 $('#daBodyview').css('width', '100%');
2064 2090  
2065 2091 if ($rootScope.isCallFromOtherModule) {
2066   - var canvasDIvHeight = parseInt($('#daImagePanel_' + windowviewid).outerHeight()) - 124;
  2092 + var canvasDIvHeight = parseInt($('#daImagePanel_' + windowviewid).outerHeight()) - 130;
2067 2093 }
2068 2094 else
2069 2095 {
... ... @@ -2609,6 +2635,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
2609 2635 }
2610 2636  
2611 2637 FlipedImgCanvas.addEventListener('click', function (evt) {
  2638 + $rootScope.UnsaveCurriculum = true;
2612 2639 var preTermData = [];
2613 2640 var len= (evt.currentTarget.id).split("_").length;
2614 2641 var windowviewid = (evt.currentTarget.id).split("_")[len-1];
... ... @@ -3131,7 +3158,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
3131 3158 }
3132 3159  
3133 3160 imgCanvas.addEventListener('click', function (evt) {
3134   -
  3161 + $rootScope.UnsaveCurriculum = true;
3135 3162 var preTermData; //Use for Remove SpeechBUbble With TermNumber
3136 3163 var len= (evt.currentTarget.id).split("_").length;
3137 3164 var windowviewid = (evt.currentTarget.id).split("_")[len-1];
... ... @@ -3623,6 +3650,11 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
3623 3650 var showHideAnnotations = $scope.GetwindowStoreData(windowviewid, 'showHideAnnotations');
3624 3651 if (showHideAnnotations != undefined && showHideAnnotations != "") {
3625 3652 document.getElementById("btnStrutureBox_" + windowviewid).name = showHideAnnotations;
  3653 + if(showHideAnnotations=='hideAnnotationStructure')
  3654 + {
  3655 + $("#btnStrutureBox_" + windowviewid).addClass("disableHideShowStructure");
  3656 + }
  3657 +
3626 3658 }
3627 3659  
3628 3660 var CurriculumTermData = $scope.GetwindowStoreData(windowviewid,'CurriculumTermData');
... ... @@ -4291,7 +4323,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
4291 4323 $("#btnTranparency_" + windowviewid).attr('disabled', 'disabled');
4292 4324  
4293 4325 if ($scope.GetwindowStoreData(windowviewid,'isHighLight') == true) {
4294   - $scope.CloseTransparencyBox(windowviewid);
  4326 + $scope.CloseTransparencyBox(false,windowviewid);
4295 4327 }
4296 4328  
4297 4329 console.log('HighlightBodyByTermListForBodySystem is called');
... ... @@ -5113,6 +5145,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
5113 5145 var termNumber = (clickedSpeechBubbleId).split("-")[1];
5114 5146  
5115 5147 if ($rootScope.isCallFromOtherModule) {
  5148 + $rootScope.UnsaveCurriculum = true;
5116 5149 $timeout(function () {
5117 5150 var CurriculumTermData = $scope.GetwindowStoreData(windowviewid, 'CurriculumTermData');
5118 5151 var BubleObj = document.getElementById(clickedSpeechBubbleId);
... ... @@ -5149,6 +5182,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
5149 5182 .delete().at("termNumber == " + termNumber).select();
5150 5183  
5151 5184 $scope.SetwindowStoreData(windowviewid, 'CurriculumTermData', CurriculumTermData);
  5185 + $rootScope.UnsaveCurriculum = true;
5152 5186 }
5153 5187 $(this).parent().parent().parent().remove();
5154 5188 });
... ... @@ -5197,6 +5231,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
5197 5231 var termNumber = (clickedSpeechBubbleId).split("-")[1];
5198 5232  
5199 5233 if ($rootScope.isCallFromOtherModule) {
  5234 + $rootScope.UnsaveCurriculum = true;
5200 5235 $timeout(function () {
5201 5236 var CurriculumTermData = $scope.GetwindowStoreData(windowviewid, 'CurriculumTermData');
5202 5237 var BubleObj = document.getElementById(clickedSpeechBubbleId);
... ... @@ -5228,6 +5263,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
5228 5263 .delete().at("termNumber == " + termNumber).select();
5229 5264  
5230 5265 $scope.SetwindowStoreData(windowviewid, 'CurriculumTermData', CurriculumTermData);
  5266 + $rootScope.UnsaveCurriculum = true;
5231 5267 }
5232 5268 $('#' + removeid).remove();
5233 5269 });
... ... @@ -5285,6 +5321,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
5285 5321 var termNumber = (clickedSpeechBubbleId).split("-")[1];
5286 5322  
5287 5323 if ($rootScope.isCallFromOtherModule) {
  5324 + $rootScope.UnsaveCurriculum = true;
5288 5325 $timeout(function () {
5289 5326 var CurriculumTermData = $scope.GetwindowStoreData(windowviewid, 'CurriculumTermData');
5290 5327 var BubleObj = document.getElementById(clickedSpeechBubbleId);
... ... @@ -5319,6 +5356,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
5319 5356 .delete().at("transparentTermNumber == " + termNumber).select();
5320 5357  
5321 5358 $scope.SetwindowStoreData(windowviewid, 'CurriculumTermData', CurriculumTermData);
  5359 + $rootScope.UnsaveCurriculum = true;
5322 5360 }
5323 5361  
5324 5362 $(this).parent().parent().parent().remove();
... ... @@ -5378,6 +5416,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
5378 5416 var termNumber = (clickedSpeechBubbleId).split("-")[1];
5379 5417  
5380 5418 if ($rootScope.isCallFromOtherModule) {
  5419 + $rootScope.UnsaveCurriculum = true;
5381 5420 $timeout(function () {
5382 5421 var CurriculumTermData = $scope.GetwindowStoreData(windowviewid, 'CurriculumTermData');
5383 5422 var BubleObj = document.getElementById(clickedSpeechBubbleId);
... ... @@ -5410,6 +5449,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
5410 5449 .delete().at("transparentTermNumber == " + termNumber).select();
5411 5450  
5412 5451 $scope.SetwindowStoreData(windowviewid, 'CurriculumTermData', CurriculumTermData);
  5452 + $rootScope.UnsaveCurriculum = true;
5413 5453 }
5414 5454 $('#' + removeid).remove();
5415 5455 });
... ... @@ -6045,7 +6085,8 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
6045 6085 var len = (e.currentTarget.id).split("_").length;
6046 6086 var windowviewid = (e.currentTarget.id).split("_")[len - 1];
6047 6087 //to prevent screen scroll on ipad while drawing TB
6048   - e.preventDefault();
  6088 + e.preventDefault();
  6089 + $rootScope.UnsaveCurriculum = true;
6049 6090 $scope.SetwindowStoreData(windowviewid, 'isTBDrawnOnBodyRegion', false);
6050 6091 $scope.SetwindowStoreData(windowviewid, 'isTransparencyActivated', true);
6051 6092 $scope.SetwindowStoreData(windowviewid, 'IsNormalModeBeforeTBDraw', $scope.GetwindowStoreData(windowviewid, 'isNormalMode'));
... ... @@ -7782,6 +7823,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
7782 7823 }
7783 7824  
7784 7825 function TransparencyCanvasClickListener(evt) {
  7826 + $rootScope.UnsaveCurriculum = true;
7785 7827 var len= (evt.currentTarget.id).split("_").length;
7786 7828 var windowviewid = (evt.currentTarget.id).split("_")[len-1];
7787 7829 var pixelData;
... ... @@ -7965,6 +8007,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
7965 8007 }
7966 8008  
7967 8009 function OnClickModestyTransCanvas(evt) {
  8010 + $rootScope.UnsaveCurriculum = true;
7968 8011 var len= (evt.target.id).split("_").length;
7969 8012 var windowviewid = (evt.target.id).split("_")[len-1];
7970 8013  
... ... @@ -8451,11 +8494,16 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
8451 8494 }, 10)
8452 8495 }
8453 8496  
8454   - $scope.CloseTransparencyBox = function (windowviewid) {
  8497 + $scope.CloseTransparencyBox = function (ClickByButton,windowviewid) {
8455 8498 $scope.SetwindowStoreData(windowviewid,'isTBoxModestyVisible',false);
8456 8499 //for enabling annoataions.
8457 8500 //Now everything si done on canavases uswed in annotation toolbar.
8458 8501  
  8502 + if(ClickByButton)
  8503 + {
  8504 + $rootScope.UnsaveCurriculum = true;
  8505 + }
  8506 +
8459 8507 $rootScope.switchCanvas("daImagePanel_"+windowviewid);
8460 8508 if ($rootScope.isAnnotaionToolBarDrawingModeActive == true) {
8461 8509 $("#OnIdentify").removeClass('annotationtoolbartab');
... ... @@ -8651,7 +8699,8 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
8651 8699 }
8652 8700  
8653 8701 $scope.enableZoom = function (event) {
8654   - $scope.DisableUI();
  8702 + $scope.DisableUI();
  8703 + $rootScope.UnsaveCurriculum = true;
8655 8704 var len = (event.currentTarget.id).split("_").length;
8656 8705 var windowviewid = (event.currentTarget.id).split("_")[len-1];
8657 8706 $("#OnIdentify").removeClass("annotationtoolbartab");
... ... @@ -8807,6 +8856,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
8807 8856 }
8808 8857  
8809 8858 $scope.enableHighlight = function (windowviewid) {
  8859 + $rootScope.UnsaveCurriculum = true;
8810 8860 $scope.SetwindowStoreData(windowviewid, 'mode', "HIGHLIGHT");
8811 8861 $scope.SetwindowStoreData(windowviewid, 'isHighlightlBtnClicked', true);
8812 8862  
... ... @@ -8878,6 +8928,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
8878 8928 }
8879 8929  
8880 8930 $scope.enableNormalMode = function (windowviewid) {
  8931 + $rootScope.UnsaveCurriculum = true;
8881 8932 $scope.SetwindowStoreData(windowviewid, 'mode', "NORMAL");
8882 8933 $scope.SetwindowStoreData(windowviewid, 'isNormalBtnClicked', true);
8883 8934 $scope.SetwindowStoreData(windowviewid, 'previousHighlightList', []);
... ... @@ -9033,6 +9084,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
9033 9084 }
9034 9085 else
9035 9086 {
  9087 + $rootScope.UnsaveCurriculum = true;
9036 9088 if ($scope.GetwindowStoreData(windowviewid,'isExtract') == true) {
9037 9089  
9038 9090 }
... ... @@ -9083,6 +9135,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
9083 9135  
9084 9136 $scope.enableShowHideStructureBox = function (event) {
9085 9137 //if listanager is visisble then close it
  9138 + $rootScope.UnsaveCurriculum = true;
9086 9139 var len= (event.currentTarget.id).split("_").length;
9087 9140 var windowviewid = (event.currentTarget.id).split("_")[len-1];
9088 9141  
... ... @@ -9706,7 +9759,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
9706 9759 }
9707 9760  
9708 9761 $scope.DisableUI();
9709   -
  9762 + $rootScope.UnsaveCurriculum = true;
9710 9763 var canvasDiv = document.getElementById("canvasDivDA_" + windowviewid);
9711 9764 $scope.imageVerticalScrollPosition = canvasDiv.scrollTop;
9712 9765 $scope.imageHorizontlScrollPosition = canvasDiv.scrollLeft;
... ... @@ -9718,7 +9771,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
9718 9771 $("#btnTranparency_" + windowviewid).css("pointer-events", "auto");
9719 9772  
9720 9773 if ($scope.GetwindowStoreData(windowviewid,'isTransparencyActivated')) {
9721   - $scope.CloseTransparencyBox(windowviewid);
  9774 + $scope.CloseTransparencyBox(false,windowviewid);
9722 9775 }
9723 9776  
9724 9777 $rootScope.isTransparencyBoxActivated = false;
... ... @@ -9982,7 +10035,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
9982 10035  
9983 10036 $scope.SetwindowStoreData(windowviewid,'previousHighlightList',[]);
9984 10037 }
9985   -
  10038 + $rootScope.UnsaveCurriculum = true;
9986 10039 $scope.DisableUI();
9987 10040 $scope.SetwindowStoreData(windowviewid,'isViewChange',true);
9988 10041  
... ... @@ -10002,7 +10055,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
10002 10055 //close transparency box
10003 10056 if ($scope.GetwindowStoreData(windowviewid,'isTransparencyActivated')) {
10004 10057  
10005   - $scope.CloseTransparencyBox(windowviewid);
  10058 + $scope.CloseTransparencyBox(false,windowviewid);
10006 10059  
10007 10060 }
10008 10061  
... ... @@ -10280,7 +10333,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
10280 10333 $scope.HighlightBodyByBodySystem = function (event) {
10281 10334 var len= (event.target.parentElement.parentElement.id).split("_").length;
10282 10335 var windowviewid = (event.target.parentElement.parentElement.id).split("_")[len-1];
10283   -
  10336 + $rootScope.UnsaveCurriculum = true;
10284 10337 var viewOrientationId=$scope.GetwindowStoreData(windowviewid,'viewOrientationId');
10285 10338 $scope.SetwindowStoreData(windowviewid,'isExtract',false);
10286 10339 $("#structureDropdownDA_" + windowviewid).toggle();
... ... @@ -10580,7 +10633,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
10580 10633 var serachedTermId=event.target.id;
10581 10634 var len= (serachedTermId).split("_").length;
10582 10635 var windowviewid = (serachedTermId).split("_")[len-1];
10583   -
  10636 + $rootScope.UnsaveCurriculum = true;
10584 10637 $rootScope.isTermClicked = true;
10585 10638 var currenttermidTxt=$('#' + serachedTermId).text();
10586 10639  
... ... @@ -10755,6 +10808,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
10755 10808 }
10756 10809  
10757 10810 $scope.HighlightBodyOnListManagerSelection = function (selectedtermid, isTermListOptionClicked, windowviewid) {
  10811 + $rootScope.UnsaveCurriculum = true;
10758 10812 var currenttermidTxt=$("#" + selectedtermid).text();
10759 10813 $scope.SetwindowStoreData(windowviewid,'searchSelectedText',currenttermidTxt);
10760 10814  
... ... @@ -10764,7 +10818,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
10764 10818 }
10765 10819  
10766 10820 if ($scope.GetwindowStoreData(windowviewid,'isTransparencyActivated')) {
10767   - $scope.CloseTransparencyBox(windowviewid);
  10821 + $scope.CloseTransparencyBox(false,windowviewid);
10768 10822 }
10769 10823 console.log('inside HighlightBodyOnListManagerSelection actualTermNumber= ' + actualTermNumber)
10770 10824 // Terms search in the Search list should be disable in the List Manager and Vice-Versa.
... ... @@ -11240,19 +11294,19 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
11240 11294 }
11241 11295  
11242 11296 }
11243   - $scope.LayerValueChangeBasedOnKeyUp = function (e) {
  11297 + $scope.LayerValueChangeBasedOnKeyUp = function (event) {
11244 11298  
11245 11299 var len= (event.currentTarget.id).split("_").length;
11246 11300 var windowviewid = (event.currentTarget.id).split("_")[len-1];
11247 11301  
11248 11302 var totalayer=$scope.GetwindowStoreData(windowviewid,'totalLayers');
11249   - if (e.keyCode == 13) {
  11303 + if (event.keyCode == 13) {
11250 11304  
11251 11305 if ($('#txtLayerNumberDA_' + windowviewid).val() == '') {
11252 11306  
11253 11307 $('#txtLayerNumberDA_' + windowviewid).val($scope.GetwindowStoreData(windowviewid,'PreviouslayerNumbr'));
11254 11308 }
11255   - else {
  11309 + else {
11256 11310 $scope.SetwindowStoreData(windowviewid,'PreviouslayerNumbr',$('#txtLayerNumberDA_' + windowviewid).val());
11257 11311  
11258 11312 var keyUplayerNumber = parseInt($('#txtLayerNumberDA_' + windowviewid).val());
... ... @@ -11260,8 +11314,9 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
11260 11314 if (isNaN(keyUplayerNumber)) {
11261 11315 document.getElementById('txtLayerNumberDA_' + windowviewid).value = "";
11262 11316 }
11263   - else {
11264   -
  11317 + else
  11318 + {
  11319 + $rootScope.UnsaveCurriculum = true;
11265 11320 if (keyUplayerNumber > totalayer) {
11266 11321  
11267 11322 $('#txtLayerNumberDA_' + windowviewid).val(totalayer);
... ... @@ -11423,9 +11478,9 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
11423 11478 }
11424 11479  
11425 11480 //Created method by Sandeep for Save JSPanel Activity on the CB module
11426   - $scope.PanelActivity = function () {
  11481 + $scope.PanelActivity = function (windowviewid) {
11427 11482  
11428   - $(document).on("click", "#" + $scope.jsPanelID + " .jsPanel-hdr .jsPanel-hdr-r .jsPanel-btn-close .jsglyph-remove", function (event) {
  11483 + $(document).on("click", "#" + 'daImagePanel_' + windowviewid + " .jsPanel-hdr .jsPanel-hdr-r .jsPanel-btn-close .jsglyph-remove", function (event) {
11429 11484 //$(document).on("click", " .jsPanel-hdr .jsPanel-hdr-r .jsPanel-btn-close .jsglyph-remove", function () {
11430 11485  
11431 11486 var panelid = $(event.target).parent().parent().parent().parent().attr('id');
... ... @@ -11517,13 +11572,6 @@ function selectTerm(event) {
11517 11572 });
11518 11573 }
11519 11574  
11520   -// function HighlightBodyOnListManager(event) {
11521   -// console.log('HighlightBodyOnListManager is called outside ');
11522   -// var scope = angular.element(document.getElementsByClassName("daBodyView")).scope();
11523   -// scope.$apply(function () {
11524   -// scope.HighlightBodyOnListManagerSelection(event);
11525   -// });
11526   -// }
11527 11575  
11528 11576 function refreshTermListOnSystem(bodysystemId) {
11529 11577 console.log('refreshTermListOnSystem is called outside ');
... ... @@ -11544,8 +11592,6 @@ function OnEnableExtract() {
11544 11592 }
11545 11593  
11546 11594 function onTboxCreation() {
11547   -
11548   - console.log('OnEnableExtract is called outside ');
11549 11595 var scope = angular.element(document.getElementsByClassName("daBodyView")).scope();
11550 11596 scope.$apply(function () {
11551 11597 var len= (event.currentTarget.id).split("_").length;
... ... @@ -11560,7 +11606,7 @@ function onTboxClose() {
11560 11606 scope.$apply(function () {
11561 11607 var len= (event.currentTarget.id).split("_").length;
11562 11608 var windowviewid = (event.currentTarget.id).split("_")[len-1];
11563   - scope.CloseTransparencyBox(windowviewid);
  11609 + scope.CloseTransparencyBox(true,windowviewid);
11564 11610 });
11565 11611 }
11566 11612  
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @855166b
... ... @@ -218,12 +218,12 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
218 218 }
219 219 else
220 220 {
221   - alert("File size not allow more than 10MB.Please try again");
  221 + alert("This Animation video size not allow more than 10MB.Please try again");
222 222 }
223 223 }
224 224 else
225 225 {
226   - alert("Please select a file in mp4 format.Please try again");
  226 + alert("This Animation video is not in supported format mp4.Please try again");
227 227 }
228 228  
229 229 }
... ... @@ -2793,6 +2793,18 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
2793 2793 else if(paneld.match("ciImagePanel"))
2794 2794 {
2795 2795 $rootScope.ciAnnotationToolEvent(MultiWinId);
  2796 + var canvasZIndex = $("#canvasCI_" + MultiWinId).css("z-index");
  2797 + var canvasPaintZIndex = $("#canvasPaintCI_" + MultiWinId).css("z-index");
  2798 +
  2799 + if (parseInt(canvasZIndex) < parseInt(canvasPaintZIndex)) {
  2800 + canvasPaintZIndex = parseInt(canvasPaintZIndex) + 1;
  2801 + $('#summary_' + MultiWinId).css("z-index", canvasPaintZIndex);
  2802 +
  2803 + }
  2804 + else {
  2805 + canvasZIndex = parseInt(canvasZIndex) + 1;
  2806 + $('#summary_' + MultiWinId).css("z-index", canvasZIndex);
  2807 + }
2796 2808  
2797 2809 }
2798 2810 else if(paneld.match("aiImagePanel"))
... ... @@ -2857,6 +2869,13 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
2857 2869 {
2858 2870 var len = (paneld).split("_").length;
2859 2871 var MultiWinId = (paneld).split("_")[len - 1];
  2872 +
  2873 + // remove event listener
  2874 +
  2875 + var PanelElement= $scope.GetPanelElement(paneld);
  2876 + var canvasElement = PanelElement.canvasElement;
  2877 + $scope.removeOnDrawingCanvas(canvasElement);
  2878 +
2860 2879  
2861 2880 if (paneld.match("daImagePanel")) {
2862 2881 if ($("#transparencyScale_" + MultiWinId).css("display") == "block") {
... ... @@ -2913,6 +2932,24 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
2913 2932 }
2914 2933 }
2915 2934 }
  2935 +
  2936 + if(paneld.match("ciImagePanel"))
  2937 + {
  2938 + var canvasZIndex = $("#canvasCI_" + MultiWinId).css("z-index");
  2939 + var canvasPaintZIndex = $("#canvasPaintCI_" + MultiWinId).css("z-index");
  2940 +
  2941 + if (parseInt(canvasZIndex) < parseInt(canvasPaintZIndex)) {
  2942 + canvasPaintZIndex = parseInt(canvasPaintZIndex) + 1;
  2943 + $('#summary_' + MultiWinId).css("z-index", canvasPaintZIndex);
  2944 +
  2945 + }
  2946 + else {
  2947 + canvasZIndex = parseInt(canvasZIndex) + 1;
  2948 + $('#summary_' + MultiWinId).css("z-index", canvasZIndex);
  2949 + }
  2950 +
  2951 + }
  2952 +
2916 2953 }
2917 2954 }
2918 2955 }
... ... @@ -2998,6 +3035,23 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
2998 3035 }
2999 3036  
3000 3037 }
  3038 +
  3039 + if(paneld.match("ciImagePanel"))
  3040 + {
  3041 + var canvasZIndex = $("#canvasCI_" + MultiWinId).css("z-index");
  3042 + var canvasPaintZIndex = $("#canvasPaintCI_" + MultiWinId).css("z-index");
  3043 +
  3044 + if (parseInt(canvasZIndex) < parseInt(canvasPaintZIndex)) {
  3045 + canvasPaintZIndex = parseInt(canvasPaintZIndex) + 1;
  3046 + $('#summary_' + MultiWinId).css("z-index", canvasPaintZIndex);
  3047 +
  3048 + }
  3049 + else {
  3050 + canvasZIndex = parseInt(canvasZIndex) + 1;
  3051 + $('#summary_' + MultiWinId).css("z-index", canvasZIndex);
  3052 + }
  3053 +
  3054 + }
3001 3055 }
3002 3056 }
3003 3057 }
... ... @@ -3152,6 +3206,22 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
3152 3206 }
3153 3207 }
3154 3208 }
  3209 + if(paneld.match("ciImagePanel"))
  3210 + {
  3211 + var canvasZIndex = $("#canvasCI_" + MultiWinId).css("z-index");
  3212 + var canvasPaintZIndex = $("#canvasPaintCI_" + MultiWinId).css("z-index");
  3213 +
  3214 + if (parseInt(canvasZIndex) < parseInt(canvasPaintZIndex)) {
  3215 + canvasPaintZIndex = parseInt(canvasPaintZIndex) + 1;
  3216 + $('#summary_' + MultiWinId).css("z-index", canvasPaintZIndex);
  3217 +
  3218 + }
  3219 + else {
  3220 + canvasZIndex = parseInt(canvasZIndex) + 1;
  3221 + $('#summary_' + MultiWinId).css("z-index", canvasZIndex);
  3222 + }
  3223 +
  3224 + }
3155 3225 }
3156 3226 }
3157 3227 }
... ... @@ -3216,6 +3286,22 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
3216 3286 {
3217 3287 $rootScope.switchToAnnotationCanvas(paneld,MultiWinId);
3218 3288 }
  3289 + if(paneld.match("ciImagePanel"))
  3290 + {
  3291 + var canvasZIndex = $("#canvasCI_" + MultiWinId).css("z-index");
  3292 + var canvasPaintZIndex = $("#canvasPaintCI_" + MultiWinId).css("z-index");
  3293 +
  3294 + if (parseInt(canvasZIndex) < parseInt(canvasPaintZIndex)) {
  3295 + canvasPaintZIndex = parseInt(canvasPaintZIndex) + 1;
  3296 + $('#summary_' + MultiWinId).css("z-index", canvasPaintZIndex);
  3297 +
  3298 + }
  3299 + else {
  3300 + canvasZIndex = parseInt(canvasZIndex) + 1;
  3301 + $('#summary_' + MultiWinId).css("z-index", canvasZIndex);
  3302 + }
  3303 +
  3304 + }
3219 3305  
3220 3306 }
3221 3307 }
... ... @@ -3281,7 +3367,23 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
3281 3367  
3282 3368 $rootScope.switchToAnnotationCanvas(paneld,MultiWinId);
3283 3369  
3284   - }
  3370 + }
  3371 + if(paneld.match("ciImagePanel"))
  3372 + {
  3373 + var canvasZIndex = $("#canvasCI_" + MultiWinId).css("z-index");
  3374 + var canvasPaintZIndex = $("#canvasPaintCI_" + MultiWinId).css("z-index");
  3375 +
  3376 + if (parseInt(canvasZIndex) < parseInt(canvasPaintZIndex)) {
  3377 + canvasPaintZIndex = parseInt(canvasPaintZIndex) + 1;
  3378 + $('#summary_' + MultiWinId).css("z-index", canvasPaintZIndex);
  3379 +
  3380 + }
  3381 + else {
  3382 + canvasZIndex = parseInt(canvasZIndex) + 1;
  3383 + $('#summary_' + MultiWinId).css("z-index", canvasZIndex);
  3384 + }
  3385 +
  3386 + }
3285 3387 }
3286 3388 }
3287 3389 }
... ... @@ -3312,6 +3414,22 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
3312 3414 var MultiWinId = (paneld).split("_")[len - 1];
3313 3415 $rootScope.switchToAnnotationCanvas(paneld,MultiWinId);
3314 3416 }
  3417 + if(paneld.match("ciImagePanel"))
  3418 + {
  3419 + var canvasZIndex = $("#canvasCI_" + MultiWinId).css("z-index");
  3420 + var canvasPaintZIndex = $("#canvasPaintCI_" + MultiWinId).css("z-index");
  3421 +
  3422 + if (parseInt(canvasZIndex) < parseInt(canvasPaintZIndex)) {
  3423 + canvasPaintZIndex = parseInt(canvasPaintZIndex) + 1;
  3424 + $('#summary_' + MultiWinId).css("z-index", canvasPaintZIndex);
  3425 +
  3426 + }
  3427 + else {
  3428 + canvasZIndex = parseInt(canvasZIndex) + 1;
  3429 + $('#summary_' + MultiWinId).css("z-index", canvasZIndex);
  3430 + }
  3431 +
  3432 + }
3315 3433 }
3316 3434 }
3317 3435 }
... ... @@ -3354,6 +3472,23 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
3354 3472 {
3355 3473 $rootScope.switchToAnnotationCanvas(paneld,MultiWinId);
3356 3474 }
  3475 +
  3476 + if(paneld.match("ciImagePanel"))
  3477 + {
  3478 + var canvasZIndex = $("#canvasCI_" + MultiWinId).css("z-index");
  3479 + var canvasPaintZIndex = $("#canvasPaintCI_" + MultiWinId).css("z-index");
  3480 +
  3481 + if (parseInt(canvasZIndex) < parseInt(canvasPaintZIndex)) {
  3482 + canvasPaintZIndex = parseInt(canvasPaintZIndex) + 1;
  3483 + $('#summary_' + MultiWinId).css("z-index", canvasPaintZIndex);
  3484 +
  3485 + }
  3486 + else {
  3487 + canvasZIndex = parseInt(canvasZIndex) + 1;
  3488 + $('#summary_' + MultiWinId).css("z-index", canvasZIndex);
  3489 + }
  3490 +
  3491 + }
3357 3492  
3358 3493 }
3359 3494 }
... ... @@ -3435,6 +3570,22 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
3435 3570 $scope.PaintEraseEvent();
3436 3571 }
3437 3572  
  3573 + if(paneld.match("ciImagePanel"))
  3574 + {
  3575 + var canvasZIndex = $("#canvasCI_" + MultiWinId).css("z-index");
  3576 + var canvasPaintZIndex = $("#canvasPaintCI_" + MultiWinId).css("z-index");
  3577 +
  3578 + if (parseInt(canvasZIndex) < parseInt(canvasPaintZIndex)) {
  3579 + canvasPaintZIndex = parseInt(canvasPaintZIndex) + 1;
  3580 + $('#summary_' + MultiWinId).css("z-index", canvasPaintZIndex);
  3581 +
  3582 + }
  3583 + else {
  3584 + canvasZIndex = parseInt(canvasZIndex) + 1;
  3585 + $('#summary_' + MultiWinId).css("z-index", canvasZIndex);
  3586 + }
  3587 +
  3588 + }
3438 3589 }
3439 3590 }
3440 3591 }
... ... @@ -3463,6 +3614,22 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
3463 3614  
3464 3615 $rootScope.isAnnotaionToolBarDrawingModeActive = true;
3465 3616 $rootScope.switchCanvasToPaintCanvas(paneld);
  3617 + if(paneld.match("ciImagePanel"))
  3618 + {
  3619 + var canvasZIndex = $("#canvasCI_" + MultiWinId).css("z-index");
  3620 + var canvasPaintZIndex = $("#canvasPaintCI_" + MultiWinId).css("z-index");
  3621 +
  3622 + if (parseInt(canvasZIndex) < parseInt(canvasPaintZIndex)) {
  3623 + canvasPaintZIndex = parseInt(canvasPaintZIndex) + 1;
  3624 + $('#summary_' + MultiWinId).css("z-index", canvasPaintZIndex);
  3625 +
  3626 + }
  3627 + else {
  3628 + canvasZIndex = parseInt(canvasZIndex) + 1;
  3629 + $('#summary_' + MultiWinId).css("z-index", canvasZIndex);
  3630 + }
  3631 +
  3632 + }
3466 3633  
3467 3634 $('#' + canvasPaintId).sketch();
3468 3635  
... ... @@ -3664,6 +3831,22 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
3664 3831 {
3665 3832 $rootScope.switchToAnnotationCanvas(paneld,MultiWinId);
3666 3833 }
  3834 + if(paneld.match("ciImagePanel"))
  3835 + {
  3836 + var canvasZIndex = $("#canvasCI_" + MultiWinId).css("z-index");
  3837 + var canvasPaintZIndex = $("#canvasPaintCI_" + MultiWinId).css("z-index");
  3838 +
  3839 + if (parseInt(canvasZIndex) < parseInt(canvasPaintZIndex)) {
  3840 + canvasPaintZIndex = parseInt(canvasPaintZIndex) + 1;
  3841 + $('#summary_' + MultiWinId).css("z-index", canvasPaintZIndex);
  3842 +
  3843 + }
  3844 + else {
  3845 + canvasZIndex = parseInt(canvasZIndex) + 1;
  3846 + $('#summary_' + MultiWinId).css("z-index", canvasZIndex);
  3847 + }
  3848 +
  3849 + }
3667 3850  
3668 3851 }
3669 3852 }
... ... @@ -3707,6 +3890,22 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
3707 3890 {
3708 3891 $rootScope.switchToAnnotationCanvas(paneld,MultiWinId);
3709 3892 }
  3893 + if(paneld.match("ciImagePanel"))
  3894 + {
  3895 + var canvasZIndex = $("#canvasCI_" + MultiWinId).css("z-index");
  3896 + var canvasPaintZIndex = $("#canvasPaintCI_" + MultiWinId).css("z-index");
  3897 +
  3898 + if (parseInt(canvasZIndex) < parseInt(canvasPaintZIndex)) {
  3899 + canvasPaintZIndex = parseInt(canvasPaintZIndex) + 1;
  3900 + $('#summary_' + MultiWinId).css("z-index", canvasPaintZIndex);
  3901 +
  3902 + }
  3903 + else {
  3904 + canvasZIndex = parseInt(canvasZIndex) + 1;
  3905 + $('#summary_' + MultiWinId).css("z-index", canvasZIndex);
  3906 + }
  3907 +
  3908 + }
3710 3909  
3711 3910 }
3712 3911 }
... ... @@ -3749,6 +3948,22 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
3749 3948 {
3750 3949 $rootScope.switchToAnnotationCanvas(paneld,MultiWinId);
3751 3950 }
  3951 + if(paneld.match("ciImagePanel"))
  3952 + {
  3953 + var canvasZIndex = $("#canvasCI_" + MultiWinId).css("z-index");
  3954 + var canvasPaintZIndex = $("#canvasPaintCI_" + MultiWinId).css("z-index");
  3955 +
  3956 + if (parseInt(canvasZIndex) < parseInt(canvasPaintZIndex)) {
  3957 + canvasPaintZIndex = parseInt(canvasPaintZIndex) + 1;
  3958 + $('#summary_' + MultiWinId).css("z-index", canvasPaintZIndex);
  3959 +
  3960 + }
  3961 + else {
  3962 + canvasZIndex = parseInt(canvasZIndex) + 1;
  3963 + $('#summary_' + MultiWinId).css("z-index", canvasZIndex);
  3964 + }
  3965 +
  3966 + }
3752 3967  
3753 3968 }
3754 3969 }
... ... @@ -3790,6 +4005,22 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
3790 4005 {
3791 4006 $rootScope.switchToAnnotationCanvas(paneld,MultiWinId);
3792 4007 }
  4008 + if(paneld.match("ciImagePanel"))
  4009 + {
  4010 + var canvasZIndex = $("#canvasCI_" + MultiWinId).css("z-index");
  4011 + var canvasPaintZIndex = $("#canvasPaintCI_" + MultiWinId).css("z-index");
  4012 +
  4013 + if (parseInt(canvasZIndex) < parseInt(canvasPaintZIndex)) {
  4014 + canvasPaintZIndex = parseInt(canvasPaintZIndex) + 1;
  4015 + $('#summary_' + MultiWinId).css("z-index", canvasPaintZIndex);
  4016 +
  4017 + }
  4018 + else {
  4019 + canvasZIndex = parseInt(canvasZIndex) + 1;
  4020 + $('#summary_' + MultiWinId).css("z-index", canvasZIndex);
  4021 + }
  4022 +
  4023 + }
3793 4024  
3794 4025 }
3795 4026 }
... ... @@ -3940,6 +4171,22 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
3940 4171 $rootScope.switchCanvas(paneld);
3941 4172  
3942 4173 }
  4174 + if(paneld.match("ciImagePanel"))
  4175 + {
  4176 + var canvasZIndex = $("#canvasCI_" + MultiWinId).css("z-index");
  4177 + var canvasPaintZIndex = $("#canvasPaintCI_" + MultiWinId).css("z-index");
  4178 +
  4179 + if (parseInt(canvasZIndex) < parseInt(canvasPaintZIndex)) {
  4180 + canvasPaintZIndex = parseInt(canvasPaintZIndex) + 1;
  4181 + $('#summary_' + MultiWinId).css("z-index", canvasPaintZIndex);
  4182 +
  4183 + }
  4184 + else {
  4185 + canvasZIndex = parseInt(canvasZIndex) + 1;
  4186 + $('#summary_' + MultiWinId).css("z-index", canvasZIndex);
  4187 + }
  4188 +
  4189 + }
3943 4190 }
3944 4191 }
3945 4192 }
... ... @@ -5826,6 +6073,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
5826 6073 var storeLine = '';
5827 6074 //----
5828 6075 let isDrawing = false;
  6076 + let currentCanvasId = '';
5829 6077 $scope.onDrawingCanvasOnModule = function (annotationCanvas) {
5830 6078  
5831 6079 //remove old event listener
... ... @@ -5846,6 +6094,19 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
5846 6094 }
5847 6095  
5848 6096 }
  6097 + $scope.removeOnDrawingCanvas = function (annotationCanvas) {
  6098 +
  6099 + //remove old event listener
  6100 + //event code modified .work of only DA,AA,CI,AI,PIC
  6101 + annotationCanvas.removeEventListener("mousedown", $rootScope.OnPaintCanvasMouseDown);
  6102 + annotationCanvas.removeEventListener("touchstart", $rootScope.OnPaintCanvasMouseDown);
  6103 + annotationCanvas.removeEventListener("mouseup", $rootScope.OnPaintCanvasMouseUp);
  6104 + annotationCanvas.removeEventListener("touchend", $rootScope.OnPaintCanvasMouseUp);
  6105 + window.removeEventListener('mouseup', $rootScope.OnPaintCanvasMouseUp);
  6106 + window.removeEventListener("touchend", $rootScope.OnPaintCanvasMouseUp);
  6107 +
  6108 +
  6109 + }
5849 6110  
5850 6111 //Birendra updated due to some issue
5851 6112 $rootScope.OnPaintCanvasMouseDown = function (event) {
... ... @@ -5917,11 +6178,18 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
5917 6178 if (canvasElement != null ||canvasElement != undefined)
5918 6179 {
5919 6180 var canvasId = canvasElement.id;
  6181 + if(canvasId=="")
  6182 + {
  6183 + canvasElement=document.getElementById(currentCanvasId);
  6184 + canvasId= currentCanvasId;
  6185 + }
  6186 +
5920 6187 if (canvasId != null ||canvasId != undefined)
5921 6188 {
  6189 +
5922 6190 if(canvasId.match("canvasDA")||canvasId.match("canvasAA")||canvasId.match("canvasCI")||canvasId.match("canvasAI")||canvasId.match("canvasPIC"))
5923 6191 {
5924   - var canvasDiv = (event.target.parentElement);
  6192 + var canvasDiv = (canvasElement.parentElement);
5925 6193 var canvasDivId = canvasDiv.id;
5926 6194  
5927 6195 // var canvasPaintElement = event.target.previousElementSibling;
... ... @@ -6026,6 +6294,8 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
6026 6294 //Birendra updated due to some issue
6027 6295 $rootScope.OnPaintCanvasMouseMove = function (event) {
6028 6296 event.preventDefault();
  6297 + isDrawing = false;
  6298 + currentCanvasId='';
6029 6299 if(!$rootScope.clicked) return;
6030 6300 if ($rootScope.isAnnotatiomToolBarPopupClosed == false) {
6031 6301 if ($rootScope.shapeType==undefined || $rootScope.shapeType=='cursor'||$rootScope.shapeType=="") {
... ... @@ -6043,6 +6313,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
6043 6313 var canvasDiv = (event.target.parentElement);
6044 6314 var canvasDivId = canvasDiv.id;
6045 6315 isDrawing = true;
  6316 + currentCanvasId=canvasId;
6046 6317 var verticalScrollPosition = canvasDiv.scrollTop;
6047 6318 var horizontlScrollPosition = canvasDiv.scrollLeft;
6048 6319 $rootScope.MouseMoveXAxis = event.pageX + horizontlScrollPosition - $('#' + canvasDivId).offset().left;
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js
  View file @855166b
... ... @@ -424,6 +424,8 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
424 424 $scope.SetLEwindowStoreData(windowviewid, 'width', ui.size.width);
425 425 $scope.SetLEwindowStoreData(windowviewid, 'height', ui.size.height);
426 426 $rootScope.UnsaveCurriculum = true;
  427 + var canvasDIvHeight = parseInt($('#labImagePanel_' + windowviewid).outerHeight()) - 15;
  428 + $('#LabView_' + windowviewid).css('height', canvasDIvHeight);
427 429 }
428 430  
429 431 },
... ... @@ -434,6 +436,7 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
434 436 $scope.SetLEwindowStoreData(windowviewid, 'y', ui.position.top);
435 437 $scope.SetLEwindowStoreData(windowviewid, 'x', ui.position.left);
436 438 $rootScope.UnsaveCurriculum = true;
  439 +
437 440 }
438 441 },
439 442  
... ... @@ -821,7 +824,7 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
821 824 }
822 825  
823 826 $scope.nextQuiz = function ($event) {
824   -
  827 + $rootScope.UnsaveCurriculum = true;
825 828 var len = ($event.target.id).split("_").length;
826 829 var windowviewid = ($event.target.id).split("_")[len - 1];
827 830  
... ... @@ -869,7 +872,7 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
869 872 }
870 873  
871 874 $scope.prevQuiz = function ($event) {
872   -
  875 + $rootScope.UnsaveCurriculum = true;
873 876 var len = ($event.target.id).split("_").length;
874 877 var windowviewid = ($event.target.id).split("_")[len - 1];
875 878  
... ... @@ -1173,6 +1176,7 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
1173 1176 var DraggedAttr = $scope[dynamicDragList][inx1].DraggedAttr;
1174 1177 console.log("drag box id:" + DraggedAttr);
1175 1178 if (DraggedAttr == draggableAttribute) {
  1179 + $rootScope.UnsaveCurriculum = true;
1176 1180 $scope.SetLEwindowStoreData(windowviewid, 'isLabExChanged', true);
1177 1181 $scope[dynamicDragList].splice(inx1, 1);
1178 1182 $('#' + draggableAttribute).css({ "display": "block", "color": "#000000!important" });
... ... @@ -1216,6 +1220,7 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
1216 1220  
1217 1221 $.each(Options, function (inx, value2) {
1218 1222 if (Options[inx].BoxName == BlockBoxName.split("_")[0]) {
  1223 + $rootScope.UnsaveCurriculum = true;
1219 1224 $scope.SetLEwindowStoreData(windowviewid, 'isLabExChanged', true);
1220 1225 if ($scope[dynamicDragList] != null) {
1221 1226 for (var i = 0; i <= $scope[dynamicDragList].length - 1; i++) {
... ... @@ -1297,6 +1302,7 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
1297 1302  
1298 1303 $.each(Options, function (inx, value2) {
1299 1304 if (Options[inx].BoxName == BlockBoxName.split("_")[0]) {
  1305 + $rootScope.UnsaveCurriculum = true;
1300 1306 $scope.SetLEwindowStoreData(windowviewid, 'isLabExChanged', true);
1301 1307 if ($scope[dynamicDragList] != null) {
1302 1308 for (var i = 0; i <= $scope[dynamicDragList].length - 1; i++) {
... ... @@ -1423,7 +1429,7 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
1423 1429 };
1424 1430  
1425 1431 $scope.OnResetClick = function ($event) {
1426   -
  1432 + $rootScope.UnsaveCurriculum = true;
1427 1433 var len = ($event.target.id).split("_").length;
1428 1434 var windowviewid = ($event.target.id).split("_")[len - 1];
1429 1435 $scope.SetLEwindowStoreData(windowviewid, 'isResetClicked', true);
... ... @@ -1524,6 +1530,7 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
1524 1530 {
1525 1531 var len = ($event.target.id).split("_").length;
1526 1532 var windowviewid = ($event.target.id).split("_")[len - 1];
  1533 + $rootScope.UnsaveCurriculum = true;
1527 1534 }
1528 1535  
1529 1536 $scope.DisableUI();
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/MyAnimationController.js
  View file @855166b
... ... @@ -350,6 +350,8 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
350 350 $scope.SetVideowindowStoreData(windowviewid, 'width', ui.size.width);
351 351 $scope.SetVideowindowStoreData(windowviewid, 'height', ui.size.height);
352 352 $rootScope.UnsaveCurriculum = true;
  353 + var canvasDIvHeight = $('#vidImagePanel_' + windowviewid+ " .jsPanel-content").height();
  354 + $('#playerinlineVideo_'+ windowviewid ).css("height",canvasDIvHeight-20 );
353 355 }
354 356  
355 357 },
... ... @@ -393,13 +395,16 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
393 395 });
394 396  
395 397  
396   - var jspContentHeight = $('.jsPanel-content').height();
  398 + // var jspContentHeight = $('.jsPanel-content').height();
  399 + var canvasDIvHeight = $('#vidImagePanel_' + windowviewid+ " .jsPanel-content").height();
  400 + $('#playerinlineVideo_'+ windowviewid ).css("height",canvasDIvHeight-20 );
  401 +
397 402 var videoHeight = $('#divplayerinlineVideo_'+ windowviewid +' div').height();
398 403 if (videoHeight <= 0)
399 404 videoHeight = 360;
400 405 var textH = $('.video-subtitle').height();
401 406 textH = textH + 40;
402   - var blackBorderHeight = jspContentHeight - (videoHeight + textH);
  407 + var blackBorderHeight = canvasDIvHeight - (videoHeight + textH);
403 408  
404 409 if ($('.jsPanel-content').length > 0) {
405 410 $('.video-subtitle').css('margin-bottom', blackBorderHeight);
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/MyPictureController.js
  View file @855166b
... ... @@ -278,12 +278,13 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
278 278 theme: 'success',
279 279 currentController: 'MyPictureController',
280 280 parentSlug: $scope.GetPICwindowStoreData(windowviewid, 'parentSlugName'),
281   - content: '<div class="row" id="canvasDivPIC_' + windowviewid + '"><canvas id="canvasPaintPIC_' + windowviewid + '" ng-click="FreeStylePaint($event)" width="1340" height="325" class="canvas-annotationStyle1" style="position: absolute;z-index:0;left:0px"></canvas><canvas id="canvasPIC_' + windowviewid + '" ng-click="onDrawingCanvasClick($event)" width="1340" height="325" class="canvas-annotationStyle" style="position: absolute; background-color: transparent;z-index:1;left:0px "></canvas>' +
282   - '<div class="col-sm-12 img-thumbnail" align="center">' +
283   - '<img src="' + selectedpicture + '" id="mypic" alt="" title="" class="img-responsive " style="height:400px;">' +
284   -
285   - '</div></div>',
286   -
  281 + content: '<div class="col-sm-12">'+
  282 + ' <div class="container-fluid">'+
  283 + ' <div class="row">'+
  284 + '<div class=" col-sm-12 img-thumbnail" style="overflow: scroll;" id="canvasDivPIC_' + windowviewid + '" ><canvas id="canvasPaintPIC_' + windowviewid + '" ng-click="FreeStylePaint($event)" width="2277" height="800" class="canvas-annotationStyle1" style="position: absolute;z-index:0;left:0px"></canvas><canvas id="canvasPIC_' + windowviewid + '" ng-click="onDrawingCanvasClick($event)" width="2277" height="800" class="canvas-annotationStyle" style="position: absolute; background-color: transparent;z-index:1;left:0px "></canvas>' +
  285 + '<img id="mypic_' + windowviewid + '" alt="" title="" style="left:0px;top:0px;position:absolute">' +
  286 + '</div>'+
  287 + '</div></div></div>',
287 288 title: tittle,
288 289 position: {
289 290 top: $scope.jsPanelTop,
... ... @@ -328,6 +329,8 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
328 329 $scope.SetPICwindowStoreData(windowviewid, 'width', ui.size.width);
329 330 $scope.SetPICwindowStoreData(windowviewid, 'height', ui.size.height);
330 331 $rootScope.UnsaveCurriculum = true;
  332 + var canvasDIvHeight = $('#picImagePanel_' + windowviewid+ " .jsPanel-content").height();
  333 + $('#canvasDivPIC_' + windowviewid).css('height', canvasDIvHeight);
331 334 }
332 335  
333 336 },
... ... @@ -353,25 +356,36 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
353 356 else {
354 357 $scope.jsPanelPIC.normalize();
355 358 }
356   -
357   - $('#canvasDivPIC_' + windowviewid + ' img').load(function () {
358   -
359   - // set false after initial call of min,max or normal
360   - $scope.SetPICwindowStoreData(windowviewid, 'minmaxAutoEvent', false);
361   - $scope.SetPICwindowStoreData(windowviewid, 'y', $scope.jsPanelTop);
362   - $scope.SetPICwindowStoreData(windowviewid, 'x', $scope.jsPanelLeft);
363   - $scope.SetPICwindowStoreData(windowviewid, 'width', $scope.jsPanelWidth);
364   - $scope.SetPICwindowStoreData(windowviewid, 'height', $scope.jsPanelHeight);
365   -
366   -
367   - $scope.JsPanelclick(windowviewid);
  359 +
  360 + // set false after initial call of min,max or normal
  361 + $scope.SetPICwindowStoreData(windowviewid, 'minmaxAutoEvent', false);
  362 + $scope.SetPICwindowStoreData(windowviewid, 'y', $scope.jsPanelTop);
  363 + $scope.SetPICwindowStoreData(windowviewid, 'x', $scope.jsPanelLeft);
  364 + $scope.SetPICwindowStoreData(windowviewid, 'width', $scope.jsPanelWidth);
  365 + $scope.SetPICwindowStoreData(windowviewid, 'height', $scope.jsPanelHeight);
  366 +
  367 + $timeout(function () {
  368 +
  369 + $scope.SetPICwindowStoreData(windowviewid, 'currentSlug', 'my-picture');
  370 +
  371 + $('.jsPanel-content .jsPanel-theme-success').css('overflow-y', 'auto !important')
368 372  
369   - var canvas = document.getElementById("canvasPIC_" + windowviewid);
370   - var canvasPaint = document.getElementById("canvasPaintPIC_" + windowviewid);
371   -
372   - canvas.height = $("#" + $scope.jsPanelID + " .jsPanel-content").height();
373   - canvasPaint.height = $("#" + $scope.jsPanelID + " .jsPanel-content").height();
  373 + $('#PicView').css("height", $(window).outerHeight() - 65);
  374 +
  375 + $('#PicView').css("width", $(window).outerWidth() - 15);
  376 +
  377 + var canvasDIvHeight = $('#picImagePanel_' + windowviewid+ " .jsPanel-content").height();
  378 +
  379 + $('#canvasDivPIC_' + windowviewid).css('height', canvasDIvHeight);
374 380  
  381 + var openedImage = document.getElementById('mypic_' + windowviewid );
  382 + openedImage.src = selectedpicture;
  383 + openedImage.onload = function () {
  384 + //$("#mypic_"+windowviewid).css("width", this.width + "px");
  385 + // $("#mypic_"+windowviewid).css("height", this.height + "px");
  386 +
  387 + $scope.JsPanelclick(windowviewid);
  388 +
375 389 var annotationData= $scope.picOpenInOtherModules.annotationData;
376 390 // load annotation
377 391 if(annotationData!="" && annotationData!=undefined)
... ... @@ -381,25 +395,16 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
381 395 //first draw shape and then store in object
382 396 $rootScope.LoadCBSavedAnnotation("canvasPIC_"+windowviewid,"canvasPaintPIC_"+windowviewid,annotationData);
383 397 }
384   - }
385   - $scope.EnableUI();
386   - $rootScope.PicLoadComplete = true;
387   - });
388   -
389   - $scope.SetPICwindowStoreData(windowviewid, 'currentSlug', 'my-picture');
390   -
391   - $("#" + $scope.jsPanelID + " .img-thumbnail").css("min-height", $("#" + $scope.jsPanelID + " .jsPanel-content").height());
392   - $('.jsPanel-content .jsPanel-theme-success').css('overflow-y', 'auto !important')
  398 + }
  399 + $scope.EnableUI();
  400 + $rootScope.PicLoadComplete = true;
  401 + }
  402 +
  403 + $scope.PanelActivity();
  404 +
  405 + },300)
393 406  
394   - $('#PicView').css("height", $(window).outerHeight() - 65);
395   -
396   - $('#PicView').css("width", $(window).outerWidth() - 15);
397   -
398   - var canvasDIvHeight = $("#" + $scope.jsPanelID + " .jsPanel-content").height();
399   -
400   - $('#canvasDivPIC_' + windowviewid).css('height', canvasDIvHeight);
401 407  
402   - $scope.PanelActivity();
403 408 }
404 409 $rootScope.picAnnotationToolEvent = function (windowviewid) {
405 410  
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
  View file @855166b
... ... @@ -98,6 +98,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
98 98 'canvasImageWidth': 0,
99 99 'canvasImageHeight': 0,
100 100 'navigatorImage':"",
  101 + 'showHideAnnotations': 'showAnnotationText',
101 102 'annotationData':{shapeStates:[],paintCanvasState:[]},
102 103  
103 104 };
... ... @@ -502,11 +503,10 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
502 503 $scope.SetAAwindowStoreData(windowviewid, 'isShowAllPins', $scope.aaOpenInOtherModules.showAllPins);
503 504 $scope.SetAAwindowStoreData(windowviewid, 'isHidePinBtnClicked', $scope.aaOpenInOtherModules.hideAllPins);
504 505 $scope.SetAAwindowStoreData(windowviewid, 'isShowSelectedPins', $scope.aaOpenInOtherModules.showSelectedPins);
505   - if ($scope.aaOpenInOtherModules.selectedSearchId != undefined) {
506   - $scope.SetAAwindowStoreData(windowviewid, 'selectedSearchId', $scope.aaOpenInOtherModules.selectedSearchId);
507   - } else {
508   - $scope.SetAAwindowStoreData(windowviewid, 'selectedSearchId', 0);
509   - }
  506 + if ($scope.aaOpenInOtherModules.showHideAnnotations != undefined && $scope.aaOpenInOtherModules.showHideAnnotations != "") {
  507 + $scope.SetAAwindowStoreData(windowviewid, 'showHideAnnotations', $scope.aaOpenInOtherModules.showHideAnnotations);
  508 + }
  509 +
510 510 var isMaximize = $scope.aaOpenInOtherModules.maximised;
511 511 var isMinimize = $scope.aaOpenInOtherModules.minimised;
512 512 $scope.SetAAwindowStoreData(windowviewid, 'maximised', isMaximize);
... ... @@ -565,12 +565,14 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
565 565 }
566 566 else {
567 567 $scope.SetAAwindowStoreData($rootScope.MULTI_VIEW_ID,'parentSlugName','tile-view-list');
568   - $scope.loadAAIllustration($rootScope.MULTI_VIEW_ID);
  568 + $scope.loadAAIllustration($rootScope.MULTI_VIEW_ID);
569 569 }
570 570 }
571 571  
572   - $scope.loadAAIllustration = function (windowviewid) {
573   -
  572 + $scope.loadAAIllustration = function (windowviewid) {
  573 + //0.4 for Opening module item, load it into image
  574 + $scope.DisableUI();
  575 +
574 576 if ($rootScope.refreshcheck == null) {
575 577 $location.path('/');
576 578 }
... ... @@ -675,6 +677,8 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
675 677 $scope.SetAAwindowStoreData(windowviewid, 'width', ui.size.width);
676 678 $scope.SetAAwindowStoreData(windowviewid, 'height', ui.size.height);
677 679 $rootScope.UnsaveCurriculum = true;
  680 + var canvasDIvHeight = $('#AAImagePanel_' + windowviewid+ " .jsPanel-content").height()-70;
  681 + $('#canvasAADiv_' + windowviewid).css('height', canvasDIvHeight);
678 682 }
679 683  
680 684 },
... ... @@ -693,146 +697,159 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
693 697 //0.3
694 698 var aaViewElement = angular.element(document.getElementById("aaBodyView"));
695 699  
696   - //0.4 for Opening module item, load it into image
697   - $scope.DisableUI();
698   -
699 700 //Perform Activity as per SaveCb JSPanel
  701 + var isMaximize = $scope.GetAAwindowStoreData(windowviewid, 'maximised');
  702 + var isMinimize = $scope.GetAAwindowStoreData(windowviewid, 'minimised');
  703 + if (isMaximize) {
  704 + $scope.jsPanelAA.maximize('auto');
  705 + }
  706 + else if (isMinimize) {
  707 + $scope.jsPanelAA.minimize('auto');
  708 + }
  709 + else {
  710 + $scope.jsPanelAA.normalize('auto');
  711 + }
700 712  
701   - $compile(aaViewElement.contents())($scope);
702   -
  713 + // set false after initial call of min,max or normal
  714 + $scope.SetAAwindowStoreData(windowviewid, 'minmaxAutoEvent', false);
  715 + $scope.SetAAwindowStoreData(windowviewid, 'y', $scope.jsPanelTop);
  716 + $scope.SetAAwindowStoreData(windowviewid, 'x', $scope.jsPanelLeft);
  717 + $scope.SetAAwindowStoreData(windowviewid, 'width', $scope.jsPanelWidth);
  718 + $scope.SetAAwindowStoreData(windowviewid, 'height', $scope.jsPanelHeight);
  719 +
703 720 $timeout(function () {
704 721 if (document.getElementById('aaBodyView') != null) {
705   -
706   - $scope.setControlsIDs(windowviewid);
707   - var isMaximize = $scope.GetAAwindowStoreData(windowviewid, 'maximised');
708   - var isMinimize = $scope.GetAAwindowStoreData(windowviewid, 'minimised');
709   - if (isMaximize) {
710   - $scope.jsPanelAA.maximize('auto');
  722 + $compile(aaViewElement.contents())($scope);
  723 + $scope.setControlsIDs(windowviewid);
  724 +
  725 + var timeintval = null;
  726 + timeintval = $interval(function () {
  727 + var bodySystemListObj = document.getElementById("bodySystemList_" + windowviewid);
  728 + var len = bodySystemListObj!=null?(bodySystemListObj.id).split("_").length:0;
  729 + if (len>1) {
  730 + $scope.stopIntervalLoader();
  731 + //wait until DOM element load of AA
  732 + $scope.loadAAModule(windowviewid);
711 733 }
712   - else if (isMinimize) {
713   - $scope.jsPanelAA.minimize('auto');
  734 + else
  735 + {
  736 + $scope.setControlsIDs(windowviewid);
  737 + console.log("waiting for loading module");
714 738 }
715   - else {
716   - $scope.jsPanelAA.normalize('auto');
  739 + }, 200);
  740 + $scope.stopIntervalLoader = function () {
  741 + if (angular.isDefined(timeintval)) {
  742 + $interval.cancel(timeintval);
  743 + timeintval = undefined;
717 744 }
  745 + };
  746 +
  747 + }
  748 +
  749 + }, 500);
  750 +
  751 + }
718 752  
719   - // set false after initial call of min,max or normal
720   - $scope.SetAAwindowStoreData(windowviewid, 'minmaxAutoEvent', false);
721   - $scope.SetAAwindowStoreData(windowviewid, 'y', $scope.jsPanelTop);
722   - $scope.SetAAwindowStoreData(windowviewid, 'x', $scope.jsPanelLeft);
723   - $scope.SetAAwindowStoreData(windowviewid, 'width', $scope.jsPanelWidth);
724   - $scope.SetAAwindowStoreData(windowviewid, 'height', $scope.jsPanelHeight);
725   -
726   - $timeout(function () {
  753 + }
727 754  
728   - if ($rootScope.isCallFromOtherModule) {
729   - var canvasDIvHeight = parseInt($('#AAImagePanel_' + windowviewid).outerHeight()) - 110;
730   - }
731   - else
732   - {
733   - var canvasDIvHeight = parseInt($('#AAImagePanel_' + windowviewid).outerHeight()) - 90;
734   - $('#aaBodyView').css("height", $(window).outerHeight() - 65);
735   - $('#aaBodyView').css("width", $(window).outerWidth() - 15);
736   - }
  755 + $scope.loadAAModule = function (windowviewid) {
737 756  
738   - $('#canvasAADiv_' + windowviewid).css('height', canvasDIvHeight);
739   - $('.canvasDivClass').css("height", canvasDIvHeight);
  757 + if ($rootScope.isCallFromOtherModule) {
  758 + var canvasDIvHeight = parseInt($('#AAImagePanel_' + windowviewid).outerHeight()) - 100;
  759 + }
  760 + else
  761 + {
  762 + var canvasDIvHeight = parseInt($('#AAImagePanel_' + windowviewid).outerHeight()) - 90;
  763 + $('#aaBodyView').css("height", $(window).outerHeight() - 65);
  764 + $('#aaBodyView').css("width", $(window).outerWidth() - 15);
  765 + }
740 766  
741   - $scope.convertToZoomValue(windowviewid);
  767 + $('#canvasAADiv_' + windowviewid).css('height', canvasDIvHeight);
  768 + $('.canvasDivClass').css("height", canvasDIvHeight);
742 769  
743   - var OpenItemImagePath= $scope.GetAAwindowStoreData(windowviewid,'OpenItemImagePath');
744   - var openedImage = new Image();
745   - openedImage.id = 'modItemImage_'+windowviewid;
746   - //openedImage.name = OpenItemImagePath;
747   - openedImage.onload = function () {
748   - var zoomValue = $scope.GetAAwindowStoreData(windowviewid, 'sliderVal');
749   - var relativeWidth = ( this.width)*(zoomValue/100);
750   - var relativeHeight = (this.height)*(zoomValue/100);
  770 + $scope.convertToZoomValue(windowviewid);
751 771  
752   - $scope.SetAAwindowStoreData(windowviewid, 'canvasImageWidth', relativeWidth);
753   - $scope.SetAAwindowStoreData(windowviewid, 'canvasImageHeight', relativeHeight);
  772 + var OpenItemImagePath= $scope.GetAAwindowStoreData(windowviewid,'OpenItemImagePath');
  773 + var openedImage = document.getElementById("modItemImage_"+windowviewid);
  774 + openedImage.src = OpenItemImagePath;
  775 + openedImage.onload = function () {
  776 + $scope.SetAAwindowStoreData(windowviewid, 'canvasImageWidth', this.width);
  777 + $scope.SetAAwindowStoreData(windowviewid, 'canvasImageHeight', this.height);
754 778  
755   - $scope.SetAAwindowStoreData(windowviewid,'sliderPercentValue',(zoomValue/100));
  779 + var zoomValue = $scope.GetAAwindowStoreData(windowviewid, 'sliderVal');
  780 + var relativeWidth = ( this.width)*(zoomValue/100);
  781 + var relativeHeight = (this.height)*(zoomValue/100);
  782 +
  783 + $scope.SetAAwindowStoreData(windowviewid,'sliderPercentValue',(zoomValue/100));
756 784  
757   - $("#modItemImage_"+windowviewid).css("width", relativeWidth + "px");
758   - $("#modItemImage_"+windowviewid).css("height", relativeHeight + "px");
759   -
760   - $("#modItemImage_"+windowviewid).attr('src', OpenItemImagePath);
761   -
762   - //0.5 create canvas on the top of image.
763   - var canvas = document.createElement('canvas');
764   - canvas.id = 'aaDetailViewCanvas_'+windowviewid;
765   - canvas.className = '.aaCanvas'
766   - canvas.height = parseInt(relativeHeight + 10);
767   - canvas.width = parseInt(relativeWidth + 10);
768   - canvas.style.left = '0px';
769   - canvas.style.top = '0px';
770   - canvas.style.position = "absolute";
771   - canvas.style.zIndex = 12002;
772   - $("#canvasAADiv_" + windowviewid).append(canvas);
  785 + $("#modItemImage_"+windowviewid).css("width", relativeWidth + "px");
  786 + $("#modItemImage_"+windowviewid).css("height", relativeHeight + "px");
  787 +
  788 + //0.5 create canvas on the top of image.
  789 + var canvas = document.createElement('canvas');
  790 + canvas.id = 'aaDetailViewCanvas_'+windowviewid;
  791 + canvas.className = '.aaCanvas'
  792 + canvas.height = parseInt(relativeHeight + 10);
  793 + canvas.width = parseInt(relativeWidth + 10);
  794 + canvas.style.left = '0px';
  795 + canvas.style.top = '0px';
  796 + canvas.style.position = "absolute";
  797 + canvas.style.zIndex = 12002;
  798 + $("#canvasAADiv_" + windowviewid).append(canvas);
  799 +
  800 + $timeout(function () {
  801 + $scope.loadAllPinFirstTime(windowviewid);
  802 + //call time interval function until load pin data
  803 + var timeintval = null;
  804 + timeintval = $interval(function () {
  805 + var aaPinData = $scope.GetAAwindowStoreData(windowviewid,'aaPinData');
  806 + if (aaPinData.length>0) {
  807 + $scope.stopIntervalAA();
  808 + $scope.showAllPins(windowviewid);
  809 + $scope.Setslider(windowviewid);
  810 + //7. Highlight all system body list in left side
  811 + $scope.highlightBodySystemList(windowviewid);
  812 + $scope.loadbtnNavigator(windowviewid);
  813 + $scope.JsPanelclick(windowviewid);
  814 +
  815 + if ($rootScope.isCallFromOtherModule) {
  816 + $scope.loadAAonCBData(windowviewid);
773 817  
774   - $timeout(function () {
775   - $scope.loadAllPinFirstTime(windowviewid);
776   - //call time interval function until load pin data
777   - var timeintval = null;
778   - timeintval = $interval(function () {
779   - var aaPinData = $scope.GetAAwindowStoreData(windowviewid,'aaPinData');
780   - if (aaPinData.length>0) {
781   - $scope.showAllPins(windowviewid);
782   - $scope.stopIntervalAA();
783   - $scope.Setslider(windowviewid);
784   - //7. Highlight all system body list in left side
785   - $timeout(function () {
786   - $scope.highlightBodySystemList(windowviewid);
787   - $scope.loadbtnNavigator(windowviewid);
788   - },2000);
789   - $scope.JsPanelclick(windowviewid);
790   -
791   - if ($rootScope.isCallFromOtherModule) {
792   - $scope.loadAAonCBData(windowviewid);
793   -
794   - //$rootScope.ShowAnnotationWindow(); //show tool if need
795   - var annotationData= $scope.aaOpenInOtherModules.annotationData;
796   - // load annotation
797   - if(annotationData!="" && annotationData!=undefined)
798   - {
799   - if(annotationData.shapeStates.length>0||annotationData.paintCanvasState.length>0)
800   - {
801   - //first draw shape and then store in object
802   - $rootScope.LoadCBSavedAnnotation("canvasAA_"+windowviewid,"canvasPaintAA_"+windowviewid,annotationData);
803   - }
804   - }
805   - }
806   -
807   - }
808   - else
  818 + //$rootScope.ShowAnnotationWindow(); //show tool if need
  819 + var annotationData= $scope.aaOpenInOtherModules.annotationData;
  820 + // load annotation
  821 + if(annotationData!="" && annotationData!=undefined)
  822 + {
  823 + if(annotationData.shapeStates.length>0||annotationData.paintCanvasState.length>0)
809 824 {
810   - console.log("waiting for pin Data");
811   - }
812   - }, 100);
813   -
814   - $scope.stopIntervalAA = function () {
815   - if (angular.isDefined(timeintval)) {
816   - $interval.cancel(timeintval);
817   - timeintval = undefined;
818   - }
819   - };
820   -
821   - },500);
822   - }
823   - openedImage.onerror = loadFailure;
824   - openedImage.src = OpenItemImagePath;
825   -
826   - },500);
827   -
828   - //Calling methode for save Js Panel Activity for SaveCB
829   - $scope.PanelActivity();
830   - }
831   -
832   - }, 500);
833   -
834   - }
  825 + //first draw shape and then store in object
  826 + $rootScope.LoadCBSavedAnnotation("canvasAA_"+windowviewid,"canvasPaintAA_"+windowviewid,annotationData);
  827 + }
  828 + }
  829 + }
  830 +
  831 + }
  832 + else
  833 + {
  834 + console.log("waiting for pin Data");
  835 + }
  836 + }, 100);
835 837  
  838 + $scope.stopIntervalAA = function () {
  839 + if (angular.isDefined(timeintval)) {
  840 + $interval.cancel(timeintval);
  841 + timeintval = undefined;
  842 + }
  843 + };
  844 +
  845 + },500);
  846 + }
  847 + openedImage.onerror = loadFailure;
  848 + // openedImage.src = OpenItemImagePath;
  849 +
  850 + //Calling methode for save Js Panel Activity for SaveCB
  851 + $scope.PanelActivity();
  852 +
836 853 }
837 854  
838 855 $scope.convertToZoomValue = function (windowviewid) {
... ... @@ -992,6 +1009,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
992 1009 // if (value == 25 || value == 40 || value == 55 || value == 70 || value == 85 || value == 100) {
993 1010 $("#listManager").css("display", "none");
994 1011 $("#optionsListManagerTab").removeClass("active");
  1012 + $rootScope.UnsaveCurriculum = true;
995 1013  
996 1014 var ViewImageWidth = $scope.GetAAwindowStoreData(windowviewid, 'canvasImageWidth');
997 1015 var ViewImageHeight = $scope.GetAAwindowStoreData(windowviewid, 'canvasImageHeight');
... ... @@ -1041,9 +1059,9 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1041 1059 case "allPinBtn_"+windowviewid:
1042 1060 if ($("#bodySystemList_" + windowviewid + " li.activeAASystemSelect a").attr("id") != undefined) {
1043 1061 if ($rootScope.isCallFromOtherModule != undefined && $rootScope.isCallFromOtherModule == true) {
1044   - var selectedSearchId = $scope.GetAAwindowStoreData(windowviewid, 'selectedSearchId');
1045   - if (selectedSearchId != undefined) {
1046   - scope.showSelectedSystemPins(selectedSearchId, windowviewid);
  1062 + var SelectedSystemID = $scope.GetAAwindowStoreData(windowviewid, 'SelectedSystemID');
  1063 + if (SelectedSystemID != undefined) {
  1064 + scope.showSelectedSystemPins(SelectedSystemID, windowviewid);
1047 1065 }
1048 1066 else {
1049 1067 scope.showSelectedSystemPins($("#bodySystemList_" + windowviewid + " li.activeAASystemSelect a").attr("id"), windowviewid);
... ... @@ -1387,10 +1405,24 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1387 1405 var aaPinData = $scope.GetAAwindowStoreData(windowviewid,'aaPinData');
1388 1406  
1389 1407 if (aaPinData != null && aaPinData.length > 0) {
1390   - var allPinDataArray=$scope.GetAAwindowStoreData(windowviewid,'allPinDataArray');
  1408 + var allPinDataArray=$scope.GetAAwindowStoreData(windowviewid,'allPinDataArray');
  1409 + var selectedSystemName=$scope.GetAAwindowStoreData(windowviewid,'selectedSystemName');
  1410 + var SelectedSystemID= $scope.GetAAwindowStoreData(windowviewid,'SelectedSystemID');
1391 1411 angular.forEach(aaPinData, function (value, key) {
1392   - allPinDataArray.push(value._PinId);
1393   - $scope.drawStaticPinsOnImage('aaDetailViewCanvas_'+windowviewid, value._PinId, value._PinX, value._PinY, value._HeadX, value._HeadY,windowviewid)
  1412 + if(SelectedSystemID=="0")
  1413 + {
  1414 + allPinDataArray.push(value._PinId);
  1415 + $scope.drawStaticPinsOnImage('aaDetailViewCanvas_'+windowviewid, value._PinId, value._PinX, value._PinY, value._HeadX, value._HeadY,windowviewid)
  1416 + }
  1417 + else
  1418 + {
  1419 + if (value._BodySystemId == SelectedSystemID) {
  1420 + allPinDataArray.push(value._PinId);
  1421 + $scope.drawStaticPinsOnImage('aaDetailViewCanvas_'+windowviewid, value._PinId, value._PinX, value._PinY, value._HeadX, value._HeadY,windowviewid)
  1422 + }
  1423 + }
  1424 +
  1425 +
1394 1426 })
1395 1427 var isShowSelectedSystemPinsClicked=$scope.GetAAwindowStoreData(windowviewid,'isShowSelectedSystemPinsClicked');
1396 1428 if (isShowSelectedSystemPinsClicked == false) {
... ... @@ -1650,18 +1682,19 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1650 1682  
1651 1683 }
1652 1684 else {
  1685 + $rootScope.UnsaveCurriculum =true;
1653 1686 var id = event.currentTarget.id;
1654 1687 $scope.SetAAwindowStoreData(windowviewid,'typeOfEvent',typeof event);
1655 1688 var SelectedSystemID = event.currentTarget.id;
1656 1689 var SelectedSystemTitle = event.currentTarget.title;
1657 1690 if (event.currentTarget.title == "Current Structure") {
1658   - $scope.SetAAwindowStoreData(windowviewid, 'selectedSearchId', 0);
  1691 + $scope.SetAAwindowStoreData(windowviewid, 'SelectedSystemID', 0);
1659 1692 }
1660 1693 else {
1661 1694 $scope.SetAAwindowStoreData(windowviewid,'clickedPins',[]);
1662 1695 $scope.SetAAwindowStoreData(windowviewid, 'activePinArray', []);
1663 1696 $scope.SetAAwindowStoreData(windowviewid, 'selectedPins', []);
1664   - $scope.SetAAwindowStoreData(windowviewid, 'selectedSearchId', id);
  1697 + $scope.SetAAwindowStoreData(windowviewid, 'SelectedSystemID', id);
1665 1698 }
1666 1699  
1667 1700 var isHidePinBtnClicked=$scope.GetAAwindowStoreData(windowviewid,'isHidePinBtnClicked');
... ... @@ -1761,9 +1794,6 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1761 1794 }
1762 1795  
1763 1796 else {
1764   -
1765   - $scope.SetAAwindowStoreData(windowviewid, 'selectedSearchId', event);
1766   -
1767 1797 var SelectedSystemID = event;
1768 1798 $scope.SetAAwindowStoreData(windowviewid,'typeOfEvent',typeof event);
1769 1799 $scope.SetAAwindowStoreData(windowviewid,'isShowSelectedSystemPinsClicked',true);
... ... @@ -1804,10 +1834,32 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1804 1834 if (aaPinData != null && aaPinData.length > 0) {
1805 1835  
1806 1836 var selectedSystemPinData = new jinqJs()
1807   - .from(aaPinData)
1808   - .where("_BodySystemName == " + selectedSystemName)
1809   - .select();
1810   -
  1837 + .from(aaPinData)
  1838 + .where("_BodySystemName == " + selectedSystemName)
  1839 + .select();
  1840 +
  1841 + var oldSelectedSystemId = $scope.GetAAwindowStoreData(windowviewid, 'SelectedSystemID');
  1842 + if(oldSelectedSystemId!=SelectedSystemID)
  1843 + {
  1844 + $scope.SetAAwindowStoreData(windowviewid,'clickedPins',[]);
  1845 + $scope.SetAAwindowStoreData(windowviewid, 'activePinArray', []);
  1846 + $scope.SetAAwindowStoreData(windowviewid, 'selectedPins', []);
  1847 + $scope.SetAAwindowStoreData(windowviewid, 'SelectedSystemID', SelectedSystemID);
  1848 + }
  1849 + var clickedPins=$scope.GetAAwindowStoreData(windowviewid,'clickedPins');
  1850 + if(clickedPins.length>0)
  1851 + {
  1852 +
  1853 + var pintToshowSelected = new jinqJs()
  1854 + .from(selectedSystemPinData)
  1855 + .where("_PinId == " + clickedPins[0].id)
  1856 + .select();
  1857 + }
  1858 + else{
  1859 + var pintToshowSelected=selectedSystemPinData;
  1860 + }
  1861 +
  1862 +
1811 1863 $scope.SetAAwindowStoreData(windowviewid,'selectedSystemPinData',selectedSystemPinData);
1812 1864  
1813 1865 if (isHidePinBtnClicked) {
... ... @@ -1827,8 +1879,21 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1827 1879 angular.forEach(selectedSystemPinData, function (value, key) {
1828 1880 $scope.drawStaticPinsOnImage('aaDetailViewCanvas_'+windowviewid, value._PinId, value._PinX, value._PinY, value._HeadX, value._HeadY,windowviewid)
1829 1881 });
  1882 + // make all pin heads grey
  1883 + var radial = $('#aaDetailViewCanvas_'+windowviewid).createGradient({
  1884 + x1: 50, y1: 50,
  1885 + x2: 50, y2: 50,
  1886 + r1: 10, r2: 30,
  1887 + c1: 'rgba(100, 50, 0,0)',
  1888 + c2: 'rgb(216, 216, 216)'
  1889 + });
  1890 +
  1891 +
  1892 + $('#aaDetailViewCanvas_'+windowviewid).setLayers({
  1893 + fillStyle: radial,
  1894 + }).drawLayers();
1830 1895 //show annotation on first pin of the sysyem
1831   - $scope.showAnnotation(selectedSystemPinData, false, false, false,true,windowviewid);
  1896 + $scope.showAnnotation(pintToshowSelected, false, false, false,true,windowviewid);
1832 1897 }
1833 1898 }
1834 1899 }
... ... @@ -2291,6 +2356,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
2291 2356 var PinId = sppechBubbleId.split("_")[0];
2292 2357  
2293 2358 if ($rootScope.isCallFromOtherModule) {
  2359 + $rootScope.UnsaveCurriculum = true;
2294 2360 $timeout(function () {
2295 2361 var CBselectedpinCordinate = $scope.GetAAwindowStoreData(windowviewid, 'CBselectedpinCordinate');
2296 2362 var BubleObj = document.getElementById(clickedSpeechBubbleId);
... ... @@ -2326,6 +2392,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
2326 2392 .delete().at("pinId == " + pinId).select();
2327 2393  
2328 2394 $scope.SetAAwindowStoreData(windowviewid, 'CBselectedpinCordinate', CBselectedpinCordinate);
  2395 + $rootScope.UnsaveCurriculum = true;
2329 2396 }
2330 2397  
2331 2398 });
... ... @@ -2440,7 +2507,10 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
2440 2507  
2441 2508 click: function (clickedPin) {
2442 2509  
2443   - if (clickedPin.event.ctrlKey == false) {
  2510 + $rootScope.UnsaveCurriculum =true;
  2511 + //birendra
  2512 + // for mac os Command key use for multi selection
  2513 + if (clickedPin.event.ctrlKey == false && clickedPin.event.metaKey == false) {
2444 2514 $scope.SetAAwindowStoreData(windowviewid, 'clickedPins', []);
2445 2515 $scope.SetAAwindowStoreData(windowviewid, 'selectedPins', []);
2446 2516 $scope.SetAAwindowStoreData(windowviewid, 'CBselectedpinCordinate', []);
... ... @@ -2476,7 +2546,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
2476 2546 .select();
2477 2547  
2478 2548 var activePinArray=$scope.GetAAwindowStoreData(windowviewid,'activePinArray');
2479   - if (clickedPin.event.ctrlKey == true) {
  2549 + if (clickedPin.event.ctrlKey == true||clickedPin.event.metaKey == true) {
2480 2550 var isFound = jQuery.inArray(clickedPin.name, activePinArray)
2481 2551 if (isFound == -1) {
2482 2552 activePinArray.push(clickedPin.name);
... ... @@ -2799,13 +2869,16 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
2799 2869  
2800 2870 }
2801 2871  
  2872 + $scope.showAllPinEvent = function (windowviewid) {
  2873 + $rootScope.UnsaveCurriculum = true;
  2874 + $scope.showAllPinsAfterHide(windowviewid);
  2875 + }
2802 2876 $scope.showAllPinsAfterHide = function (windowviewid) {
2803 2877  
2804 2878 $scope.ToolBoxStyle("ShowAllPin",windowviewid);
2805 2879  
2806 2880 $scope.DisableUI();
2807 2881  
2808   - //$scope.SetAAwindowStoreData(windowviewid, 'selectedSearchId', 0);
2809 2882 $scope.SetAAwindowStoreData(windowviewid, 'isShowAllPins', true);
2810 2883 $scope.SetAAwindowStoreData(windowviewid,'isHidePinBtnClicked',false);
2811 2884 $scope.SetAAwindowStoreData(windowviewid, 'isShowSelectedPins', false);
... ... @@ -2834,6 +2907,10 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
2834 2907 }
2835 2908  
2836 2909 };
  2910 + $scope.showSelectedPinEvent = function (windowviewid) {
  2911 + $rootScope.UnsaveCurriculum = true;
  2912 + $scope.showSelectedPins(windowviewid);
  2913 + }
2837 2914  
2838 2915 $scope.showSelectedPins = function (windowviewid) {
2839 2916  
... ... @@ -2992,7 +3069,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
2992 3069  
2993 3070 }
2994 3071  
2995   - $scope.HideSearchList = function () {
  3072 + $scope.HideSearchList = function (event) {
2996 3073 var len= (event.currentTarget.id).split("_").length;
2997 3074 var windowviewid = (event.currentTarget.id).split("_")[len-1];
2998 3075 $timeout(function () {
... ... @@ -3000,9 +3077,13 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
3000 3077 $("#termlistfilter_"+windowviewid).css("display", "none");
3001 3078  
3002 3079  
3003   - }, 1000);
  3080 + }, 500);
3004 3081  
3005 3082 }
  3083 + $scope.highlightPinBasedOnSerachItemEvent = function (termid) {
  3084 + $rootScope.UnsaveCurriculum = true;
  3085 + $scope.highlightPinBasedOnSerachItem(termid);
  3086 + }
3006 3087  
3007 3088 $scope.highlightPinBasedOnSerachItem = function (termid) {
3008 3089  
... ... @@ -3029,14 +3110,17 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
3029 3110 .from(aaPinData)
3030 3111 .where("_TermId == " + id)
3031 3112 .select();
3032   - if ($("#bodySystemList_" + windowviewid +" li.activeAASystemSelect a").attr("id") == 0) {
3033   - }
3034   - else
3035   - {
3036   - // birendra
  3113 + // if ($("#bodySystemList_" + windowviewid +" li.activeAASystemSelect a").attr("id") == 0) {
  3114 + // }
  3115 + // else
  3116 + // {
  3117 + // // birendra
  3118 + // //change body system by searched term
  3119 + // $scope.showSelectedSystemPins(pinDataForTerm[0]._BodySystemId,windowviewid);
  3120 + // }
  3121 + // birendra
3037 3122 //change body system by searched term
3038   - $scope.showSelectedSystemPins(pinDataForTerm[0]._BodySystemId,windowviewid);
3039   - }
  3123 + $scope.showSelectedSystemPins(pinDataForTerm[0]._BodySystemId,windowviewid);
3040 3124  
3041 3125 $timeout(function () {
3042 3126 //make all pin heads grey
... ... @@ -3078,45 +3162,43 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
3078 3162  
3079 3163 $scope.IsSearchVisible = false;
3080 3164  
3081   - //$scope.SetAAwindowStoreData(windowviewid, 'selectedSearchId', id);
3082   - //$scope.SetAAwindowStoreData(windowviewid, 'isShowAllPins', true);
3083   - //$scope.SetAAwindowStoreData(windowviewid, 'isHidePinBtnClicked', false);
3084   - //$scope.SetAAwindowStoreData(windowviewid, 'showSelectedPins', false);
3085   - //$rootScope.AAWindowLoadComplete = true;
3086 3165 }
3087 3166  
3088 3167 $scope.ShowHideAnnotation = function (event) {
3089 3168 var len= (event.currentTarget.id).split("_").length;
3090 3169 var windowviewid = (event.currentTarget.id).split("_")[len-1];
  3170 + $rootScope.UnsaveCurriculum = true;
3091 3171  
3092 3172 var btnStrutureBoxname = document.getElementById("comment-box_"+windowviewid).name;
3093 3173  
3094   - if (btnStrutureBoxname == "showAnnotationText") {
3095   - $("#comment-box_"+windowviewid).addClass("disableAnnotationText");
3096   - document.getElementById("comment-box_"+windowviewid).name = "hideAnnotationText";
3097   - }
3098   - else
3099   - {
3100   - $("#comment-box_"+windowviewid).removeClass("disableAnnotationText");
3101   - document.getElementById("comment-box_"+windowviewid).name = "showAnnotationText";
3102   - }
3103   -
3104   - $scope.ShowHideAnnotationText(windowviewid);
  3174 + if (btnStrutureBoxname == "showAnnotationText") {
  3175 + $("#comment-box_"+windowviewid).addClass("disableAnnotationText");
  3176 + document.getElementById("comment-box_"+windowviewid).name = "hideAnnotationText";
  3177 + $scope.SetAAwindowStoreData(windowviewid, 'showHideAnnotations', 'hideAnnotationText');
  3178 + }
  3179 + else
  3180 + {
  3181 + $("#comment-box_"+windowviewid).removeClass("disableAnnotationText");
  3182 + document.getElementById("comment-box_"+windowviewid).name = "showAnnotationText";
  3183 + $scope.SetAAwindowStoreData(windowviewid, 'showHideAnnotations', 'showAnnotationText');
  3184 + }
  3185 +
  3186 + $scope.ShowHideAnnotationText(windowviewid);
3105 3187 }
3106 3188 $scope.ShowHideAnnotationText = function(windowviewid) {
3107 3189  
3108   - var btnStrutureBoxname = document.getElementById("comment-box_"+windowviewid).name;
  3190 + var showHideAnnotations = $scope.GetAAwindowStoreData(windowviewid, 'showHideAnnotations');
  3191 + document.getElementById("comment-box_"+windowviewid).name = showHideAnnotations;
3109 3192  
3110 3193 var speechBubbleDimaensions=$scope.GetAAwindowStoreData(windowviewid,'speechBubbleDimaensions');
3111   - if (btnStrutureBoxname == "showAnnotationText") {
3112   -
  3194 + if (showHideAnnotations == "showAnnotationText") {
3113 3195 for (var i = 0; i <= speechBubbleDimaensions.length - 1; i++) {
3114 3196 $("#" + speechBubbleDimaensions[i].speechBuubleId).css("display", "block");
3115 3197 $("#" + speechBubbleDimaensions[i].speechBubbleLineId).css("display", "block");
3116 3198 }
3117   -
3118 3199 }
3119 3200 else {
  3201 + $("#comment-box_"+windowviewid).addClass("disableAnnotationText");
3120 3202  
3121 3203 for (var i = 0; i <= speechBubbleDimaensions.length - 1; i++) {
3122 3204 $("#" + speechBubbleDimaensions[i].speechBuubleId).css("display", "none");
... ... @@ -3320,6 +3402,7 @@ function showSelectedSystemPins(event) {
3320 3402 console.log('OnBodySystem chnaged is called outside ');
3321 3403 var scope = angular.element(document.getElementById("aaBodyView")).scope();
3322 3404 scope.$apply(function () {
  3405 + //select system and its related pins
3323 3406 scope.showSelectedSystemPins(event);
3324 3407 });
3325 3408 }
... ... @@ -3343,7 +3426,7 @@ function showAllPins(event) {
3343 3426 var windowviewid = (event.target.id).split("_")[len-1];
3344 3427 var scope = angular.element(document.getElementById("aaBodyView")).scope();
3345 3428 scope.$apply(function () {
3346   - scope.showAllPinsAfterHide(windowviewid);
  3429 + scope.showAllPinEvent(windowviewid);
3347 3430 });
3348 3431 }
3349 3432  
... ... @@ -3368,7 +3451,7 @@ function onSearchItemSelection(termid) {
3368 3451 console.log('AA hide search is called');
3369 3452 var scope = angular.element(document.getElementById("aaBodyView")).scope();
3370 3453 scope.$apply(function () {
3371   - scope.highlightPinBasedOnSerachItem(termid);
  3454 + scope.highlightPinBasedOnSerachItemEvent(termid);
3372 3455 });
3373 3456 }
3374 3457  
... ... @@ -3389,7 +3472,7 @@ function showSelectedPins(event) {
3389 3472 var windowviewid = (event.target.id).split("_")[len-1];
3390 3473  
3391 3474 scope.$apply(function () {
3392   - scope.showSelectedPins(windowviewid);
  3475 + scope.showSelectedPinEvent(windowviewid);
3393 3476 });
3394 3477 }
3395 3478  
... ...
400-SOURCECODE/AIAHTML5.Web/app/services/AuthenticationService.js
  View file @855166b
... ... @@ -80,8 +80,8 @@
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');
  83 + // $rootScope.errorMessage = data;
  84 + // $("#messageModal").modal('show');
85 85  
86 86 });
87 87 return deferred.promise;
... ...
400-SOURCECODE/AIAHTML5.Web/app/services/ModuleService.js
  View file @855166b
... ... @@ -304,7 +304,8 @@ AIA.service(&#39;ModuleService&#39;, function ($http, DataService) {
304 304 position: windowData.position,
305 305 size: windowData.size,
306 306 contextMenu: windowData.contextMenu,
307   - selectedSearchId: windowData.selectedSearchId
  307 + showHideAnnotations: windowData.showHideAnnotations
  308 + // selectedSearchId: windowData.selectedSearchId
308 309  
309 310 });
310 311 }
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/da/da-body-view-list.html
  View file @855166b
... ... @@ -7,8 +7,8 @@
7 7  
8 8 <!-- Nav tabs -->
9 9 <ul class="inner-anatomyPageUl">
10   - <li id="Male" ng-click="getDAViewList($event)"><a><i class="fa fa-mars-stroke "></i> Male</a></li>
11   - <li id="Female" ng-click="getDAViewList($event)"><a><i class="fa fa-venus"></i> Female</a></li>
  10 + <li id="Male" ng-click="getDAViewList($event)" style="cursor: pointer;"><a><i class="fa fa-mars-stroke "></i> Male</a></li>
  11 + <li id="Female" ng-click="getDAViewList($event)" style="cursor: pointer;"><a><i class="fa fa-venus"></i> Female</a></li>
12 12 </ul>
13 13 <!-- Tab panes -->
14 14 <div class="tab-content">
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
  View file @855166b
... ... @@ -254,7 +254,7 @@
254 254 </div>
255 255 <div class="btn-group" style="vertical-align:top;">
256 256 <!-- <h6 class="text-center text-primary txt-white f11 col-xs-12">Search</h6>-->
257   - <button type="button" id="btnSearchList" class="btn btn-primary btn-sm col-xs-12" ng-click="ApplySearch()" style="margin-right:2px;">
  257 + <button type="button" id="btnSearchList" class="btn btn-primary btn-sm col-xs-12" ng-click="ApplySearch($event)" style="margin-right:2px;">
258 258 <!-- <i class="fa fa-search"></i>-->
259 259 Search
260 260 </button>
... ...