ADAM / AIAHTML5

Commit 67307b1ccdf9e7b4279ff8f8275c8b78ef0771ee

Authored by Nikita Kulshreshtha
1 parent dec5c774

if data is not found calling loadSerachData again and when get the data loading list manager

Inline Side-by-side
Showing 2 changed files with 9 additions and 3 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @67307b1
... ... @@ -718,7 +718,10 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
718 718 //} else {
719 719 // $rootScope.isLoading = true;
720 720 // $("#spinner").css("visibility", "visible");
721   - // // $("#spinner").css("visibility", "block");
  721 + // // $("#spinner").css("visibility", "block");
  722 + if ($rootScope.isListManagerMenuSelected) {
  723 + $scope.loadListManger();
  724 + }
722 725 }
723 726  
724 727  
... ... @@ -8366,6 +8369,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
8366 8369  
8367 8370 $scope.loadListManger = function () {
8368 8371  
  8372 + $rootScope.isListManagerMenuSelected = true;
8369 8373  
8370 8374 var vocabTermTxt = [];
8371 8375 if ($rootScope.TermNumberData != null || $rootScope.TermNumberData != undefined && $rootScope.TermNumberData.length > 0) {
... ... @@ -8424,8 +8428,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
8424 8428 }
8425 8429 }
8426 8430 else {
  8431 + console.log("$rootScope.TermNumberData NOT FOUND");
8427 8432 $scope.loadSearchData();
8428   - $scope.loadListManger();
  8433 +
8429 8434 }
8430 8435 }
8431 8436  
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @67307b1
... ... @@ -3290,7 +3290,8 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
3290 3290  
3291 3291 $("#btnTranparency").removeAttr('disabled', 'disabled');
3292 3292 $("#optionsListManagerTab").removeClass("active");
3293   - console.log('close');
  3293 + $rootScope.isListManagerMenuSelected = false;
  3294 + console.log('listManager closed');
3294 3295 $rootScope.disableAnnotationtoolOnListManager = false;
3295 3296 if ($rootScope.MenuModuleName == "DA" || $rootScope.MenuModuleName == "AA") {
3296 3297 $("#annotationpaintbrushsize").attr("href", "#canvasPaint");
... ...