ADAM / AIAHTML5

Commit e14ef5914e694e1c8c51e12a313a6c1dbcde2db0

Authored by Birendra
2 parents 7de7cf21 1d68aa13

commitMerge branch 'CbNewUpdate' into AIA_Develop

Inline Side-by-side
Showing 5 changed files with 80 additions and 42 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js
  View file @e14ef59
... ... @@ -145,22 +145,22 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
145 145  
146 146 }
147 147  
148   - $window.onbeforeunload = function (e) {
149   - var confirmation = {};
150   - if($location.url()== "/curriculum-builder-detail") {
151   - var event = $rootScope.$broadcast('onBeforeUnload', confirmation);
152   - if (event.defaultPrevented) {
153   - return confirmation.message;
154   - }
155   - }
  148 + // $window.onbeforeunload = function (e) {
  149 + // var confirmation = {};
  150 + // if($location.url()== "/curriculum-builder-detail") {
  151 + // var event = $rootScope.$broadcast('onBeforeUnload', confirmation);
  152 + // if (event.defaultPrevented) {
  153 + // return confirmation.message;
  154 + // }
  155 + // }
156 156  
157   - };
  157 + // };
158 158 });
159 159  
160   - $scope.$on('onBeforeUnload', function (e, confirmation) {
161   - confirmation.message = "All data willl be lost.";
162   - e.preventDefault();
163   - });
  160 + // $scope.$on('onBeforeUnload', function (e, confirmation) {
  161 + // confirmation.message = "All data willl be lost.";
  162 + // e.preventDefault();
  163 + // });
164 164  
165 165 $rootScope.firstSelectedNodeId = null;
166 166 //load json data
... ... @@ -324,14 +324,12 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
324 324 objFileRead.readAsText(file);
325 325 }, 300);
326 326 } else {
327   - alert("Please select only Saved Curriculum Builder Json file!");
  327 + alert("Please select exported\saved Curriculum Builder Json file!");
328 328 }
329 329  
330 330 }
331 331  
332   - function receivedFile(e) {
333   - //let lines = e.target.result;
334   - $scope.CBEnableUI();
  332 + function receivedFile(e) {
335 333 var jsonData = JSON.parse(e.target.result);
336 334 localStorage.setItem("cbJsonDataObject", JSON.stringify(jsonData));
337 335 $rootScope.cbJsonData = "";
... ... @@ -1259,7 +1257,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
1259 1257 objFileRead.readAsText(file);
1260 1258 }, 300);
1261 1259 } else {
1262   - alert("Please select only Export Curriculum Builder Json file!");
  1260 + alert("Please select exported\saved Curriculum Builder Json file!");
1263 1261 }
1264 1262  
1265 1263 }
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @e14ef59
... ... @@ -5090,7 +5090,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
5090 5090  
5091 5091 var verticalScrollPosition = canvasDiv.scrollTop;
5092 5092 var horizontlScrollPosition = canvasDiv.scrollLeft;
5093   - $scope.angle(x, y, evt.pageX + horizontlScrollPosition - $('#canvasDivDA_' + windid).offset().left, evt.pageY + verticalScrollPosition - $('#canvasDivDA_' + windid).offset().top, true,windid);
  5093 + $scope.angle(x-2, y, evt.pageX + horizontlScrollPosition - $('#canvasDivDA_' + windid).offset().left, evt.pageY + verticalScrollPosition - $('#canvasDivDA_' + windid).offset().top, true,windid);
5094 5094 },
5095 5095 //Update Annotation Cordianate in case of show single Annotation
5096 5096 stop: function (evt) {
... ... @@ -5270,7 +5270,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
5270 5270 var canvasDiv = document.getElementById('canvasDivDA_' + windid);
5271 5271 var verticalScrollPosition = canvasDiv.scrollTop;
5272 5272 var horizontlScrollPosition = canvasDiv.scrollLeft;
5273   - $scope.angle(x, y, evt.pageX + horizontlScrollPosition - $('#canvasDivDA_' + windid).offset().left, evt.pageY + verticalScrollPosition - $('#canvasDivDA_' + windid).offset().top, false,windid);
  5273 + $scope.angle(x-2, y, evt.pageX + horizontlScrollPosition - $('#canvasDivDA_' + windid).offset().left, evt.pageY + verticalScrollPosition - $('#canvasDivDA_' + windid).offset().top, false,windid);
5274 5274 },
5275 5275  
5276 5276 //Update Annotation Cordianate in case of show single Annotation
... ... @@ -5436,10 +5436,10 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
5436 5436 var isHighlightBodyWithCBTermData=$scope.GetwindowStoreData(windowviewid,'isHighlightBodyWithCBTermData');
5437 5437 if (isHighlightBodyWithCBTermData == true) {
5438 5438  
5439   - var sppechBubbleHTML = "<div id ='" + pointClicked + "' class='com_" + windowviewid+"'><div style='z-index:60000;position:absolute;border-top:2px solid #000;transform:rotate(40deg);-moz-transform:rotate(40deg);-o-transform:rotate(40deg);-ms-transform:rotate(40deg);-webkit-transform:rotate(40deg);height:15px;width:35px;left:" + (x - 10) + "px;top:" + (y + 10) + "px;'' id='bubble" + speechBubbleCounter +"_" + windowviewid+ "'></div><div data=" + speechBubbleCounter + " id=" + id + " class='appendDragg' style='z-index:60000;margin-left:25px;border:1px solid #000;padding:5px 10px;position:absolute;color:#fff;text-align:left;font-size: 12px;font-weight:bold;background-color:#19100e;border-radius:5px;-moz-border-radius:5px;-webkit-border-radius:5px;-o-border-radius:5px;-ms-border-radius:5px;font-weight:bold;left:" + tipx + "px;top:" + tipy + "px;'><div style='z-index:7000;position:absolute;right:-3px;top:-4px;color:#ffffff;cursor:pointer;'><img id=" + speechBubbleCounter + " class='dynCross_" + windowviewid+"' style='width:18px' src=" + $rootScope.path + "></div></div><div style='position:absolute;border:1px solid #000;display:none;z-index:9000;' id='bord" + speechBubbleCounter+"_" + windowviewid+ "'></div></div>";
  5439 + var sppechBubbleHTML = "<div id ='" + pointClicked + "' class='com_" + windowviewid+"'><div class='multiLineAnnotation' style='z-index:60000; left:" + (x - 6) + "px;top:" + (y + 11) + "px;'' id='bubble" + speechBubbleCounter +"_" + windowviewid+ "'></div><div data=" + speechBubbleCounter + " id=" + id + " class='appendDragg' style='z-index:60000;margin-left:25px;border:1px solid #000;padding:5px 10px;position:absolute;color:#fff;text-align:left;font-size: 12px;font-weight:bold;background-color:#19100e;border-radius:5px;-moz-border-radius:5px;-webkit-border-radius:5px;-o-border-radius:5px;-ms-border-radius:5px;font-weight:bold;left:" + (tipx-4) + "px;top:" + tipy + "px;'><div style='z-index:7000;position:absolute;right:-3px;top:-4px;color:#ffffff;cursor:pointer;'><img id=" + speechBubbleCounter + " class='dynCross_" + windowviewid+"' style='width:18px' src=" + $rootScope.path + "></div></div><div style='position:absolute;border:1px solid #000;display:none;z-index:9000;' id='bord" + speechBubbleCounter+"_" + windowviewid+ "'></div></div>";
5440 5440 }
5441 5441 else {
5442   - var sppechBubbleHTML = "<div id ='" + pointClicked +"' class='com_" + windowviewid+"'><div style='z-index:60000;position:absolute;border-top:2px solid #000;transform:rotate(40deg);-moz-transform:rotate(40deg);-o-transform:rotate(40deg);-ms-transform:rotate(40deg);-webkit-transform:rotate(40deg);height:15px;width:35px;left:" + (x - 10) + "px;top:" + (y + 10) + "px;'' id='bubble" + speechBubbleCounter +"_" + windowviewid+ "'></div><div data=" + speechBubbleCounter + " id=" + id + " class='appendDragg' style='z-index:60000;margin-left:25px;border:1px solid #000;padding:5px 10px;position:absolute;color:#fff;text-align:left;font-size: 12px;font-weight:bold;background-color:#19100e;border-radius:5px;-moz-border-radius:5px;-webkit-border-radius:5px;-o-border-radius:5px;-ms-border-radius:5px;font-weight:bold;left:" + x + "px;top:" + y + "px;'><div style='z-index:7000;position:absolute;right:-3px;top:-4px;color:#ffffff;cursor:pointer;'><img id=" + speechBubbleCounter + " class='dynCross_" + windowviewid+"' style='width:18px' src=" + $rootScope.path + "></div></div><div style='position:absolute;border:1px solid #000;display:none;z-index:9000;' id='bord" + speechBubbleCounter +"_" + windowviewid+ "'></div></div>";
  5442 + var sppechBubbleHTML = "<div id ='" + pointClicked +"' class='com_" + windowviewid+"'><div class='multiLineAnnotation' style=' z-index:60000; left:" + (x - 6) + "px;top:" + (y + 11) + "px;'' id='bubble" + speechBubbleCounter +"_" + windowviewid+ "'></div><div data=" + speechBubbleCounter + " id=" + id + " class='appendDragg' style='z-index:60000;margin-left:25px;border:1px solid #000;padding:5px 10px;position:absolute;color:#fff;text-align:left;font-size: 12px;font-weight:bold;background-color:#19100e;border-radius:5px;-moz-border-radius:5px;-webkit-border-radius:5px;-o-border-radius:5px;-ms-border-radius:5px;font-weight:bold;left:" + (x-4) + "px;top:" + y + "px;'><div style='z-index:7000;position:absolute;right:-3px;top:-4px;color:#ffffff;cursor:pointer;'><img id=" + speechBubbleCounter + " class='dynCross_" + windowviewid+"' style='width:18px' src=" + $rootScope.path + "></div></div><div style='position:absolute;border:1px solid #000;display:none;z-index:9000;' id='bord" + speechBubbleCounter +"_" + windowviewid+ "'></div></div>";
5443 5443 }
5444 5444  
5445 5445 //Issue #7286 :Undefined annotation should not appear
... ... @@ -5486,7 +5486,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
5486 5486 $scope.createSpeechBubbleBasedOnAnnotationLengthwithoutCtrl = function (x, y, windowviewid, termNumber) {
5487 5487  
5488 5488  
5489   - var sppechBubbleDotHTML = '<div id="dot_'+windowviewid +'" style="position:absolute;height:15px;width:35px;display:none;z-index:10000;border-top:2px solid #000;transform:rotate(40deg);-moz-transform:rotate(40deg);-o-transform:rotate(40deg);-ms-transform:rotate(40deg);-webkit-transform:rotate(40deg);"></div>'
  5489 + var sppechBubbleDotHTML = '<div id="dot_'+windowviewid +'" class="singleLineAnnotation" style="z-index:10000"></div>'
5490 5490 + '<div id="sppeachBubble_' + windowviewid + '-' + termNumber +'" style="height:auto!important;z-index:10000;margin-left:25px;border:1px solid #000;display:none;padding:5px 10px;position:absolute;color:#fff;text-align:left;font-size:12px;background-color:#19100e;border-radius:5px;-moz-border-radius:5px;-webkit-border-radius:5px;-o-border-radius:5px;-ms-border-radius:5px;font-weight:bold;">'
5491 5491 + '<span style="position:absolute;right:-3px;top:-4px;color:#ffffff;cursor:pointer;">'
5492 5492 + '<img id="crossDiv_'+windowviewid +'" style="width:18px" src=' + $rootScope.path + '></span></div>'
... ... @@ -5523,20 +5523,20 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
5523 5523 var Globe = [];
5524 5524 Globe.push({ currentX: x, currentY: y });
5525 5525 document.getElementById('dot_'+windowviewid).style.display = 'block';
5526   - document.getElementById('dot_'+windowviewid).style.left = ((Globe[0].currentX) - 10) + 'px';
  5526 + document.getElementById('dot_'+windowviewid).style.left = ((Globe[0].currentX) - 6) + 'px';
5527 5527 document.getElementById('dot_'+windowviewid).style.top = ((Globe[0].currentY) + 10) + 'px';
5528 5528 document.getElementById('bord_'+windowviewid).style.display = 'block';
5529 5529 document.getElementById('bord_'+windowviewid).style.left = ((Globe[0].currentX) - 2) + 'px';
5530   - document.getElementById('bord_'+windowviewid).style.top = ((Globe[0].currentY) + 1) + 'px';
  5530 + document.getElementById('bord_'+windowviewid).style.top = ((Globe[0].currentY) + 0) + 'px';
5531 5531  
5532 5532 document.getElementById('sppeachBubble_' + windowviewid + '-' + termNumber).style.display = 'block';
5533   - document.getElementById('sppeachBubble_' + windowviewid + '-' + termNumber).style.left = (Globe[0].currentX) + 'px';
  5533 + document.getElementById('sppeachBubble_' + windowviewid + '-' + termNumber).style.left = ((Globe[0].currentX) - 2) + 'px';
5534 5534 document.getElementById('sppeachBubble_' + windowviewid + '-' + termNumber).style.top = (Globe[0].currentY) + 'px';
5535 5535 }
5536 5536  
5537 5537 $scope.createSpeechBubbleBasedOnTransparencyWithCtrl = function (pointClicked_annotation, Exists_annotation, x, y, sub_id_annotation, windowviewid, TPspeechBubbleCounter) {
5538 5538  
5539   - var sppechBubbleHTML_annotation = "<div id ='" + pointClicked_annotation + "' class='com_anno_"+windowviewid+"'><div style='z-index:59000;position:absolute;border-top:2px solid #000;transform:rotate(40deg);-moz-transform:rotate(40deg);-o-transform:rotate(40deg);-ms-transform:rotate(40deg);-webkit-transform:rotate(40deg);height:15px;width:35px;left:" + (x - 10) + "px;top:" + (y + 10) + "px;'' id='bubble" + TPspeechBubbleCounter + "'></div><div data=" + TPspeechBubbleCounter + " id=" + sub_id_annotation + " class='appendDragg_annotation' style='z-index:60000;margin-left:25px;border:1px solid #000;padding:5px 10px;position:absolute;color:#fff;text-align:left;font-size: 12px;background-color:#19100e;border-radius:5px;-moz-border-radius:5px;-webkit-border-radius:5px;-o-border-radius:5px;-ms-border-radius:5px;font-weight:bold;left:" + x + "px;top:" + y + "px;'><div style='z-index:7000;position:absolute;right:-3px;top:-4px;color:#ffffff;cursor:pointer;'><img id=" + TPspeechBubbleCounter + " class='dynCross_anno_"+windowviewid+"' style='width:18px' src=" + $rootScope.path + "></div></div><div style='position:absolute;border:1px solid #000;display:none;z-index:59000;' id='bord_annotation" + TPspeechBubbleCounter +"_" + windowviewid+ "'></div></div>";
  5539 + var sppechBubbleHTML_annotation = "<div id ='" + pointClicked_annotation + "' class='com_anno_"+windowviewid+"'><div class='multiLineAnnotation' style='z-index:60000;left:" + (x - 5) + "px;top:" + (y + 9) + "px;'' id='bubble" + TPspeechBubbleCounter + "'></div><div data=" + TPspeechBubbleCounter + " id=" + sub_id_annotation + " class='appendDragg_annotation' style='z-index:60000;margin-left:25px;border:1px solid #000;padding:5px 10px;position:absolute;color:#fff;text-align:left;font-size: 12px;background-color:#19100e;border-radius:5px;-moz-border-radius:5px;-webkit-border-radius:5px;-o-border-radius:5px;-ms-border-radius:5px;font-weight:bold;left:" + (x-4) + "px;top:" + y + "px;'><div style='z-index:7000;position:absolute;right:-3px;top:-4px;color:#ffffff;cursor:pointer;'><img id=" + TPspeechBubbleCounter + " class='dynCross_anno_"+windowviewid+"' style='width:18px' src=" + $rootScope.path + "></div></div><div style='position:absolute;border:1px solid #000;display:none;z-index:59000;' id='bord_annotation" + TPspeechBubbleCounter +"_" + windowviewid+ "'></div></div>";
5540 5540 if ($scope.longest_annotationT1.length > $scope.longest_annotationT2.length) {
5541 5541 if (Exists_annotation == 0) {
5542 5542 $('#canvasDivDA_' + windowviewid).append(sppechBubbleHTML_annotation);
... ... @@ -5591,7 +5591,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
5591 5591 $('#sppeachBubble_annotation_' + windowviewid).remove();
5592 5592 $('#sppeachBubble_annotation_' + windowviewid + '-' + termNumber).remove();
5593 5593 $('#dot_annotation_'+windowviewid).remove();
5594   - var sppechBubbleDotHTML_annotation = '<div id="dot_annotation_'+windowviewid +'" style="position:absolute;height:15px;width:35px;display:none;z-index:59000;border-top:2px solid #000;transform:rotate(40deg);-moz-transform:rotate(40deg);-o-transform:rotate(40deg);-ms-transform:rotate(40deg);-webkit-transform:rotate(40deg);"></div>'
  5594 + var sppechBubbleDotHTML_annotation = '<div id="dot_annotation_'+windowviewid +'" class="singleLineAnnotation" style="z-index:59000"></div>'
5595 5595 + '<div id="sppeachBubble_annotation_' + windowviewid + '-' + termNumber + '" style="height:auto!important;z-index:60000;margin-left:25px;border:1px solid #000;display:none;padding:5px 10px;position:absolute;color:#fff;text-align:left;font-size:12px;background-color:#19100e;font-weight:bold;border-radius:5px;-moz-border-radius:5px;-webkit-border-radius:5px;-o-border-radius:5px;-ms-border-radius:5px;font-weight:bold;">'
5596 5596 + '<span style="position:absolute;right:-3px;top:-4px;color:#ffffff;cursor:pointer;">'
5597 5597 + '<img class="crossDiv_annotation_'+windowviewid +'" style="width:18px" src=' + $rootScope.path + '></span></div>'
... ... @@ -5639,13 +5639,13 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
5639 5639 var Globe = [];
5640 5640 Globe.push({ currentX: x, currentY: y });
5641 5641 document.getElementById('dot_annotation_'+windowviewid).style.display = 'block';
5642   - document.getElementById('dot_annotation_'+windowviewid).style.left = ((Globe[0].currentX) - 10) + 'px';
  5642 + document.getElementById('dot_annotation_'+windowviewid).style.left = ((Globe[0].currentX) - 6) + 'px';
5643 5643 document.getElementById('dot_annotation_'+windowviewid).style.top = ((Globe[0].currentY) + 10) + 'px';
5644 5644 document.getElementById('bord_annotation_'+windowviewid).style.display = 'block';
5645 5645 document.getElementById('bord_annotation_'+windowviewid).style.left = ((Globe[0].currentX) - 2) + 'px';
5646   - document.getElementById('bord_annotation_'+windowviewid).style.top = ((Globe[0].currentY) + 1) + 'px';
  5646 + document.getElementById('bord_annotation_'+windowviewid).style.top = ((Globe[0].currentY)) + 'px';
5647 5647 document.getElementById('sppeachBubble_annotation_' + windowviewid + '-' + termNumber).style.display = 'block';
5648   - document.getElementById('sppeachBubble_annotation_' + windowviewid + '-' + termNumber).style.left = (Globe[0].currentX) + 'px';
  5648 + document.getElementById('sppeachBubble_annotation_' + windowviewid + '-' + termNumber).style.left = (Globe[0].currentX-2) + 'px';
5649 5649 document.getElementById('sppeachBubble_annotation_' + windowviewid + '-' + termNumber).style.top = (Globe[0].currentY) + 'px';
5650 5650  
5651 5651 }
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @e14ef59
1 1 ๏ปฟ'use strict';
2 2  
3   -AIA.controller("HomeController", ["$rootScope", "$scope", "Modules", "$log", "$location", "$compile", "$timeout", "DataService", "AuthenticationService", "ConfigurationService", "LoginConstants", "UserModules", "LoginMessageConstants", "AdminService", "$http", "AdminConstants", "UserTypeConstants", "AIAConstants","ModuleService",
4   -function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, DataService, AuthenticationService, ConfigurationService, LoginConstants, UserModules, LoginMessageConstants, AdminService, $http, AdminConstants, UserTypeConstants, AIAConstants, ModuleService) {
  3 +AIA.controller("HomeController", ["$rootScope", "$scope", "Modules", "$log", "$location", "$compile", "$timeout", "DataService", "AuthenticationService", "ConfigurationService", "LoginConstants", "UserModules", "LoginMessageConstants", "AdminService", "$http", "AdminConstants", "UserTypeConstants", "AIAConstants","ModuleService","$window",
  4 +function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, DataService, AuthenticationService, ConfigurationService, LoginConstants, UserModules, LoginMessageConstants, AdminService, $http, AdminConstants, UserTypeConstants, AIAConstants, ModuleService,$window) {
5 5  
6 6 //$scope.pageToOpen = {
7 7 // name: 'MainMenu'
... ... @@ -1850,6 +1850,21 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
1850 1850 $("#font-color .minicolors .minicolors-swatch .minicolors-swatch-color").css({ "background-color": "#000000" });
1851 1851 $("#drawTextBGColorpicker .minicolors .minicolors-swatch .minicolors-swatch-color").css({ "background-color": "#ffffff" });
1852 1852  
  1853 + $window.onbeforeunload = function (e) {
  1854 + var confirmation = {};
  1855 + if($location.url()!= "/") {
  1856 + var event = $rootScope.$broadcast('onBeforeUnload', confirmation);
  1857 + if (event.defaultPrevented) {
  1858 + return confirmation.message;
  1859 + }
  1860 + }
  1861 +
  1862 + };
  1863 + });
  1864 +
  1865 + $scope.$on('onBeforeUnload', function (e, confirmation) {
  1866 + confirmation.message = "All data willl be lost.";
  1867 + e.preventDefault();
1853 1868 });
1854 1869  
1855 1870 $rootScope.$on("$locationChangeSuccess", function () {
... ... @@ -3150,7 +3165,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
3150 3165  
3151 3166 break;
3152 3167 case 'mouseup':
3153   - $scope.savePaintAnnotation(this.el.id,this.actions,);
  3168 + $scope.savePaintAnnotation(this.el.id,this.actions);
3154 3169  
3155 3170 case 'mouseout':
3156 3171 case 'mouseleave':
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
  View file @e14ef59
... ... @@ -35,8 +35,9 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
35 35  
36 36 $scope.setActiveTab = function (tabToSet) {
37 37  
38   - $scope.activeTab = tabToSet;
  38 + $scope.activeTab = tabToSet==undefined?1:tabToSet;
39 39 localStorage.setItem("activeTab", $scope.activeTab);
  40 +
40 41 if ($scope.activeTab == 1) {
41 42 $('#grid-view').css("display", "block");
42 43 $('#list-view').css("display", "none");
... ... @@ -246,7 +247,9 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
246 247 if ($rootScope.refreshcheck == null) {
247 248 $location.path('/');
248 249 }
249   - $scope.activeTab = 1;
  250 + var curtab = $rootScope.getLocalStorageValue("activeTab");
  251 + $scope.setActiveTab(curtab)
  252 +
250 253 console.log('loadForModuleById is called')
251 254 $scope.SetAAwindowStoreData($rootScope.MULTI_VIEW_ID,'moduleName',"ATLAS_ANATOMY");
252 255  
... ... @@ -306,15 +309,14 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
306 309  
307 310 }, 100);
308 311  
309   - $('#list-view').css('display', 'none');
  312 + // $('#list-view').css('display', 'none');
310 313 }
311 314  
312 315 $scope.openModuleItemView = function ($event) {
313 316  
314 317 var windowviewid = $rootScope.MULTI_VIEW_ID;
315 318 $rootScope.MenuModuleName = "AA";
316   - localStorage.setItem("activeTab", $scope.activeTab);
317   -
  319 +
318 320 //0. Get selected Image Id
319 321 if ($scope.isListViewButtonClicked == true) {
320 322 if ($scope.isOpenBtnClicked == true) {
... ... @@ -2084,7 +2086,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
2084 2086  
2085 2087 var isShowBodyWithCBPinData=$scope.GetAAwindowStoreData(windowviewid,'isShowBodyWithCBPinData');
2086 2088  
2087   - var speechBubbleHTML = '<div id="speechBubbleLine' + PinId +'_'+windowviewid+ '" style="position:absolute;height:15px;width:35px;display:none;z-index:13000;border-top:2px solid #000;transform:rotate(40deg);-moz-transform:rotate(40deg);-o-transform:rotate(40deg);-ms-transform:rotate(40deg);-webkit-transform:rotate(40deg);"></div>'
  2089 + var speechBubbleHTML = '<div id="speechBubbleLine' + PinId +'_'+windowviewid+ '" class="singleLineAnnotation" style="z-index:13000"></div>'
2088 2090 + '<div id="speechBubble' + PinId +'_'+windowviewid+ '" class="common-drag" style="height:auto!important;z-index:13000;margin-left:0px;border:1px solid #000;padding:5px 10px;position:absolute;color:#fff;text-align:left;font-size:12px;background-color:#19100e;border-radius:5px;-moz-border-radius:5px;-webkit-border-radius:5px;-o-border-radius:5px;-ms-border-radius:5px;font-weight:bold;">'
2089 2091 + '<span style="position:absolute;right:-3px;top:-4px;color:#ffffff;cursor:pointer;">'
2090 2092 + '<img id="closeBtn' + PinId +'_'+windowviewid+ '" class="crossDiv_temp" style="width:18px" src=' + $rootScope.closeBtnImgPath + '></span></div>'
... ... @@ -2206,6 +2208,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
2206 2208 }
2207 2209 $('.common-drag').draggable(
2208 2210 {
  2211 + containment: '#canvasAADiv_' + windowviewid,
2209 2212 drag: function (evt) {
2210 2213 //stop: function (evt) {
2211 2214 var clickedSpeechBubbleId = $(this).attr("id");
... ...
400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
  View file @e14ef59
... ... @@ -1311,6 +1311,28 @@ footer .browserIcons
1311 1311 -webkit-text-security: disc;
1312 1312 }
1313 1313  
  1314 +
  1315 +.singleLineAnnotation {
  1316 + position:absolute;
  1317 + width:36px;
  1318 + display:none;
  1319 + border-top:2px solid #000;
  1320 + transform:rotate(40deg);
  1321 + -moz-transform:rotate(40deg);
  1322 + -o-transform:rotate(40deg);
  1323 + -ms-transform:rotate(40deg);
  1324 + -webkit-transform:rotate(40deg);
  1325 +}
  1326 +.multiLineAnnotation {
  1327 + position:absolute;
  1328 + width:35px;
  1329 + border-top:2px solid #000;
  1330 + transform:rotate(40deg);
  1331 + -moz-transform:rotate(40deg);
  1332 + -o-transform:rotate(40deg);
  1333 + -ms-transform:rotate(40deg);
  1334 + -webkit-transform:rotate(40deg);
  1335 +}
1314 1336  
1315 1337 .cbMoveUpDown
1316 1338 {
... ... @@ -1379,7 +1401,7 @@ footer .browserIcons
1379 1401 width:100%;
1380 1402 height:100%;
1381 1403  
1382   - filter: Alpha(opacity=50); / IE8 and earlier /
  1404 + filter: Alpha(opacity=50); /* IE8 and earlier */
1383 1405 }
1384 1406  
1385 1407  
... ... @@ -1406,7 +1428,7 @@ footer .browserIcons
1406 1428 width:100%;
1407 1429 height:100%;
1408 1430  
1409   - filter: Alpha(opacity=50); / IE8 and earlier /
  1431 + filter: Alpha(opacity=50); /* IE8 and earlier */
1410 1432 }
1411 1433  
1412 1434  
... ...