Commit 542cd7aa8d8aaa8058978c580abb3a9f7ec568e7

Authored by Nikita Kulshreshtha
1 parent a196a6fb

This issue is fixed. Need to test on IE.

400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -6916,12 +6916,12 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -6916,12 +6916,12 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
6916 $('#bodySystems').empty(); 6916 $('#bodySystems').empty();
6917 6917
6918 6918
6919 - var $all = $('<option ng-click=refreshTermListOnSystemSelection($event) id="0" selected="">All</option>').appendTo('#bodySystems'); 6919 + var $all = $('<option id="0" selected="">All</option>').appendTo('#bodySystems');
6920 $compile($all)($scope); 6920 $compile($all)($scope);
6921 6921
6922 angular.forEach(systemList, function (value, key) { 6922 angular.forEach(systemList, function (value, key) {
6923 6923
6924 - var $elem = $('<option ng-click=refreshTermListOnSystemSelection($event) id="' + value._BodySystemId + '" title="' + value._Name + '" >' + value._Name + '</option>').appendTo('#bodySystems'); 6924 + var $elem = $('<option id="' + value._BodySystemId + '" title="' + value._Name + '" >' + value._Name + '</option>').appendTo('#bodySystems');
6925 $compile($elem)($scope); 6925 $compile($elem)($scope);
6926 }) 6926 })
6927 6927
@@ -7304,12 +7304,12 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -7304,12 +7304,12 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
7304 return Math.round(iReturnValue / nExistingZoom); 7304 return Math.round(iReturnValue / nExistingZoom);
7305 } 7305 }
7306 7306
7307 - $scope.refreshTermListOnSystemSelection = function (event) { 7307 + $scope.refreshTermListOnSystemSelection = function (bodysystemId) {
7308 7308
7309 $('#termList').empty(); 7309 $('#termList').empty();
7310 // $('#termList').innerHTML = ''; 7310 // $('#termList').innerHTML = '';
7311 7311
7312 - if (event.currentTarget.id == 0) { 7312 + if (bodysystemId == 0) {
7313 $scope.loadListManger(); 7313 $scope.loadListManger();
7314 } 7314 }
7315 else { 7315 else {
@@ -7321,7 +7321,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -7321,7 +7321,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
7321 $rootScope.BodySystemData = result; 7321 $rootScope.BodySystemData = result;
7322 var systemMatchedTermList = new jinqJs() 7322 var systemMatchedTermList = new jinqJs()
7323 .from($rootScope.BodySystemData.BodySystem.BodySystemTerm) 7323 .from($rootScope.BodySystemData.BodySystem.BodySystemTerm)
7324 - .where('_SystemNumber == ' + event.currentTarget.id) 7324 + .where('_SystemNumber == ' + bodysystemId)
7325 .select(); 7325 .select();
7326 if (systemMatchedTermList != null || systemMatchedTermList != undefined) { 7326 if (systemMatchedTermList != null || systemMatchedTermList != undefined) {
7327 7327
@@ -7552,11 +7552,11 @@ function HighlightBodyOnListManager(event) { @@ -7552,11 +7552,11 @@ function HighlightBodyOnListManager(event) {
7552 }); 7552 });
7553 } 7553 }
7554 7554
7555 -function refreshTermListOnSystem(event) { 7555 +function refreshTermListOnSystem(bodysystemId) {
7556 console.log('refreshTermListOnSystem is called outside '); 7556 console.log('refreshTermListOnSystem is called outside ');
7557 var scope = angular.element(document.getElementById("daView")).scope(); 7557 var scope = angular.element(document.getElementById("daView")).scope();
7558 scope.$apply(function () { 7558 scope.$apply(function () {
7559 - scope.refreshTermListOnSystemSelection(event); 7559 + scope.refreshTermListOnSystemSelection(bodysystemId);
7560 }); 7560 });
7561 } 7561 }
7562 7562
400-SOURCECODE/AIAHTML5.Web/index.html
@@ -709,7 +709,7 @@ @@ -709,7 +709,7 @@
709 <div class="form-group"> 709 <div class="form-group">
710 <label class="col-sm-4 control-label" for="System">System</label> 710 <label class="col-sm-4 control-label" for="System">System</label>
711 <div class="col-sm-8"> 711 <div class="col-sm-8">
712 - <select id="bodySystems" class="form-control"></select> 712 + <select id="bodySystems" class="form-control" onclick="if (typeof (this.selectedIndex) != 'undefined') refreshTermListOnSystem(this.options[this.selectedIndex].id)"></select>
713 </div> 713 </div>
714 </div> 714 </div>
715 <div class="form-group"> 715 <div class="form-group">