Commit Changes

unknown
1 parent f174ddbc
Showing 3 changed files with 48 additions and 17 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
@@ -594,7 +594,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
     }
     angular.element(document).ready(function (e) {
-
+        $(document).on("click", "#daImagePanel .jsPanel-hdr .jsPanel-hdr-r .jsPanel-btn-close .jsglyph-remove", function () {
+            $rootScope.searchSelectedText = '';
+        });
         $("#layerChangeSlider").slider({
             orientation: "vertical",
             range: "max", 
@@ -3148,7 +3148,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
     $rootScope.disableAnnotationtoolOnListManager = false;
     $rootScope.ShowListManager = function () {
-     
+    
         $rootScope.switchCanvas();
         $("#annotationpaintbrushsize").attr("href", "#");
         $("#annotationpainteraser").attr("href", "#");
@@ -3170,28 +3170,55 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
         $rootScope.islistManagerEventAlredayDispachted = true;
         $rootScope.$broadcast('listManagerEvent', true);
-       
+     
         if ($rootScope.selectedBodySystemName == undefined && $rootScope.slectedActualTermNumber == undefined) {
-            $('#termList option[selected="selected"]').prop("selected", false);
-            $('#termList option[value="' + $rootScope.searchSelectedText + '"]').prop("selected", true);
-            $("#termList").find("option").css({ "background-color": "#ffffff", "color": "#000000" });
-            $('#termList option[value="' + $rootScope.searchSelectedText + '"]').css({ "background-color": "#3399FF", "color": "#ffffff" });
-        }
+            if ($location.path() == "/module-item-view") {
+                $timeout(function () {
+                    $('#termList option[selected="selected"]').prop("selected", false);
+                    $('#termList option[value="' + $rootScope.searchSelectedText + '"]').prop("selected", true);
+                    $("#termList").find("option").css({ "background-color": "#ffffff", "color": "#000000" });
+                    $('#termList option[value="' + $rootScope.searchSelectedText + '"]').css({ "background-color": "#3399FF", "color": "#ffffff" });
+                }, 1000);
+            }
+            else {
+                $('#termList option[selected="selected"]').prop("selected", false);
+                $('#termList option[value="' + $rootScope.searchSelectedText + '"]').prop("selected", true);
+                $("#termList").find("option").css({ "background-color": "#ffffff", "color": "#000000" });
+                $('#termList option[value="' + $rootScope.searchSelectedText + '"]').css({ "background-color": "#3399FF", "color": "#ffffff" });
+            }
+            }
         else {
             if ($rootScope.selectedBodySystemId == undefined) {
                 $rootScope.selectedBodySystemId = 0;
-                $rootScope.refreshTermListOnSystemSelection($rootScope.selectedBodySystemId);
+                if ($location.path() == "/module-item-view") {
+                    $scope.refreshTermListOnAASystemSelection($rootScope.selectedBodySystemId);
+                }
+                else {
+                    if ($location.path() == "/module-item-view") {
+                        $scope.refreshTermListOnAASystemSelection($rootScope.selectedBodySystemId);
+                    }
+                    else {
+                        $rootScope.refreshTermListOnSystemSelection($rootScope.selectedBodySystemId);
+                    }
+                   
+                }
             }
             else {
-                $rootScope.refreshTermListOnSystemSelection($rootScope.selectedBodySystemId);
+                if ($location.path() == "/module-item-view") {
+                    $scope.refreshTermListOnAASystemSelection($rootScope.selectedBodySystemId);
+                }
+                else {
+                    $rootScope.refreshTermListOnSystemSelection($rootScope.selectedBodySystemId);
+                }
+              
             }
-
+            $timeout(function () {
             $('#bodySystems option[selected="selected"]').prop("selected", false);
             $('#bodySystems option[value="' + $rootScope.selectedBodySystemName + '"]').prop("selected", true);
             $("#termList").find("option").css({ "background-color": "#ffffff", "color": "#000000" });
             $('#termList option[value="' + $rootScope.searchSelectedText + '"]').css({ "background-color": "#3399FF", "color": "#ffffff" });
-         
+            }, 1000);
         }
         $("#optionsListManagerTab").addClass("active");
         var viewNameAftrSplit = $("#viewName").val().split(" ");
@@ -317,6 +317,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
         $(document).on("click", "#ImagePanel .jsPanel-hdr .jsPanel-hdr-r .jsPanel-btn-close .jsglyph-remove", function () {
             $scope.setActiveTab(parseInt(localStorage.getItem("activeTab")));
             $(".tools").css("z-index", "15000");
+            $rootScope.searchSelectedText = '';
             //if (localStorage.getItem("activeTab") != null) {
             //    $rootScope.isListViewRowClicked = true;
@@ -1259,7 +1260,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
         else
         {
-            $scope.refreshTermListOnAASystemSelection($rootScope.bodySystemSeletedId);
+            $rootScope.refreshTermListOnAASystemSelection($rootScope.bodySystemSeletedId);
         }
         $timeout(function () {
             $("#totalTerms").empty();
@@ -1269,7 +1270,8 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
-    $scope.refreshTermListOnAASystemSelection = function (bodySystemId) {
+    $rootScope.refreshTermListOnAASystemSelection = function (bodySystemId) {
+      
         $rootScope.bodySystemSeletedId = bodySystemId;
         $('#termList').empty();
         var bodySystemName = $("#AABodySystems #" + bodySystemId).val();
@@ -1595,9 +1597,9 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
 function refreshTermListOnSystemSel(bodySystemId) {
-    var scope = angular.element(document.getElementById("aaDetailPageDiv")).scope();
-    scope.$apply(function () {
-        scope.refreshTermListOnAASystemSelection(bodySystemId);
+    var rootScope = angular.element(document.getElementById("aaDetailPageDiv")).scope();
+    rootScope.$apply(function () {
+        rootScope.refreshTermListOnAASystemSelection(bodySystemId);
     });
 }