diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js index 73a5216..e13c39e 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js @@ -1190,10 +1190,22 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou .from($scope.AAPinTermData) .where('_LanguageId == ' + primaryLexicon) .select(); - + var sortedTermTextArray = []; for (var i = 0; i < $scope.matchedLanguageTermData.length; i++) { - $scope.pinTermData.push({ "LanguageId": $scope.matchedLanguageTermData[i]._LanguageId, "TermNumber": $scope.matchedLanguageTermData[i]._TermNumber, "TermTxt": $scope.matchedLanguageTermData[i]._TermText}); + sortedTermTextArray.push($scope.matchedLanguageTermData[i]._TermText); + sortedTermTextArray.sort(); + } + + for (var i = 0; i <= sortedTermTextArray.length - 1; i++) { + for(var j = 0;j<= $scope.matchedLanguageTermData.length-1;j++){ + if ($scope.matchedLanguageTermData[j]._TermText == sortedTermTextArray[i]) + { + $scope.pinTermData.push({ "LanguageId": $scope.matchedLanguageTermData[j]._LanguageId, "TermNumber": $scope.matchedLanguageTermData[j]._TermNumber, "TermTxt": $scope.matchedLanguageTermData[j]._TermText }); + break; + } + } } + $scope.$watch('$scope.pinTermData', function (newValue, oldValue, scope) { if ($('#termlistfilter').html() != "") $('#termList').empty(); @@ -1240,9 +1252,10 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou $scope.refreshTermListOnSystemSelection = function (bodySystemId) { var bodySystemName = $("#bodySystems #" + bodySystemId).val(); - + $('#termList').empty(); if (bodySystemName == "All") { for (var j = 0; j <= $scope.pinTermData.length - 1; j++) { + var $selectedOptions = $('').appendTo("#termList") $compile($selectedOptions)($scope); } @@ -1251,7 +1264,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou var imageId = $rootScope.imageId; $scope.pinDataUrl = "aa_dat_pinterm_" + imageId; $rootScope.bodySystemTermArray = []; - $('#termList').empty(); + $.ajax({ url: '~/../content/data/json/aa/aa_pinterm/' + $scope.pinDataUrl + '.json', type: 'GET',