Commit Changes

unknown
1 parent 68ae50e8
Showing 3 changed files with 17 additions and 12 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
@@ -595,6 +595,8 @@ 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.selectedBodySystemName = 'All';
+            $rootScope.selectedBodySystemId = 0;
             $rootScope.searchSelectedText = '';
         });
         $("#layerChangeSlider").slider({
@@ -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", "#");
@@ -3168,9 +3168,9 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
  
         $('#listManager').draggable();
         $rootScope.islistManagerEventAlredayDispachted = true;
-
+      
         $rootScope.$broadcast('listManagerEvent', true);
-     
+        
         if ($rootScope.selectedBodySystemName == undefined && $rootScope.slectedActualTermNumber == undefined) {
             if ($location.path() == "/module-item-view") {
                 $timeout(function () {
@@ -3192,11 +3192,11 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
             if ($rootScope.selectedBodySystemId == undefined) {
                 $rootScope.selectedBodySystemId = 0;
                 if ($location.path() == "/module-item-view") {
-                    $scope.refreshTermListOnAASystemSelection($rootScope.selectedBodySystemId);
+                    $rootScope.refreshTermListOnAASystemSelection($rootScope.selectedBodySystemId);
                 }
                 else {
                     if ($location.path() == "/module-item-view") {
-                        $scope.refreshTermListOnAASystemSelection($rootScope.selectedBodySystemId);
+                        $rootScope.refreshTermListOnAASystemSelection($rootScope.selectedBodySystemId);
                     }
                     else {
                         $rootScope.refreshTermListOnSystemSelection($rootScope.selectedBodySystemId);
@@ -3206,13 +3206,14 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
             }
             else {
                 if ($location.path() == "/module-item-view") {
-                    $scope.refreshTermListOnAASystemSelection($rootScope.selectedBodySystemId);
+                    $rootScope.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);
@@ -3228,7 +3229,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
     }
  
     $rootScope.CloseListManager = function () {
-
+        
         $("#btnTranparency").removeAttr('disabled', 'disabled');
         $("#optionsListManagerTab").removeClass("active");
         console.log('close');
@@ -3246,6 +3247,10 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
                 $rootScope.switchCanvasToPaintCanvas();
             }
         }
+        if ($location.path() == "/module-item-view") {
+            $rootScope.selectedBodySystemName = $("#AABodySystems").val();
+            $rootScope.selectedBodySystemId = $('#AABodySystems option[value="' + $rootScope.selectedBodySystemName + '"]').attr("id");
+        }
         $('#listManager').css('display', 'none');
         $("#listManager").css("visibility", "hidden");
  
@@ -317,12 +317,10 @@ 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.selectedBodySystemName = 'All';
+            $rootScope.selectedBodySystemId = 0;
             $rootScope.searchSelectedText = '';
-            //if (localStorage.getItem("activeTab") != null) {
-
-            //    $rootScope.isListViewRowClicked = true;
-
-            //}
+        
         });
     })