DA > Body System state is not maintain in List Manager.

unknown
1 parent ee3c0e26
Showing 3 changed files with 38 additions and 14 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
400-SOURCECODE/AIAHTML5.Web/index.html
@@ -7625,7 +7625,14 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
     }
  
  
-    $scope.HighlightBodyOnListManagerSelection = function (actualTermNumber) {
+    $scope.HighlightBodyOnListManagerSelection = function (actualTermNumber, isTermListOptionClicked) {
+        //$rootScope.SelectedTermList = $("#termList").find("option[id=" + actualTermNumber + "]").val();
+      
+        $rootScope.slectedActualTermNumber = actualTermNumber;
+
+        if (isTermListOptionClicked == true) {
+            $scope.searchFilter = '';
+        }
  
         console.log('inside HighlightBodyOnListManagerSelection actualTermNumber= ' + actualTermNumber)
         //	Terms search in the Search list should be disable in the List Manager and Vice-Versa.
@@ -7919,8 +7926,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
         return Math.round(iReturnValue / nExistingZoom);
     }
  
-    $scope.refreshTermListOnSystemSelection = function (bodysystemId) {
-
+    $rootScope.refreshTermListOnSystemSelection = function (bodysystemId) {
+        $rootScope.selectedBodySystemId = bodysystemId;
+        $rootScope.selectedBodySystemName = $('#bodySystems option[id="' + bodysystemId + '"]').val();
         $('#termList').empty();
         // $('#termList').innerHTML = '';
  
@@ -8304,11 +8312,11 @@ function OnZoom()
     });
 }
  
-function onListManagerTermSelection(id) {
+function onListManagerTermSelection(id, isTermListOptionClicked) {
  
     var scope = angular.element(document.getElementById("daView")).scope();
     scope.$apply(function () {
-        scope.HighlightBodyOnListManagerSelection(id);
+        scope.HighlightBodyOnListManagerSelection(id, isTermListOptionClicked);
     });
  
 }
@@ -2224,23 +2224,39 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
             $('#listManager').css('display', 'block');
             $("#listManager").css("visibility", "visible");
  
-            //   $('#termList option[selected="selected"]').prop("selected", false);
-            //  $("#termList").find("option[value=" + $rootScope.searchSelectedText + "]").prop("selected", true);
-            // $("#termList").find("option").css({ "background-color": "#ffffff", "color": "#000000" });
-            // $("#termList").find("option[value=" + $rootScope.searchSelectedText + "]").css({ "background-color": "#3399FF", "color": "#ffffff" });
             $('#listManager').draggable();
  
  
             $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" });
+            }
+            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" });
+                if ($rootScope.selectedBodySystemId == undefined) {
+                   $rootScope.selectedBodySystemId = 0;
+                   $rootScope.refreshTermListOnSystemSelection($rootScope.selectedBodySystemId);
+                }
+                else {
+                    $rootScope.refreshTermListOnSystemSelection($rootScope.selectedBodySystemId);
+                }
  
+                $('#bodySystems option[selected="selected"]').prop("selected", false);
+                $('#bodySystems option[value="' + $rootScope.selectedBodySystemName + '"]').prop("selected", true);
+                
+                // $('#termList option[selected="selected"]').prop("selected", false);
+                // $('#termList option[value="' + $rootScope.SelectedTermList + '"]').prop("selected", true);
+                //$("#termList").find("option").css({ "background-color": "#ffffff", "color": "#000000" });
+                //$('#termList option[value="' + $rootScope.SelectedTermList + '"]').css({ "background-color": "#3399FF", "color": "#ffffff" });
  
+            
+            }
         }
  
         $rootScope.CloseListManager = function () {
@@ -812,7 +812,7 @@
  
                                 <!--DA > List Manager > Multiple structure selection should not be available.-->
                                 <div class="form-group">
-                                    <select id="termList" class="form-control" size="10" onclick="if (typeof (this.selectedIndex) != 'undefined') onListManagerTermSelection(this.options[this.selectedIndex].id)"></select>
+                                    <select id="termList" class="form-control" size="10" onclick="if (typeof (this.selectedIndex) != 'undefined') onListManagerTermSelection(this.options[this.selectedIndex].id, true)"></select>
                                 </div>
  
                             </div>