Merge branch 'SearchIssue' into Develop

Nikita Kulshreshtha
2 parents ee3c0e26 b952a635
Showing 2 changed files with 47 additions and 23 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
@@ -634,6 +634,24 @@ 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 
+            if ($('#searchListDiv').html()!="")
+              $('#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 +6580,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 +6810,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);
@@ -7525,7 +7545,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
             console.log('listManagerEvent');
             var systemList = $rootScope.CommonData.DACommonData.BodySystems.Item;
  
-            $('#bodySystems').empty();
+            var optionsLength = $('#bodySystems option').length;//.children('option').length;
+            console.log('optionsLength= ' + optionsLength)
+            if (optionsLength>0)
+             $('#bodySystems').empty();
  
  
             var $all = $('<option  id="0" selected="">All</option>').appendTo('#bodySystems');
@@ -7559,7 +7582,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
             }
  
         }
-
+    
  
  
     });
@@ -8171,6 +8194,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,31 +280,17 @@
                 <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">
-                                <!--#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;">
-                                    <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>
+                            <div id="searchListDiv" class="col-sm-12 col-xs-12 col-md-12 col-lg-12 pull-left">
+                       
                             </div>
                         </div>
-                        <!--</div>-->
  
                     </div>
                     <div class="btn-group">
-                        <!--<button type="button" style="padding:0px 0px 10px 1px !important;background-color:rgba(255,255,255,0.0); border:none;" class="btn btn-success dropdown-toggle btn-sm" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                            <img src="~/../content/images/DA/go-to.png" style="height: 30px;width:50px">
-                        </button>
-                        <ul class="dropdown-menu" style="width:100%;">
-                            <li><a href="#">{{currentTitleFromJson}}</a></li>
-                            <li role="separator" class="divider"></li>
-                            <li><a href="#">All</a></li>
-                        </ul>-->
+            
                         <button type="button" id="btnDATermSearch" style="padding:0px 0px 10px 1px !important;background-color:rgba(255,255,255,0.0); border:none;" class="btn btn-success btn-sm" ng-mousedown="OnSearchBtnClick($event)">
                             <img src="~/../content/images/DA/go-to.png" style="height: 30px;width:50px">
                         </button>
@@ -316,7 +302,7 @@
  
                         <div class="dropdown-menu active" id="navigatorDiv" style="min-height:auto; min-width:auto; ">
                             <div id="containment-wrapper" align="center" style="min-width:auto;height:119px; ">
-                                <img id="navimg" alt=""></img>
+                                <img id="navimg" alt=""/>
                                 <div id="draggable" class="draggable ui-widget-content" ng-mouseup="ScrollCanvasDiv()" ng-style="dragdivposition">
                                 </div>
                             </div>