ADAM / AIAHTML5

Commit 76ae71d9784f8eaf76a211a82ea1481175a71941

Authored by Amrita Vishnoi
2 parents 555dd5dd 638c685f

Big Change; Disabled UI for saving us for creating multiple issues.

Inline Side-by-side
Showing 5 changed files with 124 additions and 50 deletions
150-DOCUMENTATION/001-CONFIGURATION/ADAM Education Servers List-updated.xlsx
View file @76ae71d
No preview for this file type
150-DOCUMENTATION/Audit/Sprints/JulyAugSep/Ebix-Estimation Model_Health_Dev_Product Sprint 40(30-Sep-2017).xlsx 0 → 100644
View file @76ae71d
No preview for this file type
150-DOCUMENTATION/Audit/Sprints/JulyAugSep/Ebix-Estimation Model_Health_Dev_Sep17.xlsx
View file @76ae71d
No preview for this file type
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @76ae71d
... ... @@ -11,7 +11,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
11 11 $scope.imagePath = "";
12 12 $rootScope.BodyRegionData;
13 13 $rootScope.BodyRegionCordinatesData;
14   - $scope.isTransparencyActivated = false;
  14 + $rootScope.isTransparencyActivated = false;
15 15 $scope.isTransparencyBtnClicked = false;
16 16 $rootScope.BodyLayerData;
17 17 $rootScope.VocabTermData;
... ... @@ -274,12 +274,34 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
274 274  
275 275 };
276 276  
  277 + $scope.DisableUI = function () {
  278 + var daImagePanelConetent = document.getElementsByClassName("jsPanel-content");
  279 + for (var i = 0; i < daImagePanelConetent.length; i++) {
  280 + daImagePanelConetent[i].style.pointerEvents = "none";
  281 + daImagePanelConetent[i].style.opacity = "0.5";
  282 +
  283 + }
  284 + //to disbale layer change slider
  285 + $('.ui-slider').slider('disable');
  286 + }
  287 +
  288 + $scope.EnableUI = function () {
277 289  
  290 + var daImagePanelConetent = document.getElementsByClassName("jsPanel-content");
  291 + for (var i = 0; i < daImagePanelConetent.length; i++) {
  292 + daImagePanelConetent[i].style.pointerEvents = "auto";
  293 + daImagePanelConetent[i].style.opacity = "1";
  294 + }
  295 + //to enable layer change slider
  296 + $('.ui-slider').slider('enable');
  297 +
  298 + }
278 299  
279 300 $scope.openView = function ($event) {
  301 + $scope.DisableUI();
  302 +
280 303 $rootScope.disableAnnotationTB = false;
281 304 $rootScope.MenuModuleName = "DA";
282   - //alert($rootScope.MenuModuleName);
283 305 $rootScope.isLoading = true;
284 306 $('#spinner').css('visibility', 'visible');
285 307  
... ... @@ -595,6 +617,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
595 617 }
596 618  
597 619 angular.element(document).ready(function (e) {
  620 +
598 621 $(document).on("click", "#daImagePanel .jsPanel-hdr .jsPanel-hdr-r .jsPanel-btn-close .jsglyph-remove", function () {
599 622 $rootScope.selectedBodySystemName = 'All';
600 623 $rootScope.selectedBodySystemId = 0;
... ... @@ -980,10 +1003,17 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
980 1003 var canDiv = document.getElementById('canvasDiv');
981 1004 var canDivChildCount = canDiv.childElementCount;
982 1005 if (canDivChildCount > 0) {
983   - canDiv.innerHTML = '';
984 1006  
985   - //remove transparency scale
986   - $('#transparencyScale').css('visibility', 'hidden');
  1007 + if ($rootScope.isTransparencyActivated) {
  1008 + $scope.flushCanvas();
  1009 + $('#transparencyScale').css('visibility', 'visible');
  1010 + }
  1011 + else {
  1012 + canDiv.innerHTML = '';
  1013 + //remove transparency scale
  1014 + $('#transparencyScale').css('visibility', 'hidden');
  1015 + }
  1016 +
987 1017 }
988 1018  
989 1019 if ($scope.ColoredImageSRC != null && $scope.ColoredImageSRC.length > 0) {
... ... @@ -1729,6 +1759,13 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
1729 1759 }
1730 1760 );
1731 1761 }
  1762 + //else if ($scope.ColoredImageSRC.length == totalCanvas)
  1763 + //{
  1764 + // // dispatch event for enabling rest UI
  1765 + // alert('all canvas drawn');
  1766 + // $scope.EnableUI();
  1767 + //}
  1768 +
1732 1769 //-NIKI-for solving extarct issue 8286
1733 1770  
1734 1771 var imageCanvas = document.getElementById('imageCanvas' + bodyRegionId + '_MR');
... ... @@ -1778,6 +1815,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
1778 1815 if ($scope.isExtract == true) {
1779 1816 $rootScope.isLoading = true;
1780 1817 $('#spinner').css('visibility', 'visible');
  1818 + $scope.DisableUI();
1781 1819 $scope.highLightBody();
1782 1820 }
1783 1821 else if ($rootScope.isHighLight == true || ($rootScope.isListManagerSelected == true) || (($rootScope.isGenderChnage == true) && ($rootScope.isHighLight == true))
... ... @@ -1788,12 +1826,14 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
1788 1826 $rootScope.isLoading = true;
1789 1827 $('#spinner').css('visibility', 'visible');
1790 1828 $rootScope.isHighLight = true;
  1829 + $scope.DisableUI();
1791 1830 $scope.highLightBody();
1792 1831 }
1793 1832 }
1794 1833 else {
1795 1834 $rootScope.isLoading = false;
1796 1835 $('#spinner').css('visibility', 'hidden');
  1836 + $scope.EnableUI();
1797 1837 }
1798 1838 }
1799 1839  
... ... @@ -2198,6 +2238,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
2198 2238 if ($scope.isExtract == true) {
2199 2239 $rootScope.isLoading = true;
2200 2240 $('#spinner').css('visibility', 'visible');
  2241 + $scope.DisableUI();
2201 2242 $scope.highLightBody();
2202 2243 }
2203 2244 else if ($rootScope.isHighLight == true || ($rootScope.isListManagerSelected == true) || (($rootScope.isGenderChnage == true) && ($rootScope.isHighLight == true))
... ... @@ -2212,7 +2253,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
2212 2253 $rootScope.isHighLight = true;
2213 2254  
2214 2255 console.log('just before highLightBody call');
2215   -
  2256 + $scope.DisableUI();
2216 2257 $scope.highLightBody();
2217 2258  
2218 2259 console.log('just after highLightBody call');
... ... @@ -2221,11 +2262,13 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
2221 2262 else {
2222 2263 $rootScope.isLoading = false;
2223 2264 $('#spinner').css('visibility', 'hidden');
  2265 + $scope.EnableUI();
2224 2266 }
2225 2267 }
2226 2268 else {
2227 2269 $rootScope.isLoading = false;
2228 2270 $('#spinner').css('visibility', 'hidden');
  2271 + $scope.EnableUI();
2229 2272 }
2230 2273 }
2231 2274  
... ... @@ -2515,7 +2558,9 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
2515 2558 //}
2516 2559  
2517 2560 if ($scope.doAligneCanvasWithTerm == true) {
2518   - $scope.aligneCanvasWithTerm()
  2561 + $scope.aligneCanvasWithTerm();
  2562 +
  2563 + $scope.EnableUI();
2519 2564 }
2520 2565  
2521 2566 // $timeout(function () { $scope.DisableProgressBar() }, 1000);
... ... @@ -2536,8 +2581,8 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
2536 2581  
2537 2582 $scope.HighlightBodyByTermList = function (TermList) {
2538 2583  
2539   - $("#btnTranparency").attr('disabled', 'disabled');
2540   - $scope.currentLayerNumber = $scope.layerNumber;
  2584 + // $("#btnTranparency").attr('disabled', 'disabled');
  2585 + $rootScope.currentLayerNumber = $scope.layerNumber;
2541 2586  
2542 2587 $scope.layerNumber = $('#txtlayerNumber').val();
2543 2588  
... ... @@ -2803,7 +2848,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
2803 2848  
2804 2849 $('#spinner').css('visibility', 'hidden');
2805 2850  
2806   -
  2851 + $scope.EnableUI();
2807 2852  
2808 2853 }
2809 2854 }
... ... @@ -2829,7 +2874,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
2829 2874 document.getElementById("daView").style.pointerEvents="none";
2830 2875 $('.ui-slider').slider('disable');
2831 2876 $("#btnTranparency").attr('disabled', 'disabled');
2832   - $scope.currentLayerNumber = $scope.layerNumber;
  2877 + $rootScope.currentLayerNumber = $scope.layerNumber;
2833 2878  
2834 2879 $scope.layerNumber = $('#txtlayerNumber').val();
2835 2880  
... ... @@ -2838,7 +2883,8 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
2838 2883  
2839 2884  
2840 2885 if ($rootScope.isHighLight == true) {
2841   - false;
  2886 + $rootScope.isHighLight = false;
  2887 + $scope.CloseTransparencyBox();
2842 2888 }
2843 2889  
2844 2890 console.log('HighlightBodyByTermListForBodySystem is called');
... ... @@ -3076,9 +3122,9 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
3076 3122 $('#spinner').css('visibility', 'hidden')
3077 3123 $rootScope.isLoading = false;
3078 3124  
3079   - document.getElementById("daView").style.pointerEvents = "auto";
3080   - $('.ui-slider').slider('enable');
3081   -
  3125 + //document.getElementById("daView").style.pointerEvents = "auto";
  3126 + //$('.ui-slider').slider('enable');
  3127 + $scope.EnableUI();
3082 3128 prevBRID = TermExistInBodyRegionId;
3083 3129  
3084 3130 $scope.scrollToHighlightedBodyRegion(TermExistInBodyRegionId);
... ... @@ -3292,6 +3338,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
3292 3338 //layer change function
3293 3339 $scope.LayerChange = function () {
3294 3340  
  3341 + $scope.DisableUI();
3295 3342  
3296 3343 //if listanager is visisble then close it
3297 3344 // $rootScope.isListManagerSelected = false;
... ... @@ -3311,7 +3358,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
3311 3358 // $('#daLoaderLabel').css('visibility', 'visible');
3312 3359  
3313 3360  
3314   - if ($scope.isTransparencyActivated) {
  3361 + if ($rootScope.isTransparencyActivated) {
3315 3362  
3316 3363 //crete temp canavs to store the original data which will be used to chnange the transparency
3317 3364 if (document.getElementById('tempCanvas') != null) {
... ... @@ -3462,11 +3509,11 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
3462 3509 var dataLength = $rootScope.BodyLayerData.Layers.DataLayer.length;
3463 3510 if (parseInt($('#txtlayerNumber').val()) > (dataLength - 1)) {
3464 3511 $('#txtlayerNumber').val(dataLength - 1);
3465   - $scope.currentLayerNumber = parseInt(dataLength - 1);
  3512 + $rootScope.currentLayerNumber = parseInt(dataLength - 1);
3466 3513 $scope.layerNumber = parseInt(dataLength - 1);
3467 3514 }
3468 3515 else
3469   - $scope.currentLayerNumber = parseInt($('#txtlayerNumber').val());
  3516 + $rootScope.currentLayerNumber = parseInt($('#txtlayerNumber').val());
3470 3517  
3471 3518 //$scope.isMousUp();
3472 3519  
... ... @@ -4318,9 +4365,9 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
4318 4365  
4319 4366 document.getElementById('canvasDiv').removeEventListener("mousedown", mouseDownListener);
4320 4367 //Dated:19-07-2016 Issue#4975: Transparency box should not be clickable if it is already selected.
4321   - if ($("#txtlayerNumber").val() != 0 && $scope.currentLayerNumber != undefined) {
4322   - $('#layerChangeSlider').slider("option", "value", parseInt($rootScope.totalLayers) - parseInt($scope.currentLayerNumber));
4323   - $("#txtlayerNumber").val(parseInt($scope.currentLayerNumber));
  4368 + if ($("#txtlayerNumber").val() != 0 && $rootScope.currentLayerNumber != undefined) {
  4369 + $('#layerChangeSlider').slider("option", "value", parseInt($rootScope.totalLayers) - parseInt($rootScope.currentLayerNumber));
  4370 + $("#txtlayerNumber").val(parseInt($rootScope.currentLayerNumber));
4324 4371 }
4325 4372  
4326 4373 }
... ... @@ -4354,6 +4401,8 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
4354 4401  
4355 4402 function mouseUpListener(e) {
4356 4403  
  4404 + $scope.DisableUI();
  4405 +
4357 4406 $scope.isTBDrawnOnBodyRegion = false;
4358 4407  
4359 4408 $(".com").remove();
... ... @@ -4365,7 +4414,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
4365 4414 var previewRectangleHeight = $('.rectangle').height()
4366 4415  
4367 4416  
4368   - $scope.currentLayerNumber = parseInt($('#txtlayerNumber').val());
  4417 + $rootScope.currentLayerNumber = parseInt($('#txtlayerNumber').val());
4369 4418 $('.rectangle').remove();
4370 4419  
4371 4420 var currentMousePosition = $scope.getMousePos(e);
... ... @@ -4413,7 +4462,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
4413 4462 }
4414 4463  
4415 4464  
4416   - $scope.isTransparencyActivated = true;
  4465 + $rootScope.isTransparencyActivated = true;
4417 4466 $scope.isTransparencyBtnClicked = false;
4418 4467  
4419 4468 var BodyRegionDictionary = $rootScope.BodyRegionCordinatesData;
... ... @@ -4592,7 +4641,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
4592 4641  
4593 4642 $('#btnTranparency').addClass('tButtonActive');
4594 4643  
4595   - // $('#txtlayerNumber').val((parseInt($scope.currentLayerNumber)) + 1);
  4644 + // $('#txtlayerNumber').val((parseInt($rootScope.currentLayerNumber)) + 1);
4596 4645 //Dated:18-07-2016 Issue#4975: Transparency box should not be clickable if it is already selected.
4597 4646 $('#btnTranparency').removeClass('tButtonActive');
4598 4647 $('#btnTranparency').addClass('btn-black');
... ... @@ -5317,6 +5366,8 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
5317 5366  
5318 5367  
5319 5368 }
  5369 +
  5370 + $scope.EnableUI();
5320 5371 }
5321 5372  
5322 5373  
... ... @@ -6322,7 +6373,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
6322 6373  
6323 6374 // $rootScope.switchCanvas();
6324 6375 //To enable extract button
6325   - $scope.isTransparencyActivated = false;
  6376 + $rootScope.isTransparencyActivated = false;
6326 6377 $("#btnExtract").removeClass("disabled");
6327 6378  
6328 6379  
... ... @@ -6368,12 +6419,12 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
6368 6419  
6369 6420  
6370 6421  
6371   - $('#layerChangeSlider').slider("option", "value", parseInt($rootScope.totalLayers) - parseInt($scope.currentLayerNumber));
  6422 + $('#layerChangeSlider').slider("option", "value", parseInt($rootScope.totalLayers) - parseInt($rootScope.currentLayerNumber));
6372 6423 //if ($scope.isGenderChnage || $rootScope.isViewChange) {
6373 6424 // $("#txtlayerNumber").val(parseInt(0));
6374 6425 //}
6375 6426 //else
6376   - $("#txtlayerNumber").val(parseInt($scope.currentLayerNumber));
  6427 + $("#txtlayerNumber").val(parseInt($rootScope.currentLayerNumber));
6377 6428  
6378 6429  
6379 6430 if (document.getElementById('tempCanvas') != null) {
... ... @@ -6385,7 +6436,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
6385 6436 //var scope = angular.element(document.getElementById("DAView")).scope();
6386 6437 //scope.$apply(function () {
6387 6438 // $scope.layerNumber = 0;
6388   - // $scope.isTransparencyActivated = false;
  6439 + // $rootScope.isTransparencyActivated = false;
6389 6440 //})
6390 6441  
6391 6442  
... ... @@ -6398,7 +6449,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
6398 6449  
6399 6450 //$("canvas[name*='transparencyTempCanvas']").nextUntil($("canvas[name*='transparencyTempCanvas']"))
6400 6451 //.remove();
6401   - $scope.layerNumber = $scope.currentLayerNumber;
  6452 + $scope.layerNumber = $rootScope.currentLayerNumber;
6402 6453 $scope.transNumber = 100;
6403 6454 $(".slider").slider({ value: 100 })
6404 6455 }
... ... @@ -6414,7 +6465,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
6414 6465  
6415 6466 $('#transparencyScale').css('visibility', 'hidden');
6416 6467  
6417   - //$scope.isTransparencyActivated = false;
  6468 + //$rootScope.isTransparencyActivated = false;
6418 6469 // document.getElementById('btnTranparency').className = 't-transparency'
6419 6470 $('#btnTranparency').removeClass('tButtonActive');
6420 6471 $('#btnTranparency').addClass('btn-black');
... ... @@ -6569,7 +6620,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
6569 6620  
6570 6621 $scope.terminateCurrentlyRunningWPs();
6571 6622  
6572   - if ($scope.isTransparencyActivated) {
  6623 + if ($rootScope.isTransparencyActivated) {
6573 6624  
6574 6625 $scope.CloseTransparencyBox();
6575 6626  
... ... @@ -6712,16 +6763,11 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
6712 6763  
6713 6764 $scope.enableHighlight = function () {
6714 6765  
6715   -
6716   - // $("#btnExtract").removeClass("disabled");
6717   - // $("#btnTranparency").removeClass("disabled");
  6766 + $scope.DisableUI();
  6767 +
6718 6768 $("#btnTranparency").removeAttr('disabled', 'disabled');
6719   - // $rootScope.isTransparencyBoxActivated = false;
6720   - // $rootScope.isNormalMode = false;
6721 6769  
6722 6770 //if listanager is visisble then close it
6723   -
6724   - // $rootScope.isListManagerSelected = false;
6725 6771 $rootScope.CloseListManager();
6726 6772  
6727 6773  
... ... @@ -6730,7 +6776,6 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
6730 6776 //to make the system highlight if the body systme highlighted than Normal and again highlight
6731 6777 $scope.isbodySystemHighlight = true;
6732 6778 }
6733   - // $rootScope.isHighlightBodyByBodySystem = false;
6734 6779  
6735 6780 if ($rootScope.isHighLight == true) {
6736 6781  
... ... @@ -6794,8 +6839,8 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
6794 6839 $scope.enableNormalMode = function () {
6795 6840 $("#btnTranparency").removeClass("disabled");
6796 6841  
6797   - if ($scope.isTransparencyActivated) {
6798   - $scope.layerNumber = $scope.currentLayerNumber;
  6842 + if ($rootScope.isTransparencyActivated) {
  6843 + $scope.layerNumber = $rootScope.currentLayerNumber;
6799 6844 }
6800 6845 else {
6801 6846 $scope.layerNumber = $('#txtlayerNumber').val();
... ... @@ -6896,6 +6941,8 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
6896 6941  
6897 6942 $scope.enableExtract = function (isCalledFromButton) {
6898 6943  
  6944 + $scope.DisableUI();
  6945 +
6899 6946 console.log('isCalledFromButton= ' + isCalledFromButton);
6900 6947  
6901 6948 //$rootScope.isHighlightBodyByBodySystem = false;
... ... @@ -6906,7 +6953,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
6906 6953 $rootScope.CanvasDivLeftPosition = $("#canvasDiv").scrollLeft();
6907 6954  
6908 6955  
6909   - if ($scope.isTransparencyActivated == true) {
  6956 + if ($rootScope.isTransparencyActivated == true) {
6910 6957  
6911 6958 $("#btnExtract").addClass("disabled");
6912 6959  
... ... @@ -7034,7 +7081,12 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
7034 7081  
7035 7082 $scope.highLightBody = function () {
7036 7083  
7037   - $scope.CloseTransparencyBox();
  7084 + if ($rootScope.isTransparencyActivated && $rootScope.isGlobalSettingChanged) {
  7085 + //do not close Tbox
  7086 + $rootScope.isGlobalSettingChanged = false;
  7087 + }
  7088 + else
  7089 + $scope.CloseTransparencyBox();
7038 7090 if ($scope.isTransparencyBtnClicked == true && !$scope.isTransparencyActivated) {
7039 7091 $("#btnExtract").addClass("disabled");
7040 7092 $('#btnTranparency').addClass('tButtonActive');
... ... @@ -7249,6 +7301,10 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
7249 7301 else {
7250 7302 $scope.isLoading = false;
7251 7303 $('#spinner').css('visibility', 'hidden');
  7304 +
  7305 + //for highlight when highlight button is clicked the ui got disabled,
  7306 + //now highlight is completed so enalbe UI
  7307 + $scope.EnableUI();
7252 7308 }
7253 7309  
7254 7310 }
... ... @@ -7278,7 +7334,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
7278 7334 else {
7279 7335 $scope.isLoading = false;
7280 7336 $('#spinner').css('visibility', 'hidden');
7281   -
  7337 + $scope.EnableUI();
7282 7338 }
7283 7339 }
7284 7340 }
... ... @@ -7417,6 +7473,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
7417 7473 else {
7418 7474 $scope.isLoading = false;
7419 7475 $('#spinner').css('visibility', 'hidden');
  7476 + $scope.EnableUI();
7420 7477  
7421 7478 }
7422 7479 }
... ... @@ -7529,6 +7586,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
7529 7586  
7530 7587 $scope.OnGenderChange = function (event) {
7531 7588  
  7589 + $scope.DisableUI();
7532 7590  
7533 7591 var canvasDiv = document.getElementById('canvasDiv');
7534 7592 $scope.imageVerticalScrollPosition = canvasDiv.scrollTop;
... ... @@ -7773,9 +7831,9 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
7773 7831 }
7774 7832  
7775 7833 $scope.OnViewChange = function (event) {
7776   - // alert(event.target.title);
7777   - // alert($("[title*='" + event.target.title + "']").parent().hasClass("active"));
7778   - if ($("[title='" + event.target.title + "']").parent().hasClass("active") == true) {
  7834 +
  7835 + $scope.DisableUI();
  7836 +
7779 7837  
7780 7838  
7781 7839  
... ... @@ -8001,13 +8059,19 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
8001 8059 //Reload DA controller Body View after setting Change
8002 8060 $scope.$on('reloadDABodyViewEvent', function (event, data) {
8003 8061 //console.log('reloadDABodyViewEvent');
  8062 + $rootScope.isGlobalSettingChanged = true;
8004 8063 if ($rootScope.isSettingEventAlredayDispachted == true) {
  8064 + $scope.DisableUI();
8005 8065 $rootScope.isSettingEventAlredayDispachted = false;
8006 8066 $scope.layerNumber = parseInt($('#txtlayerNumber').val());
8007 8067 //alert('mouseUp');
8008 8068  
  8069 + if ($rootScope.isTransparencyActivated && $rootScope.currentLayerNumber == 0) {
  8070 + $scope.layerNumber = $rootScope.currentLayerNumber;
  8071 + $scope.loadSelectedBodyView(data.reloadDABodyViewId);
8009 8072  
8010   - if ($scope.layerNumber == 0) {
  8073 + }
  8074 + else if ($scope.layerNumber == 0) {
8011 8075 $scope.loadSelectedBodyView(data.reloadDABodyViewId);
8012 8076 }
8013 8077 // $scope.loadSelectedBodyView(data.reloadDABodyViewId);
... ... @@ -8138,6 +8202,8 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
8138 8202  
8139 8203 $scope.HighlightBodyByBodySystem = function (event) {
8140 8204  
  8205 + $scope.DisableUI();
  8206 +
8141 8207 //if listanager is visisble then close it
8142 8208  
8143 8209 $rootScope.isListManagerSelected = false;
... ... @@ -8710,7 +8776,9 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
8710 8776  
8711 8777  
8712 8778 $scope.HighlightBodyOnListManagerSelection = function (actualTermNumber, isTermListOptionClicked) {
8713   - //$rootScope.SelectedTermList = $("#termList").find("option[id=" + actualTermNumber + "]").val();
  8779 +
  8780 + $scope.DisableUI();
  8781 +
8714 8782 $rootScope.searchSelectedText = $("#" + actualTermNumber).text();
8715 8783 $rootScope.slectedActualTermNumber = actualTermNumber;
8716 8784  
... ... @@ -9442,6 +9510,10 @@ function OnIdentityClick() {
9442 9510 }
9443 9511  
9444 9512 function OnZoom() {
  9513 + alert('on zoom called');
  9514 + var scope = angular.element(document.getElementById("daView")).scope();
  9515 + scope.DisableUI();
  9516 +
9445 9517 if ($(".btn-annotation").hasClass("activebtncolor")) //Bug #14928
9446 9518 $(".btn-annotation").removeClass("activebtncolor");
9447 9519 //Dissectible Anatomy > Extract and Annotations displays apart on the page after click on Zoom-in.
... ... @@ -9452,6 +9524,8 @@ function OnZoom() {
9452 9524 scope.$apply(function () {
9453 9525 scope.enableZoom();
9454 9526 });
  9527 +
  9528 +
9455 9529 }
9456 9530  
9457 9531 function onListManagerTermSelection(id, isTermListOptionClicked) {
... ...
400-SOURCECODE/AIAHTML5.Web/index.html
  View file @76ae71d
... ... @@ -317,7 +317,7 @@
317 317 </div>>
318 318  
319 319  
320   - <!--list manager Modal-->
  320 +
321 321 <div class="modal fade" id="ShowListManager" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" ng-init="tab = 1" style="width:27%;left:50%;overflow:hidden;height:500px;top:100px">
322 322 <div class="modal-dialog" role="document" style="width:400px;">
323 323 <div class="modal-content" style="width:100%;max-width:400px;">
... ...