Commit 532fb6c0186eae1182c89c9e0cc08436ea0278cd

Authored by unknown
1 parent 44d149c5

Commit Changes

400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
@@ -33,7 +33,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -33,7 +33,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
33 selectedorientation: '', 33 selectedorientation: '',
34 selectedimagetype: '', 34 selectedimagetype: '',
35 }; 35 };
36 - //$rootScope.isListViewRowClicked = false; 36 +
37 $scope.showTabButton = true; 37 $scope.showTabButton = true;
38 $scope.isListViewDataLoaded = true; 38 $scope.isListViewDataLoaded = true;
39 39
@@ -1197,8 +1197,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -1197,8 +1197,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1197 for (var j = 0; j < $scope.pinTermData.length; j++) { 1197 for (var j = 0; j < $scope.pinTermData.length; j++) {
1198 var $el = $('<li><a id= "' + $scope.pinTermData[j].TermNumber + '" href="" onclick="onSearchItemSelection(event)" >' + $scope.pinTermData[j].TermTxt + '</a></li>').appendTo('#termlistfilter') 1198 var $el = $('<li><a id= "' + $scope.pinTermData[j].TermNumber + '" href="" onclick="onSearchItemSelection(event)" >' + $scope.pinTermData[j].TermTxt + '</a></li>').appendTo('#termlistfilter')
1199 $compile($el)($scope); 1199 $compile($el)($scope);
1200 - var $selectOptions = $('<option id= "' + $scope.pinTermData[j].TermNumber + '" onclick="onSearchItemSelection(event)" >' + $scope.pinTermData[j].TermTxt + '</option>').appendTo("#termList")  
1201 - $compile($selectOptions)($scope); 1200 + var $selectedOptions = $('<option id= "' + $scope.pinTermData[j].TermNumber + '" onclick="onSearchItemSelection(event)" >' + $scope.pinTermData[j].TermTxt + '</option>').appendTo("#termList")
  1201 + $compile($selectedOptions)($scope);
1202 $("#bodySystems").empty(); 1202 $("#bodySystems").empty();
1203 $("#bodySystemList li a").each(function (key, value) { 1203 $("#bodySystemList li a").each(function (key, value) {
1204 var $systemOptions = $('<option id=' + $(this).attr('id') + '>' + $(this).text() + '</option>').appendTo("#bodySystems") 1204 var $systemOptions = $('<option id=' + $(this).attr('id') + '>' + $(this).text() + '</option>').appendTo("#bodySystems")
@@ -1232,12 +1232,12 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -1232,12 +1232,12 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1232 1232
1233 1233
1234 $scope.refreshTermListOnSystemSelection = function (bodySystemId) { 1234 $scope.refreshTermListOnSystemSelection = function (bodySystemId) {
1235 - var bodySystemText = $("#bodySystems #" + bodySystemId).val();  
1236 - alert(bodySystemText);  
1237 - if (bodySystemText == "All") { 1235 + var bodySystemName = $("#bodySystems #" + bodySystemId).val();
  1236 +
  1237 + if (bodySystemName == "All") {
1238 for (var j = 0; j <= $scope.pinTermData.length - 1; j++) { 1238 for (var j = 0; j <= $scope.pinTermData.length - 1; j++) {
1239 - var $selectOptions = $('<option id= "' + $scope.pinTermData[j].TermNumber + '" >' + $scope.pinTermData[j].TermTxt + '</option>').appendTo("#termList")  
1240 - $compile($selectOptions)($scope); 1239 + var $selectedOptions = $('<option id= "' + $scope.pinTermData[j].TermNumber + '" >' + $scope.pinTermData[j].TermTxt + '</option>').appendTo("#termList")
  1240 + $compile($selectedOptions)($scope);
1241 } 1241 }
1242 } 1242 }
1243 else { 1243 else {
@@ -1255,13 +1255,13 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -1255,13 +1255,13 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1255 $rootScope.bodySystemTermArray.push({ "termNumbr": result.PinTermData.TermData[key]._TermNumber, "text": result.PinTermData.TermData[key]._TermText, "language": result.PinTermData.TermData[key]._LanguageId }); 1255 $rootScope.bodySystemTermArray.push({ "termNumbr": result.PinTermData.TermData[key]._TermNumber, "text": result.PinTermData.TermData[key]._TermText, "language": result.PinTermData.TermData[key]._LanguageId });
1256 }); 1256 });
1257 for (var i = 0; i <= $scope.aaPinData.length - 1; i++) { 1257 for (var i = 0; i <= $scope.aaPinData.length - 1; i++) {
1258 - if ($scope.aaPinData[i]._BodySystemName.toLowerCase() == bodySystemText.toLowerCase()) { 1258 + if ($scope.aaPinData[i]._BodySystemName.toLowerCase() == bodySystemName.toLowerCase()) {
1259 for (var j = 0 ; j <= $rootScope.bodySystemTermArray.length - 1; j++) { 1259 for (var j = 0 ; j <= $rootScope.bodySystemTermArray.length - 1; j++) {
1260 if ($scope.aaPinData[i]._TermId == $rootScope.bodySystemTermArray[j].termNumbr) { 1260 if ($scope.aaPinData[i]._TermId == $rootScope.bodySystemTermArray[j].termNumbr) {
1261 if ($rootScope.bodySystemTermArray[j].language == "1") { 1261 if ($rootScope.bodySystemTermArray[j].language == "1") {
1262 console.log($rootScope.bodySystemTermArray[j].text); 1262 console.log($rootScope.bodySystemTermArray[j].text);
1263 - var $selectOptions = $('<option id= "' + $rootScope.bodySystemTermArray[j].termNumbr + '" >' + $rootScope.bodySystemTermArray[j].text + '</option>').appendTo("#termList")  
1264 - $compile($selectOptions)($scope); 1263 + var $selectedOptions = $('<option id= "' + $rootScope.bodySystemTermArray[j].termNumbr + '" >' + $rootScope.bodySystemTermArray[j].text + '</option>').appendTo("#termList")
  1264 + $compile($selectedOptions)($scope);
1265 } 1265 }
1266 } 1266 }
1267 } 1267 }