Commit c0ee61bcb5ca8b79dd168073f8ebbbeb9be2d457
1 parent
fd7f8ec9
Terms search in the Search list should be disable in the List Manager and Vice-Versa
Showing
1 changed file
with
37 additions
and
22 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
| @@ -8020,38 +8020,53 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -8020,38 +8020,53 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
| 8020 | 8020 | ||
| 8021 | 8021 | ||
| 8022 | $scope.HighlightBodyOnListManagerSelection = function (event) { | 8022 | $scope.HighlightBodyOnListManagerSelection = function (event) { |
| 8023 | + // Terms search in the Search list should be disable in the List Manager and Vice-Versa. | ||
| 8024 | + if ($rootScope.prevId == event.currentTarget.id) { | ||
| 8023 | 8025 | ||
| 8024 | - $scope.terminateCurrentlyRunningWPs(); | ||
| 8025 | - //debugger | ||
| 8026 | - $rootScope.isListManagerSelected = true; | ||
| 8027 | - //--- | ||
| 8028 | - if ($rootScope.isListManagerSelected == true) { | ||
| 8029 | - $("#btnHighLight").addClass("btn-primary"); | ||
| 8030 | - $("#btnHighLight").removeClass("btn-black"); | ||
| 8031 | - if (!$("#btnNormalMode").hasClass("btn-black")) { | ||
| 8032 | - $("#btnNormalMode").addClass("btn-black"); | ||
| 8033 | - } | 8026 | + $rootScope.isLoading = false; |
| 8027 | + $('#spinner').css('visibility', 'hidden'); | ||
| 8028 | + } | ||
| 8029 | + else { | ||
| 8030 | + $rootScope.prevId = event.currentTarget.id; | ||
| 8031 | + $("#termList").find("option").attr('selected', false); | ||
| 8032 | + $("#termList").find("option").css({ "background-color": "#ffffff", "color": "#000000" }); | ||
| 8033 | + $("#termList").find("option[id=" + event.currentTarget.id + "]").css({ "background-color": "#3399FF", "color": "#ffffff" }); | ||
| 8034 | + $("div#backdrop #termlistfilter li").find("a").css({ "background-color": "#ffffff", "color": "#000000" }); | ||
| 8035 | + $("div#backdrop #termlistfilter li").find("a[id=" + event.currentTarget.id + "]").css({ "background-color": "#3399FF", "color": "#ffffff" }); | ||
| 8036 | + $scope.terminateCurrentlyRunningWPs(); | ||
| 8037 | + //debugger | ||
| 8038 | + $rootScope.isListManagerSelected = true; | ||
| 8039 | + //--- | ||
| 8040 | + if ($rootScope.isListManagerSelected == true) { | ||
| 8041 | + $("#btnHighLight").addClass("btn-primary"); | ||
| 8042 | + $("#btnHighLight").removeClass("btn-black"); | ||
| 8043 | + if (!$("#btnNormalMode").hasClass("btn-black")) { | ||
| 8044 | + $("#btnNormalMode").addClass("btn-black"); | ||
| 8045 | + } | ||
| 8034 | 8046 | ||
| 8035 | - if ($("#btnNormalMode").hasClass("btn-primary")) { | ||
| 8036 | - $("#btnNormalMode").removeClass("btn-primary"); | 8047 | + if ($("#btnNormalMode").hasClass("btn-primary")) { |
| 8048 | + $("#btnNormalMode").removeClass("btn-primary"); | ||
| 8049 | + } | ||
| 8037 | } | 8050 | } |
| 8038 | - } | ||
| 8039 | - //--- | ||
| 8040 | - $rootScope.isLoading = true; | 8051 | + //--- |
| 8052 | + $rootScope.isLoading = true; | ||
| 8041 | 8053 | ||
| 8042 | - $('#spinner').css('visibility', 'visible'); | 8054 | + $('#spinner').css('visibility', 'visible'); |
| 8043 | 8055 | ||
| 8044 | - $rootScope.isHighlightBodyByBodySystem = false; | 8056 | + $rootScope.isHighlightBodyByBodySystem = false; |
| 8045 | 8057 | ||
| 8046 | - //1. | ||
| 8047 | - $rootScope.actualTermNumber = event.currentTarget.id;//attributes[0].value; | ||
| 8048 | - console.log(' $scope.actualTermNumber insde HighlightBodyOnListManagerSelection= ' + $rootScope.actualTermNumber) | 8058 | + //1. |
| 8059 | + $rootScope.actualTermNumber = event.currentTarget.id;//attributes[0].value; | ||
| 8060 | + console.log(' $scope.actualTermNumber insde HighlightBodyOnListManagerSelection= ' + $rootScope.actualTermNumber) | ||
| 8049 | 8061 | ||
| 8050 | - //2. | 8062 | + //2. |
| 8051 | 8063 | ||
| 8052 | - $scope.setLayerNumberAndHighlightByTermList(); | 8064 | + $scope.setLayerNumberAndHighlightByTermList(); |
| 8053 | 8065 | ||
| 8054 | 8066 | ||
| 8067 | + } | ||
| 8068 | + | ||
| 8069 | + | ||
| 8055 | } | 8070 | } |
| 8056 | 8071 | ||
| 8057 | $scope.setLayerNumberAndHighlightByTermList = function () { | 8072 | $scope.setLayerNumberAndHighlightByTermList = function () { |