loader animation added to pages
Change-Id: Id8c890714d0a90ae913b6581cd655abcf6cd6781
Signed-off-by: Michael Davis <michael.s.davis@ibm.com>
diff --git a/app/overview/controllers/system-overview-controller.html b/app/overview/controllers/system-overview-controller.html
index a3d22ed..e555641 100644
--- a/app/overview/controllers/system-overview-controller.html
+++ b/app/overview/controllers/system-overview-controller.html
@@ -1,3 +1,4 @@
+<loader loading="loading"></loader>
<div class="overview">
<div class="row column">
<h1 class="inline">IBM Power Witherspoon 2</h1>
@@ -78,14 +79,14 @@
<!-- Power metadata -->
<div class="row column overview__event-log event-log__events" ng-show="logs.length">
<div class="page-header">
- <h3 class="bold h4 inline">High priority events</h3>
- <a href="#/server-health/event-log" class="inline float-right">View all event logs</a>
+ <h3 class="bold h4 inline">High priority events ({{logs.length}})</h3>
+ <a href="#/server-health/event-log/high" class="inline float-right">View all event logs</a>
</div>
<!-- show when there are no critical events from event log -->
<!-- <p class="disabled">No high priority events</p> -->
<!-- single event -->
- <a href="#/server-health/event-log" ng-repeat="event in logs|orderBy:'+Id'">
+ <a href="#/server-health/event-log/high" ng-repeat="event in logs|orderBy:'+Id'">
<div class="row column event-log__single-event">
<div class="row">
<div class="column small-1 large-1 event-log__col-check">
@@ -113,13 +114,15 @@
</div>
<div class="row column overview__event-log event-log__events" ng-show="!logs.length">
- <h3 class="bold h4">High priority events</h3>
- <p>There are no high priority events to display at this time.</p>
+ <div class="page-header">
+ <h3 class="bold h4">High priority events (0)</h3>
+ <p>There are no high priority events to display at this time.</p>
+ </div>
</div>
</div>
<div class="column large-4 no-padding">
<div class="quick-links">
- <a href="#/server-health/event-log" class="quick-links__item quick-links__events event-log__events" ng-show="logs.length">
+ <a href="#/server-health/event-log/high" class="quick-links__item quick-links__events event-log__events" ng-show="logs.length">
<p class="inline quick-links__event-copy">{{logs.length}} High priority events</p><!-- link to event log filtered to the high priority events -->
</a>
<div class="quick-links__item no-icon">
@@ -127,7 +130,7 @@
<p class="inline courier-bold float-right">3:20:12 5/22/2017 UTC</p>
</div>
<div class="quick-links__item no-icon">
- <p class="inline quick-links__label">Turn on server indicator</p>
+ <p class="inline quick-links__label">Turn <span ng-if="dataService.LED_state == 'off'">on</span><span ng-if="dataService.LED_state == 'on'">off</span> server indicator</p>
<div class="toggle inline float-right">
<input id="toggle__switch-round"
class="toggle-switch toggle-switch__round-flat"
diff --git a/app/overview/controllers/system-overview-controller.js b/app/overview/controllers/system-overview-controller.js
index 5468d6f..4dd012d 100644
--- a/app/overview/controllers/system-overview-controller.js
+++ b/app/overview/controllers/system-overview-controller.js
@@ -17,7 +17,8 @@
'$window',
'APIUtils',
'dataService',
- function($scope, $window, APIUtils, dataService){
+ '$q',
+ function($scope, $window, APIUtils, dataService, $q){
$scope.dataService = dataService;
$scope.dropdown_selected = false;
$scope.tmz = 'EDT';
@@ -26,24 +27,33 @@
$scope.bmc_info = {};
$scope.bmc_firmware = "";
$scope.server_firmware = "";
+ $scope.loading = false;
loadOverviewData();
function loadOverviewData(){
- APIUtils.getLogs(function(data){
- $scope.displayLogs(data);
- });
- APIUtils.getFirmwares(function(data, bmcActiveVersion, hostActiveVersion){
- $scope.displayServerInfo(data, bmcActiveVersion, hostActiveVersion);
- });
- APIUtils.getLEDState(function(state){
- $scope.displayLEDState(state);
- });
- APIUtils.getBMCEthernetInfo(function(data){
- $scope.displayBMCEthernetInfo(data);
- });
- APIUtils.getBMCInfo(function(data){
- $scope.displayBMCInfo(data);
- });
+ $scope.loading = true;
+ var promises = {
+ logs: APIUtils.getLogs(),
+ firmware: APIUtils.getFirmwares(),
+ led: APIUtils.getLEDState(),
+ ethernet: APIUtils.getBMCEthernetInfo(),
+ bmc_info: APIUtils.getBMCInfo()
+ };
+ $q.all(promises)
+ .then(function(data){
+ $scope.displayLogs(data.logs.data);
+ $scope.displayServerInfo(
+ data.firmware.data,
+ data.firmware.bmcActiveVersion,
+ data.firmware.hostActiveVersion
+ );
+ $scope.displayLEDState(data.led);
+ $scope.displayBMCEthernetInfo(data.ethernet);
+ $scope.displayBMCInfo(data.bmc_info);
+ })
+ .finally(function(){
+ $scope.loading = false;
+ });
}
$scope.displayBMCEthernetInfo = function(data){
$scope.mac_address = data.MACAddress;