List Manager Clicked Issue

unknown
1 parent 876909d3
Showing 3 changed files with 27 additions and 42 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
400-SOURCECODE/AIAHTML5.Web/index.html
@@ -8256,7 +8256,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
     //list manager
     $scope.$on('listManagerEvent', function (event, data) {
-
+      
         if ($rootScope.islistManagerEventAlredayDispachted == true) {
             $('#spinner').css('visibility', 'visible');
@@ -8267,7 +8267,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
             console.log('optionsLength= ' + optionsLength)
             if (optionsLength > 0)
                 $('#bodySystems').empty();
-
+            $("#bodySystems").css("display", "block");
+            $("#AABodySystems").css("display", "none");
             var $all = $('<option  id="0" selected="">All</option>').appendTo('#bodySystems');
             $compile($all)($scope);
@@ -8309,7 +8310,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
     });
-
+ 
     $scope.loadListManger = function () {
@@ -1207,16 +1207,17 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
                                       $compile($el)($scope);
                                       var $selectedOptions = $('<option id= "' + $scope.pinTermData[j].TermNumber + '" onclick="onSearchItemSelection(event)" >' + $scope.pinTermData[j].TermTxt + '</option>').appendTo("#termList")
                                       $compile($selectedOptions)($scope);
-                                      $("#bodySystems").empty();
+                                      $("#AABodySystems").empty();
+                                      $("#bodySystems").css("display","none");
+                                      $("#AABodySystems").css("display","block");
                                       $("#bodySystemList li a").each(function (key, value) {
-                                          var $systemOptions = $('<option id=' + $(this).attr('id') + '>' + $(this).text() + '</option>').appendTo("#bodySystems")
+                                          var $systemOptions = $('<option id=' + $(this).attr('id') + ' onclick="refreshTermListOnSystemSel(this.id)">' + $(this).text() + '</option>').appendTo("#AABodySystems")
                                           $compile($systemOptions)($scope);
                                       });
                                   }
                               }, 500);
                           }
                       })
-                 
                   },
                  function (error) {
                      // handle errors here
@@ -1239,12 +1240,12 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
-    $scope.refreshTermListOnSystemSelection = function (bodySystemId) {
-        var bodySystemName = $("#bodySystems #" + bodySystemId).val();
-       
+    $scope.refreshTermListOnAASystemSelection = function (bodySystemId) {
+     
+        var bodySystemName = $("#AABodySystems #" + bodySystemId).val();
         if (bodySystemName == "All") {
             for (var j = 0; j <= $scope.pinTermData.length - 1; j++) {
-                var $selectedOptions = $('<option id= "' + $scope.pinTermData[j].TermNumber + '" >' + $scope.pinTermData[j].TermTxt + '</option>').appendTo("#termList")
+                var $selectedOptions = $('<option id= "' + $scope.pinTermData[j].TermNumber + '" onclick="onSearchItemSelection(event)">' + $scope.pinTermData[j].TermTxt + '</option>').appendTo("#termList")
                 $compile($selectedOptions)($scope);
             }
         }
@@ -1268,7 +1269,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
                                 if ($scope.aaPinData[i]._TermId == $rootScope.bodySystemTermArray[j].termNumbr) {
                                     if ($rootScope.bodySystemTermArray[j].language == "1") {
                                         console.log($rootScope.bodySystemTermArray[j].text);
-                                        var $selectedOptions = $('<option id= "' + $rootScope.bodySystemTermArray[j].termNumbr + '" >' + $rootScope.bodySystemTermArray[j].text + '</option>').appendTo("#termList")
+                                        var $selectedOptions = $('<option id= "' + $rootScope.bodySystemTermArray[j].termNumbr + '" onclick="onSearchItemSelection(event)">' + $rootScope.bodySystemTermArray[j].text + '</option>').appendTo("#termList")
                                         $compile($selectedOptions)($scope);
                                     }
                                 }
@@ -1276,7 +1277,6 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
                         }
                     }
                 }
-
             });
         }
     }
@@ -1497,19 +1497,6 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
     $scope.highlightPinBasedOnSerachItem = function (event) {
-        if ($scope.isTermListOptionClicked == true) {
-            $scope.searchItemId = event;
-            $scope.searchItemText = event.innerHTML;
-            $('#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" });
-            $scope.searchFilter = event.innerHTML;
-            selectedTermName.placeholder = event.innerHTML;
-            $scope.isTermListOptionClicked = false;
-        }
-        else
-        {
             $scope.searchItemId = event.currentTarget.id;
             $scope.searchItemText = event.currentTarget.innerHTML;
             $('#termList option[selected="selected"]').prop("selected", false);
@@ -1520,8 +1507,6 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
             $scope.searchFilter = event.currentTarget.innerHTML;
             selectedTermName.placeholder = event.currentTarget.innerHTML;
-        }
-
         //get data from pindata for this trem
@@ -1567,20 +1552,19 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
             }
         }
     }
-  
-
-
+ 
 }]);
-function refreshTermListOnSystem(bodySystemId) {
-  //  alert('refreshTermListOnSystem is called outside');
+function refreshTermListOnSystemSel(bodySystemId) {
+  
     var scope = angular.element(document.getElementById("aaDetailPageDiv")).scope();
     scope.$apply(function () {
-        scope.refreshTermListOnSystemSelection(bodySystemId);
+        scope.refreshTermListOnAASystemSelection(bodySystemId);
     });
 }
+
 function showSelectedSystemPins(event) {
     console.log('OnBodySystem chnaged is called outside ');
     var scope = angular.element(document.getElementById("aaDetailPageDiv")).scope();
@@ -1629,14 +1613,14 @@ function onSearchItemSelection(event) {
     });
 }
-function onListManagerTermSelection(event) {
-    var scope = angular.element(document.getElementById("aaDetailPageDiv")).scope();
-    scope.isTermListOptionClicked = true;
-    scope.$apply(function () {
-        scope.highlightPinBasedOnSerachItem(event);
-    });
+//function onListManagerTermSelection(event) {
+//    var scope = angular.element(document.getElementById("aaDetailPageDiv")).scope();
+//    scope.isTermListOptionClicked = true;
+//    scope.$apply(function () {
+//        scope.highlightPinBasedOnSerachItem1(event);
+//    });
-}
+//}
 function showHideAnnotation(event) {
@@ -597,7 +597,7 @@
             </div>
             <div id="setting-spinner" style="display:none;position: fixed; top: 50%; left: 50%; margin-left: -50px; z-index: 1234; overflow: auto; width: 100px;">
                 <img id="img-spinner" src="content/images/common/loading.gif" alt="Loading">
-            </div>
+            </div>  
             <!--Annotation Modal-->
             <div class="annotationTollbar" style="width: 300px;position: fixed; top: 80px; right: 20px; display: none; z-index: 1200000;">
                 <div class="annotationbar">
@@ -846,13 +846,13 @@
                                 </div>
                                 <div id="restrictListDiv" style="display:none;">
-
                                     <div class="well well-sm marginTopBtm10">
                                         <div class="form-horizontal">
                                             <div class="form-group">
                                                 <label class="col-sm-4 control-label" for="System">System</label>
                                                 <div class="col-sm-8">
                                                     <select id="bodySystems" class="form-control" onchange="if (typeof (this.selectedIndex) != 'undefined') refreshTermListOnSystem(this.options[this.selectedIndex].id)"></select>
+                                                    <select id="AABodySystems" class="form-control" onchange="if (typeof (this.selectedIndex) != 'undefined') refreshTermListOnSystemSel(this.options[this.selectedIndex].id)" style="display:none;" ></select>
                                                 </div>
                                             </div>
                                             <div class="form-group">