From 67307b1ccdf9e7b4279ff8f8275c8b78ef0771ee Mon Sep 17 00:00:00 2001 From: nikita Date: Tue, 5 Sep 2017 11:04:00 +0530 Subject: [PATCH] if data is not found calling loadSerachData again and when get the data loading list manager --- 400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js | 9 +++++++-- 400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js | 3 ++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index a6f0cf2..ac2a2eb 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -718,7 +718,10 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l //} else { // $rootScope.isLoading = true; // $("#spinner").css("visibility", "visible"); - // // $("#spinner").css("visibility", "block"); + // // $("#spinner").css("visibility", "block"); + if ($rootScope.isListManagerMenuSelected) { + $scope.loadListManger(); + } } @@ -8366,6 +8369,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l $scope.loadListManger = function () { + $rootScope.isListManagerMenuSelected = true; var vocabTermTxt = []; if ($rootScope.TermNumberData != null || $rootScope.TermNumberData != undefined && $rootScope.TermNumberData.length > 0) { @@ -8424,8 +8428,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l } } else { + console.log("$rootScope.TermNumberData NOT FOUND"); $scope.loadSearchData(); - $scope.loadListManger(); + } } diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js index cdd441a..96404cb 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js @@ -3290,7 +3290,8 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic $("#btnTranparency").removeAttr('disabled', 'disabled'); $("#optionsListManagerTab").removeClass("active"); - console.log('close'); + $rootScope.isListManagerMenuSelected = false; + console.log('listManager closed'); $rootScope.disableAnnotationtoolOnListManager = false; if ($rootScope.MenuModuleName == "DA" || $rootScope.MenuModuleName == "AA") { $("#annotationpaintbrushsize").attr("href", "#canvasPaint"); -- libgit2 0.21.4