diff options
author | beccabroek <beccabroek@gmail.com> | 2019-01-07 11:43:13 -0600 |
---|---|---|
committer | beccabroek <beccabroek@gmail.com> | 2019-01-15 09:25:23 -0600 |
commit | 2264b42e8b6e24069421933c1f6d8835b67e69fb (patch) | |
tree | 4616b307b61c2967b2f7a2802d571725e638c414 | |
parent | a30394b79c414a7f470bd89a333e892ccb3d2340 (diff) | |
download | phosphor-webui-2264b42e8b6e24069421933c1f6d8835b67e69fb.tar.gz phosphor-webui-2264b42e8b6e24069421933c1f6d8835b67e69fb.zip |
Add toast to Power Usage page
Replaces success and error messages with tast notifications on
the Power Usage page.
Change-Id: Id7c3f8d63f932671a72644a740c5f1da1d2f9777
Signed-off-by: beccabroek <beccabroek@gmail.com>
-rw-r--r-- | app/server-control/controllers/power-usage-controller.html | 2 | ||||
-rw-r--r-- | app/server-control/controllers/power-usage-controller.js | 31 |
2 files changed, 16 insertions, 17 deletions
diff --git a/app/server-control/controllers/power-usage-controller.html b/app/server-control/controllers/power-usage-controller.html index 0a89e6f..3e7c63f 100644 --- a/app/server-control/controllers/power-usage-controller.html +++ b/app/server-control/controllers/power-usage-controller.html @@ -39,8 +39,6 @@ <button type="button" class="btn-primary inline" ng-click="setPowerCap()">Save settings</button> <button type="button" class="btn-secondary inline" ng-click="refresh()">Cancel</button> </div> - <p class="success-msg" ng-show="set_power_cap_success" role="alert">Success! Power cap changed!</p> - <p class="set_powercap_error error-msg" ng-show="set_power_cap_error" role="alert">Error setting Power Cap!</p> </section> </form> </div> diff --git a/app/server-control/controllers/power-usage-controller.js b/app/server-control/controllers/power-usage-controller.js index 347d0d4..5dc848e 100644 --- a/app/server-control/controllers/power-usage-controller.js +++ b/app/server-control/controllers/power-usage-controller.js @@ -10,12 +10,10 @@ window.angular && (function(angular) { 'use strict'; angular.module('app.serverControl').controller('powerUsageController', [ - '$scope', '$window', 'APIUtils', '$route', '$q', - function($scope, $window, APIUtils, $route, $q) { + '$scope', '$window', 'APIUtils', '$route', '$q', 'ngToast', + function($scope, $window, APIUtils, $route, $q, ngToast) { $scope.power_consumption = ''; $scope.power_cap = {}; - $scope.set_power_cap_error = false; - $scope.set_power_cap_success = false; $scope.loading = false; loadPowerData(); @@ -49,11 +47,9 @@ window.angular && (function(angular) { } $scope.setPowerCap = function() { - $scope.set_power_cap_error = false; - $scope.set_power_cap_success = false; // The power cap value will be undefined if outside range if (!$scope.power_cap.PowerCap) { - $scope.set_power_cap_error = true; + ngToast.danger('Power cap value between 100 and 10,000 is required'); return; } $scope.loading = true; @@ -62,12 +58,17 @@ window.angular && (function(angular) { setPowerCapEnable(), ]; - $q.all(promises).finally(function() { - $scope.loading = false; - if (!$scope.set_power_cap_error) { - $scope.set_power_cap_success = true; - } - }); + $q.all(promises) + .then( + function() { + ngToast.success('Power cap settings saved'); + }, + function(errors) { + ngToast.danger('Power cap settings could not be saved'); + }) + .finally(function() { + $scope.loading = false; + }); }; $scope.refresh = function() { $route.reload(); @@ -78,8 +79,8 @@ window.angular && (function(angular) { .then( function(data) {}, function(error) { - $scope.set_power_cap_error = true; console.log(JSON.stringify(error)); + return $q.reject(); }); } @@ -88,8 +89,8 @@ window.angular && (function(angular) { .then( function(data) {}, function(error) { - $scope.set_power_cap_error = true; console.log(JSON.stringify(error)); + return $q.reject(); }); } } |