Commit 1864a8a5d63afe0975fcd72677f5a2fee42f7ed0

Authored by Amrita Vishnoi
1 parent ccdbc109

Code merged against bug fix in which search was not working for those text which…

… belongs anywhere in search list and also one duplicate code is removed for message.
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -9342,53 +9342,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -9342,53 +9342,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
9342 } 9342 }
9343 9343
9344 $scope.resetSearchListView = function () { 9344 $scope.resetSearchListView = function () {
9345 - $("#termlistfilter").css("display", "block");  
9346 - //Remove the list and then Repopulate it on change of $scope.searchFilter  
9347 - $('#searchListDiv').empty();  
9348 - $rootScope.ModifiedsearchListArray = [];  
9349 - // added the timeout to delay the compile of ul li  
9350 - $scope.IsSearchVisible = true;  
9351 - var isValueMatchedWithTerm = false;  
9352 - for (var i = 0; i <= $rootScope.searchListArray.length - 1; i++) {  
9353 - var searchFieldVal = $("#typedTermName").val();  
9354 - if (searchFieldVal.length > 0) {  
9355 - for (var j = 0; j <= searchFieldVal.length - 1; j++) {  
9356 - if ($rootScope.searchListArray[i].name[j] == undefined) {  
9357 - isValueMatchedWithTerm = false;  
9358 - break;  
9359 - }  
9360 - if (searchFieldVal[j].toLowerCase() != $rootScope.searchListArray[i].name[j].toLowerCase()) {  
9361 - isValueMatchedWithTerm = false;  
9362 - break;  
9363 - }  
9364 - else {  
9365 - isValueMatchedWithTerm = true;  
9366 - }  
9367 - }  
9368 - if (isValueMatchedWithTerm == true) {  
9369 - $rootScope.ModifiedsearchListArray.push({ "name": $rootScope.searchListArray[i].name, "id": $rootScope.searchListArray[i].id });  
9370 - }  
9371 - }  
9372 - }  
9373 - var termListFilterHtml = '';  
9374 - termListFilterHtml += '<ul id="termlistfilter" class="form-control dropdown-menu" style="height:90px;width:100%;overflow-y:scroll;position:absolute;z-index:60001;">';  
9375 - if ($("#typedTermName").val().length > 0) {  
9376 - for (var i = 0; i <= $rootScope.ModifiedsearchListArray.length - 1; i++) {  
9377 - termListFilterHtml += '<li><a id=' + $rootScope.ModifiedsearchListArray[i].id + ' href="javascript:void(0);" onclick="selectTerm(event)">' + $rootScope.ModifiedsearchListArray[i].name + '</a></li>';  
9378 - }  
9379 - termListFilterHtml += '</ul>';  
9380 - $('#searchListDiv').append(termListFilterHtml);  
9381 - }  
9382 - else {  
9383 - for (var i = 0; i <= $rootScope.searchListArray.length - 1; i++) {  
9384 - termListFilterHtml += '<li><a id=' + $rootScope.searchListArray[i].id + ' href="javascript:void(0);" onclick="selectTerm(event)">' + $rootScope.searchListArray[i].name + '</a></li>';  
9385 - }  
9386 - termListFilterHtml += '</ul>';  
9387 - $('#searchListDiv').append(termListFilterHtml);  
9388 - }  
9389 - }  
9390 -  
9391 9345
  9346 + $scope.ShowSearch();
  9347 + }
9392 9348
9393 }]) 9349 }])
9394 9350
400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js
@@ -420,11 +420,6 @@ AIA.constant(&quot;UserTypeConstants&quot;, { @@ -420,11 +420,6 @@ AIA.constant(&quot;UserTypeConstants&quot;, {
420 "SITE_USER": "Site User" 420 "SITE_USER": "Site User"
421 }) 421 })
422 422
423 -AIA.constant("AIAConstants", {  
424 -  
425 - "NO_BODY_SYSTEM_AVAILABLE": "No body system available in this layer.",  
426 -  
427 -})  
428 423
429 AIA.constant("UserModules", [ 424 AIA.constant("UserModules", [
430 { 425 {