Commit b32144cb007ea8687ba23a8838209b62332f719b
Merge branch 'Bug#8756' into Develop
Showing
1 changed file
with
9 additions
and
6 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -7997,14 +7997,14 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -7997,14 +7997,14 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
7997 | 7997 | ||
7998 | } | 7998 | } |
7999 | } | 7999 | } |
8000 | - $('#spinner').css('visibility', 'visible'); | ||
8001 | - console.log('listManagerEvent'); | 8000 | + |
8002 | 8001 | ||
8003 | 8002 | ||
8004 | 8003 | ||
8005 | if ($rootScope.islistManagerEventAlredayDispachted == true) { | 8004 | if ($rootScope.islistManagerEventAlredayDispachted == true) { |
8006 | 8005 | ||
8007 | - | 8006 | + $('#spinner').css('visibility', 'visible'); |
8007 | + console.log('listManagerEvent'); | ||
8008 | var systemList = $rootScope.CommonData.DACommonData.BodySystems.Item; | 8008 | var systemList = $rootScope.CommonData.DACommonData.BodySystems.Item; |
8009 | 8009 | ||
8010 | $('#bodySystems').empty(); | 8010 | $('#bodySystems').empty(); |
@@ -8092,13 +8092,16 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -8092,13 +8092,16 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
8092 | var $el = $('<option ng-click=HighlightBodyOnListManagerSelection($event) id=' + $scope.VocabTermTxt[j]._ActualTermNumber + '>' + $scope.VocabTermTxt[j]._TermText + '</option>').appendTo('#termList') | 8092 | var $el = $('<option ng-click=HighlightBodyOnListManagerSelection($event) id=' + $scope.VocabTermTxt[j]._ActualTermNumber + '>' + $scope.VocabTermTxt[j]._TermText + '</option>').appendTo('#termList') |
8093 | $compile($el)($scope); | 8093 | $compile($el)($scope); |
8094 | 8094 | ||
8095 | - $rootScope.isLoading = false; | ||
8096 | - $('#spinner').css('visibility', 'hidden'); | ||
8097 | } | 8095 | } |
8096 | + | ||
8097 | + $rootScope.isLoading = false; | ||
8098 | + $('#spinner').css('visibility', 'hidden'); | ||
8099 | + | ||
8098 | var termsTotal = '<span class="pull-left marginTop5">' + $scope.VocabTermTxt.length + ' Structures</span>'; | 8100 | var termsTotal = '<span class="pull-left marginTop5">' + $scope.VocabTermTxt.length + ' Structures</span>'; |
8099 | $("#totalTerms").empty(); | 8101 | $("#totalTerms").empty(); |
8100 | $('#totalTerms').append(termsTotal); | 8102 | $('#totalTerms').append(termsTotal); |
8101 | - | 8103 | + |
8104 | + | ||
8102 | 8105 | ||
8103 | } | 8106 | } |
8104 | } | 8107 | } |