ADAM / AIAHTML5

Commit 7cdeb19c5a0bd3e9bfc788cd9479fc06225ee4cf

Authored by Nikita Kulshreshtha
2 parents 8c8189c1 c81a82e5

Merge branch 'QA' into Develop

Inline Side-by-side
Showing 2 changed files with 27 additions and 63 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @7cdeb19
... ... @@ -1451,6 +1451,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
1451 1451  
1452 1452 $scope.DrawMirroredImage = function (h, w, x, y, src, bodyRegionId, isMaskImage) {
1453 1453  
  1454 + $scope.DisableUI();
1454 1455 $rootScope.isLoading = true;
1455 1456 $('#spinner').css('visibility', 'visible');
1456 1457  
... ... @@ -1787,7 +1788,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
1787 1788 //
1788 1789  
1789 1790 // console.log('$rootScope.isListManagerSelected= ' + $rootScope.isListManagerSelected + ' length= ' + $scope.ColoredImageSRC.length)
1790   -
  1791 +
1791 1792 if (($scope.ColoredImageSRC != null || $scope.ColoredImageSRC != undefined)) {
1792 1793  
1793 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 1806 else {
1806 1807 $scope.isEligibleForHighlight = false;
1807 1808 }
1808   -
  1809 +
1809 1810 if ($scope.isEligibleForHighlight == true) {
1810   -
  1811 + $scope.DisableUI();
1811 1812 if ($scope.isSearchDataLoaded) {
1812 1813 $rootScope.isLoading = false;
1813 1814 $('#spinner').css('visibility', 'hidden');
... ... @@ -1834,6 +1835,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
1834 1835 else {
1835 1836 $rootScope.isLoading = false;
1836 1837 $('#spinner').css('visibility', 'hidden');
  1838 + //debugger;
1837 1839 $scope.EnableUI();
1838 1840 }
1839 1841 }
... ... @@ -1867,7 +1869,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
1867 1869 }
1868 1870  
1869 1871 $scope.DrawImage = function (h, w, x, y, src, bodyRegionId, isMaskImage) {
1870   -
  1872 + $scope.DisableUI();
1871 1873 $rootScope.isLoading = true;
1872 1874 $('#spinner').css('visibility', 'visible');
1873 1875  
... ... @@ -2209,7 +2211,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
2209 2211 }
2210 2212 //
2211 2213  
2212   -
  2214 +
2213 2215 if (($scope.ColoredImageSRC != null || $scope.ColoredImageSRC != undefined)) {
2214 2216  
2215 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 2230 $scope.isEligibleForHighlight = false;
2229 2231 }
2230 2232  
2231   -
2232 2233 if ($scope.isEligibleForHighlight == true) {
2233   -
  2234 + $scope.DisableUI();
2234 2235 if ($scope.isSearchDataLoaded) {
2235 2236 $rootScope.isLoading = false;
2236 2237 $('#spinner').css('visibility', 'hidden');
... ... @@ -2263,12 +2264,14 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
2263 2264 else {
2264 2265 $rootScope.isLoading = false;
2265 2266 $('#spinner').css('visibility', 'hidden');
  2267 + //debugger;
2266 2268 $scope.EnableUI();
2267 2269 }
2268 2270 }
2269 2271 else {
2270 2272 $rootScope.isLoading = false;
2271 2273 $('#spinner').css('visibility', 'hidden');
  2274 + //debugger;
2272 2275 $scope.EnableUI();
2273 2276 }
2274 2277 }
... ... @@ -2560,7 +2563,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
2560 2563  
2561 2564 if ($scope.doAligneCanvasWithTerm == true) {
2562 2565 $scope.aligneCanvasWithTerm();
2563   -
  2566 + //debugger;
2564 2567 $scope.EnableUI();
2565 2568 }
2566 2569  
... ... @@ -2848,7 +2851,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
2848 2851 $rootScope.isLoading = false;
2849 2852  
2850 2853 $('#spinner').css('visibility', 'hidden');
2851   -
  2854 + //debugger;
2852 2855 $scope.EnableUI();
2853 2856  
2854 2857 }
... ... @@ -2929,7 +2932,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
2929 2932  
2930 2933 $scope.message = AIAConstants.NO_BODY_SYSTEM_AVAILABLE;
2931 2934 $("#daMessageModal").modal('show');
2932   -
  2935 + //debugger;
2933 2936 $scope.EnableUI();
2934 2937  
2935 2938 $('.ui-slider').slider('enable');
... ... @@ -3127,6 +3130,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
3127 3130 $rootScope.isLoading = false;
3128 3131  
3129 3132 //document.getElementById("daView").style.pointerEvents = "auto";
  3133 + //debugger;
3130 3134 //$('.ui-slider').slider('enable');
3131 3135 $scope.EnableUI();
3132 3136 prevBRID = TermExistInBodyRegionId;
... ... @@ -3139,7 +3143,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
3139 3143 else {
3140 3144 $('#spinner').css('visibility', 'hidden')
3141 3145 $rootScope.isLoading = false;
3142   -
  3146 + //debugger;
3143 3147 $scope.EnableUI();
3144 3148 $('.ui-slider').slider('enable');
3145 3149 }
... ... @@ -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 4610 //for modesty
... ... @@ -5374,7 +5383,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
5374 5383  
5375 5384  
5376 5385 }
5377   -
  5386 + //debugger;
5378 5387 $scope.EnableUI();
5379 5388 }
5380 5389  
... ... @@ -7312,7 +7321,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
7312 7321  
7313 7322 //for highlight when highlight button is clicked the ui got disabled,
7314 7323 //now highlight is completed so enalbe UI
  7324 + //debugger;
7315 7325 $scope.EnableUI();
  7326 +
7316 7327 }
7317 7328  
7318 7329 }
... ... @@ -7342,6 +7353,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
7342 7353 else {
7343 7354 $scope.isLoading = false;
7344 7355 $('#spinner').css('visibility', 'hidden');
  7356 + //debugger;
7345 7357 $scope.EnableUI();
7346 7358 }
7347 7359 }
... ... @@ -7481,6 +7493,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
7481 7493 else {
7482 7494 $scope.isLoading = false;
7483 7495 $('#spinner').css('visibility', 'hidden');
  7496 + //debugger;
7484 7497 $scope.EnableUI();
7485 7498  
7486 7499 }
... ... @@ -9342,53 +9355,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
9342 9355 }
9343 9356  
9344 9357 $scope.resetSearchListView = function () {
9345   - $("#termlistfilter").css("display", "block");
9346   - //Remove the list and then Repopulate it on change of $scope.searchFilter
9347   - $('#searchListDiv').empty();
9348   - $rootScope.ModifiedsearchListArray = [];
9349   - // added the timeout to delay the compile of ul li
9350   - $scope.IsSearchVisible = true;
9351   - var isValueMatchedWithTerm = false;
9352   - for (var i = 0; i <= $rootScope.searchListArray.length - 1; i++) {
9353   - var searchFieldVal = $("#typedTermName").val();
9354   - if (searchFieldVal.length > 0) {
9355   - for (var j = 0; j <= searchFieldVal.length - 1; j++) {
9356   - if ($rootScope.searchListArray[i].name[j] == undefined) {
9357   - isValueMatchedWithTerm = false;
9358   - break;
9359   - }
9360   - if (searchFieldVal[j].toLowerCase() != $rootScope.searchListArray[i].name[j].toLowerCase()) {
9361   - isValueMatchedWithTerm = false;
9362   - break;
9363   - }
9364   - else {
9365   - isValueMatchedWithTerm = true;
9366   - }
9367   - }
9368   - if (isValueMatchedWithTerm == true) {
9369   - $rootScope.ModifiedsearchListArray.push({ "name": $rootScope.searchListArray[i].name, "id": $rootScope.searchListArray[i].id });
9370   - }
9371   - }
9372   - }
9373   - var termListFilterHtml = '';
9374   - termListFilterHtml += '<ul id="termlistfilter" class="form-control dropdown-menu" style="height:90px;width:100%;overflow-y:scroll;position:absolute;z-index:60001;">';
9375   - if ($("#typedTermName").val().length > 0) {
9376   - for (var i = 0; i <= $rootScope.ModifiedsearchListArray.length - 1; i++) {
9377   - termListFilterHtml += '<li><a id=' + $rootScope.ModifiedsearchListArray[i].id + ' href="javascript:void(0);" onclick="selectTerm(event)">' + $rootScope.ModifiedsearchListArray[i].name + '</a></li>';
9378   - }
9379   - termListFilterHtml += '</ul>';
9380   - $('#searchListDiv').append(termListFilterHtml);
9381   - }
9382   - else {
9383   - for (var i = 0; i <= $rootScope.searchListArray.length - 1; i++) {
9384   - termListFilterHtml += '<li><a id=' + $rootScope.searchListArray[i].id + ' href="javascript:void(0);" onclick="selectTerm(event)">' + $rootScope.searchListArray[i].name + '</a></li>';
9385   - }
9386   - termListFilterHtml += '</ul>';
9387   - $('#searchListDiv').append(termListFilterHtml);
9388   - }
9389   - }
9390   -
9391 9358  
  9359 + $scope.ShowSearch();
  9360 + }
9392 9361  
9393 9362 }])
9394 9363  
... ...
400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js
  View file @7cdeb19
... ... @@ -420,11 +420,6 @@ AIA.constant(&quot;UserTypeConstants&quot;, {
420 420 "SITE_USER": "Site User"
421 421 })
422 422  
423   -AIA.constant("AIAConstants", {
424   -
425   - "NO_BODY_SYSTEM_AVAILABLE": "No body system available in this layer.",
426   -
427   -})
428 423  
429 424 AIA.constant("UserModules", [
430 425 {
... ...