Merge branch 'Bug#7243' into Develop

Amrita Vishnoi
2 parents 0cf4a049 77124fbc
Showing 2 changed files with 8 additions and 8 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
400-SOURCECODE/AIAHTML5.Web/index.html
@@ -6920,12 +6920,12 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
             $('#bodySystems').empty();
-            var $all = $('<option ng-click=refreshTermListOnSystemSelection($event) id="0" selected="">All</option>').appendTo('#bodySystems');
+            var $all = $('<option  id="0" selected="">All</option>').appendTo('#bodySystems');
             $compile($all)($scope);
             angular.forEach(systemList, function (value, key) {
-                var $elem = $('<option ng-click=refreshTermListOnSystemSelection($event) id="' + value._BodySystemId + '"  title="' + value._Name + '" >' + value._Name + '</option>').appendTo('#bodySystems');
+                var $elem = $('<option  id="' + value._BodySystemId + '"  title="' + value._Name + '" >' + value._Name + '</option>').appendTo('#bodySystems');
                 $compile($elem)($scope);
             })
@@ -7308,12 +7308,12 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
         return Math.round(iReturnValue / nExistingZoom);
     }
-    $scope.refreshTermListOnSystemSelection = function (event) {
+    $scope.refreshTermListOnSystemSelection = function (bodysystemId) {
         $('#termList').empty();
         // $('#termList').innerHTML = '';
-        if (event.currentTarget.id == 0) {
+        if (bodysystemId == 0) {
             $scope.loadListManger();
         }
         else {
@@ -7325,7 +7325,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                 $rootScope.BodySystemData = result;
                 var systemMatchedTermList = new jinqJs()
                                        .from($rootScope.BodySystemData.BodySystem.BodySystemTerm)
-                                       .where('_SystemNumber == ' + event.currentTarget.id)
+                                       .where('_SystemNumber == ' + bodysystemId)
                                        .select();
                 if (systemMatchedTermList != null || systemMatchedTermList != undefined) {
@@ -7572,11 +7572,11 @@ function HighlightBodyOnListManager(event) {
     });
 }
-function refreshTermListOnSystem(event) {
+function refreshTermListOnSystem(bodysystemId) {
     console.log('refreshTermListOnSystem is called outside ');
     var scope = angular.element(document.getElementById("daView")).scope();
     scope.$apply(function () {
-        scope.refreshTermListOnSystemSelection(event);
+        scope.refreshTermListOnSystemSelection(bodysystemId);
     });
 }
@@ -726,7 +726,7 @@
                                     <div class="form-group">
                                         <label class="col-sm-4 control-label" for="System">System</label>
                                         <div class="col-sm-8">
-                                            <select id="bodySystems" class="form-control"></select>
+                                            <select id="bodySystems" class="form-control" onchange="if (typeof (this.selectedIndex) != 'undefined') refreshTermListOnSystem(this.options[this.selectedIndex].id)"></select>
                                         </div>
                                     </div>
                                     <div class="form-group">