ADAM / AIAHTML5

Commit c81a82e565f4829136aed611230dfb2dc780a7a2

Authored by Amrita Vishnoi
2 parents 1864a8a5 11e4531a

Merge branch 'Develop' into QA

Inline Side-by-side
Showing 1 changed file with 25 additions and 12 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @c81a82e
@@ -1451,6 +1451,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -1451,6 +1451,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
1451 1451
1452 $scope.DrawMirroredImage = function (h, w, x, y, src, bodyRegionId, isMaskImage) { 1452 $scope.DrawMirroredImage = function (h, w, x, y, src, bodyRegionId, isMaskImage) {
1453 1453
  1454 + $scope.DisableUI();
1454 $rootScope.isLoading = true; 1455 $rootScope.isLoading = true;
1455 $('#spinner').css('visibility', 'visible'); 1456 $('#spinner').css('visibility', 'visible');
1456 1457
@@ -1787,7 +1788,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -1787,7 +1788,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
1787 // 1788 //
1788 1789
1789 // console.log('$rootScope.isListManagerSelected= ' + $rootScope.isListManagerSelected + ' length= ' + $scope.ColoredImageSRC.length) 1790 // console.log('$rootScope.isListManagerSelected= ' + $rootScope.isListManagerSelected + ' length= ' + $scope.ColoredImageSRC.length)
1790 - 1791 +
1791 if (($scope.ColoredImageSRC != null || $scope.ColoredImageSRC != undefined)) { 1792 if (($scope.ColoredImageSRC != null || $scope.ColoredImageSRC != undefined)) {
1792 1793
1793 if ((($rootScope.viewOrientationId == '1') || ($rootScope.viewOrientationId == '4')) && ($scope.ColoredImageSRC.length == 9)) { 1794 if ((($rootScope.viewOrientationId == '1') || ($rootScope.viewOrientationId == '4')) && ($scope.ColoredImageSRC.length == 9)) {
@@ -1805,9 +1806,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -1805,9 +1806,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
1805 else { 1806 else {
1806 $scope.isEligibleForHighlight = false; 1807 $scope.isEligibleForHighlight = false;
1807 } 1808 }
1808 - 1809 +
1809 if ($scope.isEligibleForHighlight == true) { 1810 if ($scope.isEligibleForHighlight == true) {
1810 - 1811 + $scope.DisableUI();
1811 if ($scope.isSearchDataLoaded) { 1812 if ($scope.isSearchDataLoaded) {
1812 $rootScope.isLoading = false; 1813 $rootScope.isLoading = false;
1813 $('#spinner').css('visibility', 'hidden'); 1814 $('#spinner').css('visibility', 'hidden');
@@ -1834,6 +1835,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -1834,6 +1835,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
1834 else { 1835 else {
1835 $rootScope.isLoading = false; 1836 $rootScope.isLoading = false;
1836 $('#spinner').css('visibility', 'hidden'); 1837 $('#spinner').css('visibility', 'hidden');
  1838 + //debugger;
1837 $scope.EnableUI(); 1839 $scope.EnableUI();
1838 } 1840 }
1839 } 1841 }
@@ -1867,7 +1869,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -1867,7 +1869,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
1867 } 1869 }
1868 1870
1869 $scope.DrawImage = function (h, w, x, y, src, bodyRegionId, isMaskImage) { 1871 $scope.DrawImage = function (h, w, x, y, src, bodyRegionId, isMaskImage) {
1870 - 1872 + $scope.DisableUI();
1871 $rootScope.isLoading = true; 1873 $rootScope.isLoading = true;
1872 $('#spinner').css('visibility', 'visible'); 1874 $('#spinner').css('visibility', 'visible');
1873 1875
@@ -2209,7 +2211,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -2209,7 +2211,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
2209 } 2211 }
2210 // 2212 //
2211 2213
2212 - 2214 +
2213 if (($scope.ColoredImageSRC != null || $scope.ColoredImageSRC != undefined)) { 2215 if (($scope.ColoredImageSRC != null || $scope.ColoredImageSRC != undefined)) {
2214 2216
2215 if ((($rootScope.viewOrientationId == '1') || ($rootScope.viewOrientationId == '4')) && ($scope.ColoredImageSRC.length == 9)) { 2217 if ((($rootScope.viewOrientationId == '1') || ($rootScope.viewOrientationId == '4')) && ($scope.ColoredImageSRC.length == 9)) {
@@ -2228,9 +2230,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -2228,9 +2230,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
2228 $scope.isEligibleForHighlight = false; 2230 $scope.isEligibleForHighlight = false;
2229 } 2231 }
2230 2232
2231 -  
2232 if ($scope.isEligibleForHighlight == true) { 2233 if ($scope.isEligibleForHighlight == true) {
2233 - 2234 + $scope.DisableUI();
2234 if ($scope.isSearchDataLoaded) { 2235 if ($scope.isSearchDataLoaded) {
2235 $rootScope.isLoading = false; 2236 $rootScope.isLoading = false;
2236 $('#spinner').css('visibility', 'hidden'); 2237 $('#spinner').css('visibility', 'hidden');
@@ -2263,12 +2264,14 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -2263,12 +2264,14 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
2263 else { 2264 else {
2264 $rootScope.isLoading = false; 2265 $rootScope.isLoading = false;
2265 $('#spinner').css('visibility', 'hidden'); 2266 $('#spinner').css('visibility', 'hidden');
  2267 + //debugger;
2266 $scope.EnableUI(); 2268 $scope.EnableUI();
2267 } 2269 }
2268 } 2270 }
2269 else { 2271 else {
2270 $rootScope.isLoading = false; 2272 $rootScope.isLoading = false;
2271 $('#spinner').css('visibility', 'hidden'); 2273 $('#spinner').css('visibility', 'hidden');
  2274 + //debugger;
2272 $scope.EnableUI(); 2275 $scope.EnableUI();
2273 } 2276 }
2274 } 2277 }
@@ -2560,7 +2563,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -2560,7 +2563,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
2560 2563
2561 if ($scope.doAligneCanvasWithTerm == true) { 2564 if ($scope.doAligneCanvasWithTerm == true) {
2562 $scope.aligneCanvasWithTerm(); 2565 $scope.aligneCanvasWithTerm();
2563 - 2566 + //debugger;
2564 $scope.EnableUI(); 2567 $scope.EnableUI();
2565 } 2568 }
2566 2569
@@ -2848,7 +2851,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -2848,7 +2851,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
2848 $rootScope.isLoading = false; 2851 $rootScope.isLoading = false;
2849 2852
2850 $('#spinner').css('visibility', 'hidden'); 2853 $('#spinner').css('visibility', 'hidden');
2851 - 2854 + //debugger;
2852 $scope.EnableUI(); 2855 $scope.EnableUI();
2853 2856
2854 } 2857 }
@@ -2929,7 +2932,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -2929,7 +2932,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
2929 2932
2930 $scope.message = AIAConstants.NO_BODY_SYSTEM_AVAILABLE; 2933 $scope.message = AIAConstants.NO_BODY_SYSTEM_AVAILABLE;
2931 $("#daMessageModal").modal('show'); 2934 $("#daMessageModal").modal('show');
2932 - 2935 + //debugger;
2933 $scope.EnableUI(); 2936 $scope.EnableUI();
2934 2937
2935 $('.ui-slider').slider('enable'); 2938 $('.ui-slider').slider('enable');
@@ -3127,6 +3130,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -3127,6 +3130,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
3127 $rootScope.isLoading = false; 3130 $rootScope.isLoading = false;
3128 3131
3129 //document.getElementById("daView").style.pointerEvents = "auto"; 3132 //document.getElementById("daView").style.pointerEvents = "auto";
  3133 + //debugger;
3130 //$('.ui-slider').slider('enable'); 3134 //$('.ui-slider').slider('enable');
3131 $scope.EnableUI(); 3135 $scope.EnableUI();
3132 prevBRID = TermExistInBodyRegionId; 3136 prevBRID = TermExistInBodyRegionId;
@@ -3139,7 +3143,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -3139,7 +3143,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
3139 else { 3143 else {
3140 $('#spinner').css('visibility', 'hidden') 3144 $('#spinner').css('visibility', 'hidden')
3141 $rootScope.isLoading = false; 3145 $rootScope.isLoading = false;
3142 - 3146 + //debugger;
3143 $scope.EnableUI(); 3147 $scope.EnableUI();
3144 $('.ui-slider').slider('enable'); 3148 $('.ui-slider').slider('enable');
3145 } 3149 }
@@ -4596,6 +4600,11 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -4596,6 +4600,11 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
4596 } 4600 }
4597 4601
4598 } 4602 }
  4603 + else {
  4604 + //when user draw TB outside body than no bodyRegion
  4605 + //is covred and nothing is drawn so the function is not called in which we are enabling UI
  4606 + $scope.EnableUI();
  4607 + }
4599 }) 4608 })
4600 4609
4601 //for modesty 4610 //for modesty
@@ -5374,7 +5383,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -5374,7 +5383,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
5374 5383
5375 5384
5376 } 5385 }
5377 - 5386 + //debugger;
5378 $scope.EnableUI(); 5387 $scope.EnableUI();
5379 } 5388 }
5380 5389
@@ -7312,7 +7321,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -7312,7 +7321,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
7312 7321
7313 //for highlight when highlight button is clicked the ui got disabled, 7322 //for highlight when highlight button is clicked the ui got disabled,
7314 //now highlight is completed so enalbe UI 7323 //now highlight is completed so enalbe UI
  7324 + //debugger;
7315 $scope.EnableUI(); 7325 $scope.EnableUI();
  7326 +
7316 } 7327 }
7317 7328
7318 } 7329 }
@@ -7342,6 +7353,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -7342,6 +7353,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
7342 else { 7353 else {
7343 $scope.isLoading = false; 7354 $scope.isLoading = false;
7344 $('#spinner').css('visibility', 'hidden'); 7355 $('#spinner').css('visibility', 'hidden');
  7356 + //debugger;
7345 $scope.EnableUI(); 7357 $scope.EnableUI();
7346 } 7358 }
7347 } 7359 }
@@ -7481,6 +7493,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -7481,6 +7493,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
7481 else { 7493 else {
7482 $scope.isLoading = false; 7494 $scope.isLoading = false;
7483 $('#spinner').css('visibility', 'hidden'); 7495 $('#spinner').css('visibility', 'hidden');
  7496 + //debugger;
7484 $scope.EnableUI(); 7497 $scope.EnableUI();
7485 7498
7486 } 7499 }