diff options
| author |   Eran (ev672n), Vosk <ev672n@att.com> | 2018-10-29 18:38:10 +0200 |
|---|---|---|
| committer | Eran (ev672n), Vosk <ev672n@att.com> | 2018-10-29 18:38:10 +0200 |
| commit | bb60d2fc7c06ec661e4c66ac8778e1f2070103cd (patch) | |
| tree | 2497848e3667f0ec99b2bea61e129c52dd37db60 /app/main/dashboard | |
| parent | bdc15ad66739869abef7413e5da40191875781d1 (diff) | |
Sync code3.0.0-ONAP1.2.0casablanca
Sync the code between repositories
Change-Id: Ic431c58c68716b6d401954fb854a183e0d222f57
Issue-ID: SDC-1874
Signed-off-by: Eran (ev672n), Vosk <ev672n@att.com>
Diffstat (limited to 'app/main/dashboard')
| -rw-r--r-- | app/main/dashboard/dcaedt/dcaedt.controller.js | 34 | ||||
| -rw-r--r-- | app/main/dashboard/dcaedt/dcaedt.html | 2 |
2 files changed, 22 insertions, 14 deletions
diff --git a/app/main/dashboard/dcaedt/dcaedt.controller.js b/app/main/dashboard/dcaedt/dcaedt.controller.js index 499a523..1ce7b09 100644 --- a/app/main/dashboard/dcaedt/dcaedt.controller.js +++ b/app/main/dashboard/dcaedt/dcaedt.controller.js @@ -8,24 +8,30 @@ $scope.appSettings = appSettings; function init() { - if ($rootScope.VNFs === undefined) { - dcaeFactory - .getVNFList() - .then(function (response) { - $rootScope.VNFs = response.data; - $rootScope.VNFsRef = $rootScope.VNFs; - $scope.title = appSettings.title; - //var vm = this; vm.test = appSettings.title; - }, function (res, status, headers, config) { - errorHanlder(res); - $rootScope.VNFs = []; - }); - } + $rootScope.loader = true; + $rootScope.VNFs = []; + dcaeFactory + .getVNFList() + .then(function (response) { + $rootScope.VNFs = response.data; + $rootScope.VNFsRef = $rootScope.VNFs; + $scope.title = appSettings.title; + $rootScope.loader = false; + //var vm = this; vm.test = appSettings.title; + }, function (res, status, headers, config) { + errorHanlder(res); + $rootScope.VNFs = []; + $rootScope.loader = false; + }); $rootScope.$state = $state; $rootScope.$stateParams = $stateParams; } - init(); + if ($state.current.url !== '/general') { + $rootScope.loader = false; + console.log($state.loader); + init(); + } $scope.sortingVfcmts = function () { $rootScope.VNFs = $rootScope.VNFsRef; diff --git a/app/main/dashboard/dcaedt/dcaedt.html b/app/main/dashboard/dcaedt/dcaedt.html index 7084cf0..69ecfc3 100644 --- a/app/main/dashboard/dcaedt/dcaedt.html +++ b/app/main/dashboard/dcaedt/dcaedt.html @@ -3,6 +3,8 @@ <div class="dcae-main-container" style="padding: 1rem;"> + <div class="tlv-loader large" ng-if="loader"></div> + <div style="display: flex; justify-content: space-between; margin:10px 0;"> <span style="padding-left: 10px; display: flex; align-items: center;"> <span ng-if="!VNFs" style="padding-right:3px;">0</span> {{ VNFs.length }} VFCMTS |