ADAM / AIAHTML5

Commit 2746e96560124730e87283d2199b5936bd31beff

Authored by Amrita Vishnoi
2 parents 0cf4a049 77124fbc

Merge branch 'Bug#7243' into Develop

Inline Side-by-side
Showing 2 changed files with 8 additions and 8 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @2746e96
... ... @@ -6920,12 +6920,12 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
6920 6920 $('#bodySystems').empty();
6921 6921  
6922 6922  
6923   - var $all = $('<option ng-click=refreshTermListOnSystemSelection($event) id="0" selected="">All</option>').appendTo('#bodySystems');
  6923 + var $all = $('<option id="0" selected="">All</option>').appendTo('#bodySystems');
6924 6924 $compile($all)($scope);
6925 6925  
6926 6926 angular.forEach(systemList, function (value, key) {
6927 6927  
6928   - var $elem = $('<option ng-click=refreshTermListOnSystemSelection($event) id="' + value._BodySystemId + '" title="' + value._Name + '" >' + value._Name + '</option>').appendTo('#bodySystems');
  6928 + var $elem = $('<option id="' + value._BodySystemId + '" title="' + value._Name + '" >' + value._Name + '</option>').appendTo('#bodySystems');
6929 6929 $compile($elem)($scope);
6930 6930 })
6931 6931  
... ... @@ -7308,12 +7308,12 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
7308 7308 return Math.round(iReturnValue / nExistingZoom);
7309 7309 }
7310 7310  
7311   - $scope.refreshTermListOnSystemSelection = function (event) {
  7311 + $scope.refreshTermListOnSystemSelection = function (bodysystemId) {
7312 7312  
7313 7313 $('#termList').empty();
7314 7314 // $('#termList').innerHTML = '';
7315 7315  
7316   - if (event.currentTarget.id == 0) {
  7316 + if (bodysystemId == 0) {
7317 7317 $scope.loadListManger();
7318 7318 }
7319 7319 else {
... ... @@ -7325,7 +7325,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
7325 7325 $rootScope.BodySystemData = result;
7326 7326 var systemMatchedTermList = new jinqJs()
7327 7327 .from($rootScope.BodySystemData.BodySystem.BodySystemTerm)
7328   - .where('_SystemNumber == ' + event.currentTarget.id)
  7328 + .where('_SystemNumber == ' + bodysystemId)
7329 7329 .select();
7330 7330 if (systemMatchedTermList != null || systemMatchedTermList != undefined) {
7331 7331  
... ... @@ -7572,11 +7572,11 @@ function HighlightBodyOnListManager(event) {
7572 7572 });
7573 7573 }
7574 7574  
7575   -function refreshTermListOnSystem(event) {
  7575 +function refreshTermListOnSystem(bodysystemId) {
7576 7576 console.log('refreshTermListOnSystem is called outside ');
7577 7577 var scope = angular.element(document.getElementById("daView")).scope();
7578 7578 scope.$apply(function () {
7579   - scope.refreshTermListOnSystemSelection(event);
  7579 + scope.refreshTermListOnSystemSelection(bodysystemId);
7580 7580 });
7581 7581 }
7582 7582  
... ...
400-SOURCECODE/AIAHTML5.Web/index.html
  View file @2746e96
... ... @@ -726,7 +726,7 @@
726 726 <div class="form-group">
727 727 <label class="col-sm-4 control-label" for="System">System</label>
728 728 <div class="col-sm-8">
729   - <select id="bodySystems" class="form-control"></select>
  729 + <select id="bodySystems" class="form-control" onchange="if (typeof (this.selectedIndex) != 'undefined') refreshTermListOnSystem(this.options[this.selectedIndex].id)"></select>
730 730 </div>
731 731 </div>
732 732 <div class="form-group">
... ...