summaryrefslogtreecommitdiffstats
path: root/app/server-control
diff options
context:
space:
mode:
authorGunnar Mills <gmills@us.ibm.com>2018-06-21 13:16:54 -0500
committerEd Tanous <ed.tanous@intel.com>2018-08-24 20:12:36 +0000
commit52b8bde9998cb35eab9c1300d41168a56f4ed0d3 (patch)
tree252717821b7d6642e31b0f1ea27bee668a0dc396 /app/server-control
parent1073c1490fa98b7c90e6056a4e5797d4429b57e7 (diff)
downloadphosphor-webui-52b8bde9998cb35eab9c1300d41168a56f4ed0d3.tar.gz
phosphor-webui-52b8bde9998cb35eab9c1300d41168a56f4ed0d3.zip
Add Power Usage Page
Created a new page, "Manage Power Usage". This page is under the "Server control" tab. This new page currently just displays the power consumption. Future commits will allow the user to set the power cap from this page. One day, things like power consumption trending data could also be on this page. There was a blank unused controller which was for similar things, removed it. Tested: See the page and the consumption data. Uploaded screenshots to openbmc/openbmc#3221 Change-Id: I9f97c58a086f34c1c1990c03d5e05b081619bd5c Signed-off-by: Gunnar Mills <gmills@us.ibm.com>
Diffstat (limited to 'app/server-control')
-rw-r--r--app/server-control/controllers/power-usage-controller.html22
-rw-r--r--app/server-control/controllers/power-usage-controller.js41
-rw-r--r--app/server-control/index.js6
-rw-r--r--app/server-control/styles/index.scss1
-rw-r--r--app/server-control/styles/power-usage.scss25
5 files changed, 95 insertions, 0 deletions
diff --git a/app/server-control/controllers/power-usage-controller.html b/app/server-control/controllers/power-usage-controller.html
new file mode 100644
index 0000000..c35ea93
--- /dev/null
+++ b/app/server-control/controllers/power-usage-controller.html
@@ -0,0 +1,22 @@
+<loader loading="loading"></loader>
+<div id="power-usage">
+ <div class="row power__usage-metadata">
+ <div class="row column">
+ <h1>Manage Power Usage</h1>
+ </div>
+ <div class="page-header">
+ <h2 class="bold h4">Power information</h2>
+ </div>
+ <fieldset>
+ <div class="column large-8">
+ <ul class="power__usage-metadata-wrapper">
+ <li class="power__usage-metadata-block">
+ <p class="content-label">Power Consumption</p>
+ <p class="courier-bold">{{power_consumption}}</p>
+ </li>
+ </ul>
+ </div>
+ </fieldset>
+ </div>
+</div>
+
diff --git a/app/server-control/controllers/power-usage-controller.js b/app/server-control/controllers/power-usage-controller.js
new file mode 100644
index 0000000..5ba8bf0
--- /dev/null
+++ b/app/server-control/controllers/power-usage-controller.js
@@ -0,0 +1,41 @@
+/**
+ * Controller for power-usage
+ *
+ * @module app/serverControl
+ * @exports powerUsageController
+ * @name powerUsageController
+ */
+
+window.angular && (function(angular) {
+ 'use strict';
+
+ angular.module('app.serverControl').controller('powerUsageController', [
+ '$scope', '$window', 'APIUtils', 'dataService', '$q',
+ function($scope, $window, APIUtils, dataService, $q) {
+ $scope.dataService = dataService;
+ $scope.power_consumption = '';
+ $scope.loading = false;
+ loadPowerData();
+
+ function loadPowerData() {
+ $scope.loading = true;
+ var getPowerConsumptionPromise = APIUtils.getPowerConsumption().then(
+ function(data) {
+ $scope.power_consumption = data;
+ },
+ function(error) {
+ console.log(JSON.stringify(error));
+ });
+
+ var promises = [
+ getPowerConsumptionPromise,
+ ];
+
+ $q.all(promises).finally(function() {
+ $scope.loading = false;
+ });
+ }
+ }
+ ]);
+
+})(angular);
diff --git a/app/server-control/index.js b/app/server-control/index.js
index 3b3600f..1e6eaf1 100644
--- a/app/server-control/index.js
+++ b/app/server-control/index.js
@@ -31,6 +31,12 @@ window.angular && (function(angular) {
'controller': 'powerOperationsController',
authenticated: true
})
+ .when('/server-control/power-usage', {
+ 'template':
+ require('./controllers/power-usage-controller.html'),
+ 'controller': 'powerUsageController',
+ authenticated: true
+ })
.when('/server-control/remote-console', {
'template':
require('./controllers/remote-console-controller.html'),
diff --git a/app/server-control/styles/index.scss b/app/server-control/styles/index.scss
index cc69a87..f6b15ab 100644
--- a/app/server-control/styles/index.scss
+++ b/app/server-control/styles/index.scss
@@ -2,3 +2,4 @@
@import "./power-operations.scss";
@import "./remote-console.scss";
@import "./server-led.scss";
+@import "./power-usage.scss";
diff --git a/app/server-control/styles/power-usage.scss b/app/server-control/styles/power-usage.scss
new file mode 100644
index 0000000..4c956e2
--- /dev/null
+++ b/app/server-control/styles/power-usage.scss
@@ -0,0 +1,25 @@
+// Power Usage SCSS
+
+.power__usage-metadata {
+ border-bottom: 1px solid $medgrey;
+ padding: 1.8em 0 0 0;
+}
+
+.power__usage-metadata-wrapper {
+ margin: 0;
+ padding: 0;
+}
+
+.power__usage-metadata-block {
+ list-style-type: none;
+ min-width: 47%;
+ margin-bottom: 1.8em;
+ margin-right: .7em;
+ display: inline-block;
+ white-space: normal;
+ word-break: break-all;
+ @include mediaQuery(small) {
+ float: left;
+ }
+}
+
OpenPOWER on IntegriCloud