From 1864a8a5d63afe0975fcd72677f5a2fee42f7ed0 Mon Sep 17 00:00:00 2001 From: amrita.vishnoi Date: Wed, 29 Nov 2017 16:20:37 +0530 Subject: [PATCH] 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 | 48 ++---------------------------------------------- 400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js | 5 ----- 2 files changed, 2 insertions(+), 51 deletions(-) diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index 8595e90..070cdaa 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -9342,53 +9342,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l } $scope.resetSearchListView = function () { - $("#termlistfilter").css("display", "block"); - //Remove the list and then Repopulate it on change of $scope.searchFilter - $('#searchListDiv').empty(); - $rootScope.ModifiedsearchListArray = []; - // added the timeout to delay the compile of ul li - $scope.IsSearchVisible = true; - var isValueMatchedWithTerm = false; - for (var i = 0; i <= $rootScope.searchListArray.length - 1; i++) { - var searchFieldVal = $("#typedTermName").val(); - if (searchFieldVal.length > 0) { - for (var j = 0; j <= searchFieldVal.length - 1; j++) { - 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; - } - } - if (isValueMatchedWithTerm == true) { - $rootScope.ModifiedsearchListArray.push({ "name": $rootScope.searchListArray[i].name, "id": $rootScope.searchListArray[i].id }); - } - } - } - var termListFilterHtml = ''; - termListFilterHtml += ''; - $('#searchListDiv').append(termListFilterHtml); - } - else { - for (var i = 0; i <= $rootScope.searchListArray.length - 1; i++) { - termListFilterHtml += '
  • ' + $rootScope.searchListArray[i].name + '
  • '; - } - termListFilterHtml += ''; - $('#searchListDiv').append(termListFilterHtml); - } - } - + $scope.ShowSearch(); + } }]) diff --git a/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js b/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js index 0a27b5c..6ee86b4 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js @@ -420,11 +420,6 @@ AIA.constant("UserTypeConstants", { "SITE_USER": "Site User" }) -AIA.constant("AIAConstants", { - - "NO_BODY_SYSTEM_AVAILABLE": "No body system available in this layer.", - -}) AIA.constant("UserModules", [ { -- libgit2 0.21.4