Merge branch 'erasedFunctionalityIssue' of http://52.6.196.163/ADAM/AIAHTML5 into Develop

Amrita Vishnoi
2 parents 438d7c7b 0a8da17f
Showing 1 changed file with 6 additions and 15 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -8437,7 +8437,6 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
     }
     $scope.resetSearchListView = function () {
-        
         $("#termlistfilter").css("display", "block");
         //Remove the list and then Repopulate it on change of $scope.searchFilter
         $('#searchListDiv').empty();
@@ -8449,50 +8448,42 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
         {
             var searchFieldVal = $("#typedTermName").val();
             if (searchFieldVal.length > 0) {
-                
                 for (var j = 0; j <= searchFieldVal.length - 1; j++) {
-                 
-                    if (searchFieldVal[j].toUpperCase() != $rootScope.searchListArray[i].name[j].toUpperCase()) {
+                    if ($rootScope.searchListArray[i].name[j] == undefined) {
+                       isValueMatchedWithTerm = false;
+                        break;
+                    }
+                    if (searchFieldVal[j].toLowerCase() != $rootScope.searchListArray[i].name[j].toLowerCase()) {
                         isValueMatchedWithTerm = false;
                         break;
                     }
                     else {
-                        isValueMatchedWithTerm = true
+                        isValueMatchedWithTerm = true;
                     }
                 }
                 if (isValueMatchedWithTerm == true) {
                     $rootScope.ModifiedsearchListArray.push({ "name": $rootScope.searchListArray[i].name, "id": $rootScope.searchListArray[i].id});
-                    console.log($rootScope.ModifiedsearchListArray);
                 }
-               
             }
         }
-        
         var termListFilterHtml = '';
         termListFilterHtml += '<ul id="termlistfilter"  class="form-control dropdown-menu" style="height:90px;width:100%;overflow-y:scroll;position:absolute;z-index:60001;">';
         if ($("#typedTermName").val().length > 0) {
-
             for (var i = 0; i <= $rootScope.ModifiedsearchListArray.length - 1; i++) {
-               
                 termListFilterHtml += '<li><a id=' + $rootScope.ModifiedsearchListArray[i].id + ' href="javascript:void(0);" onclick="selectTerm(event)">' + $rootScope.ModifiedsearchListArray[i].name + '</a></li>';
             }
             termListFilterHtml += '</ul>';
             $('#searchListDiv').append(termListFilterHtml);
-         
         }
         else
         {
-            console.log($rootScope.searchListArray.length);
             for (var i = 0; i <= $rootScope.searchListArray.length - 1; i++) {
-              
                 termListFilterHtml += '<li><a id=' + $rootScope.searchListArray[i].id + ' href="javascript:void(0);" onclick="selectTerm(event)">' + $rootScope.searchListArray[i].name + '</a></li>';
             }
             termListFilterHtml += '</ul>';
             $('#searchListDiv').append(termListFilterHtml);
-         
         }
     }
-    
 }]
 );