Merge branch 'DASearchBindingOldDev' of http://52.6.196.163/ADAM/AIAHTML5 into SearchIssue

Nikita Kulshreshtha
2 parents ee3c0e26 fd12dd5e
Showing 2 changed files with 39 additions and 7 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
@@ -634,6 +634,22 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
             }
         }
  
+        //call watch on '$scope.VocabTermTxt and compile <li> and append to <ul> on first time load
+        $scope.$watch('$scope.VocabTermTxt', function (newValue, oldValue, scope) {
+
+            //This is added as the $scope.VocabTermTxt can change while changing view also the li elements need to be removed
+            //Remove the list and then Repopulate 
+            $('#searchListDiv').empty()
+            //Delay compile of ul li so that the remove of li is completed.
+            $timeout(function () {
+                var $e2 = $('<ul id="termlistfilter" class="form-control dropdown-menu" style="height:90px;width:100%;overflow-y:scroll;position:absolute;display:none;z-index:1000;"><li ng-repeat="item in VocabTermTxt| filter:{ _TermText: searchFilter}">' +
+                                                           '<a id="{{item._ActualTermNumber}}" href="" onclick="selectTerm(event)">{{item._TermText}}</a>' +
+                                                      ' </li></ul>').appendTo('#searchListDiv')
+                $compile($e2)($scope);
+            }, 500);
+
+        }, true);
+
     }
  
     $scope.loadBodyViewData = function (currentVoid) {
@@ -6562,7 +6578,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
  
        // $rootScope.isHighlightBodyByBodySystem = false;
  
-       
+        //Remove the Search list and then Repopulate it on change of Gender
+        $('#searchListDiv').empty()
  
         $rootScope.isGenderChnage = true;
  
@@ -6791,7 +6808,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
  
       //  $rootScope.isHighlightBodyByBodySystem = false;
  
-
+        //Remove the search list and then Repopulate it on change of View
+        $('#searchListDiv').empty()
  
         if ($rootScope.openViews.length > 0) {
             $rootScope.openViews.splice($rootScope.openViews.length - 1);
@@ -8171,6 +8189,21 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
         }
     }
  
+    $scope.resetSearchListView = function () {
+
+        //Remove the list and then Repopulate it on change of $scope.searchFilter
+        $('#searchListDiv').empty()
+        // added the timeout to delay the compile of ul li
+        $timeout(function () {
+        var $e2 = $('<ul id="termlistfilter" class="form-control dropdown-menu" style="height:90px;width:100%;overflow-y:scroll;position:absolute;display:none;z-index:1000;"><li ng-repeat="item in VocabTermTxt| filter:{ _TermText: searchFilter}">' +
+                                                   '<a id="{{item._ActualTermNumber}}" href="" onclick="selectTerm(event)">{{item._TermText}}</a>' +
+                                              ' </li></ul>').appendTo('#searchListDiv')
+        $compile($e2)($scope);
+        }, 500);
+
+
+    }
+
  
 }]
  
@@ -280,17 +280,16 @@
                 <div class="">
                     <div class="input-group col-sm-8 col-xs-7 col-md-10 pull-left">
  
-                        <input type="text" class="form-control input-sm pull-left" id="typedtermname" ng-blur="HideSearch()" onclick="OnSearch()" ondblclick="OnSearch()" ng-model="searchFilter" ng-change="textChange(searchFilter)" placeholder="Search...">
+                        <input type="text" class="form-control input-sm pull-left" id="typedtermname" ng-blur="HideSearch()" onclick="OnSearch()" ondblclick="OnSearch()" ng-model="searchFilter" ng-change="resetSearchListView()" " placeholder=" search...">
  
                         <div id="backdrop" ng-show="IsSearchVisible">
-                            <div class="col-sm-12 col-xs-12 col-md-12 col-lg-12 pull-left">
+                            <div id="searchListDiv" class="col-sm-12 col-xs-12 col-md-12 col-lg-12 pull-left">
                                 <!--#Bug 6591-->
-                                <ul id="termlistfilter" class="form-control dropdown-menu" style="height:90px;width:100%;overflow-y:scroll;position:absolute;display:none;z-index:1000;">
+                                <!--<ul id="termlistfilter" class="form-control dropdown-menu" style="height:90px;width:100%;overflow-y:scroll;position:absolute;display:none;z-index:1000;">
                                     <li ng-repeat="item in VocabTermTxt| filter:{ _TermText: searchFilter}">
-                                        <!--<a id="{{item._ActualTermNumber}}" href="" ng-click="jumpToTerm($event)">{{item._TermText}}</a>-->
                                         <a id="{{item._ActualTermNumber}}" href="" onclick="selectTerm(event)">{{item._TermText}}</a>
                                     </li>
-                                </ul>
+                                </ul>-->
                             </div>
                         </div>
                         <!--</div>-->