ADAM / AIAHTML5

Commit f222589cc4a80889337bbf55bf72e6b9b45ad96d

Authored by Nikita Kulshreshtha
2 parents 5dc6c30d c87688d9

Merge branch 'searchAnnotationIssue' into QA

Inline Side-by-side
Showing 1 changed file with 5 additions and 12 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
  View file @f222589
... ... @@ -1260,16 +1260,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1260 1260 sortedTermTextArray.sort();
1261 1261 }
1262 1262  
1263   - for (var i = 0; i <= sortedTermTextArray.length - 1; i++) {
1264   - for(var j = 0;j<= $scope.matchedLanguageTermData.length-1;j++){
1265   - if ($scope.matchedLanguageTermData[j]._TermText == sortedTermTextArray[i])
1266   - {
1267   - $scope.pinTermData.push({ "LanguageId": $scope.matchedLanguageTermData[j]._LanguageId, "TermNumber": $scope.matchedLanguageTermData[j]._TermNumber, "TermTxt": $scope.matchedLanguageTermData[j]._TermText });
1268   - break;
1269   - }
1270   - }
1271   - }
1272   -
  1263 +
1273 1264 for (var i = 0; i <= sortedTermTextArray.length - 1; i++) {
1274 1265 for (var j = 0; j <= $scope.matchedLanguageTermData.length - 1; j++) {
1275 1266 if ($scope.matchedLanguageTermData[j]._TermText == sortedTermTextArray[i]) {
... ... @@ -1343,14 +1334,16 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1343 1334  
1344 1335  
1345 1336 $rootScope.refreshTermListOnAASystemSelection = function (bodySystemId) {
1346   - $('#termList').empty();
  1337 +
1347 1338 $rootScope.bodySystemSeletedId = bodySystemId;
1348 1339 $('#termList').empty();
1349 1340 var bodySystemName = $("#AABodySystems #" + bodySystemId).val();
1350 1341 if (bodySystemName == "All") {
1351 1342 for (var j = 0; j <= $scope.pinTermData.length - 1; j++) {
1352   -
  1343 + var $selectedOptions = $('<option title= "' + $scope.pinTermData[j].TermTxt + '" id= "' + $scope.pinTermData[j].TermNumber + '" onclick="onSearchItemSelection(event)" >' + $scope.pinTermData[j].TermTxt + '</option>').appendTo("#termList")
  1344 +
1353 1345 $compile($selectedOptions)($scope);
  1346 +
1354 1347 }
1355 1348 $("#totalTerms").empty();
1356 1349 $("#totalTerms").html("<span class='pull-left marginTop5'>" + $("#termList option").length + " Structures</span>");
... ...