commit changes for search functionality

unknown
1 parent 555befc0
Showing 1 changed file with 6 additions and 6 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -720,7 +720,7 @@ 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) {
+            $scope.$watch('$rootScope.vocabTermDataArray[0].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 
@@ -728,7 +728,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                     $('#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:60001;"><li ng-repeat="item in VocabTermTxt| filter:{ _TermText: searchFilter}">' +
+                    var $e2 = $('<ul id="termlistfilter" class="form-control dropdown-menu" style="height:90px;width:100%;overflow-y:scroll;position:absolute;display:none;z-index:60001;"><li ng-repeat="item in vocabTermDataArray[0].vocabTermTxt| filter:{ _TermText: searchFilter}">' +
                                                                '<a id="{{item._ActualTermNumber}}" href="" onclick="selectTerm(event)">{{item._TermText}}</a>' +
                                                           ' </li></ul>').appendTo('#searchListDiv')
                     $compile($e2)($scope);
@@ -7731,18 +7731,18 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
     $scope.ShowSearch = function () {
         console.log('ShowSearch is called');
         //this check is for log only because we are writing length so need to check if its not null or undefined
-        if ($scope.VocabTermTxt != null || $scope.VocabTermTxt != undefined)
-            console.log('$scope.VocabTermTxt.length= ' + $scope.VocabTermTxt.length)
+        if ($rootScope.vocabTermDataArray[0].vocabTermTxt != null || $rootScope.vocabTermDataArray[0].vocabTermTxt != undefined)
+            console.log('$scope.VocabTermTxt.length= ' + $rootScope.vocabTermDataArray[0].vocabTermTxt.length)
         $timeout(function () {
-            if (($scope.VocabTermTxt != null || $scope.VocabTermTxt != undefined) && ($scope.VocabTermTxt.length > 0)) {
+            if (($rootScope.vocabTermDataArray[0].vocabTermTxt != null || $rootScope.vocabTermDataArray[0].vocabTermTxt != undefined) && ($rootScope.vocabTermDataArray[0].vocabTermTxt.length > 0)) {
                 $scope.IsSearchVisible = true;
                 document.getElementById("termlistfilter").style.display = "block";
             }
             else {
                 $rootScope.loadSearchDataForBodyView();
-                if ($scope.VocabTermTxt.length > 0) {
+                if ($rootScope.vocabTermDataArray[0].vocabTermTxt.length > 0) {
                     $scope.ShowSearch();
                 }
             }