From 52b8bde9998cb35eab9c1300d41168a56f4ed0d3 Mon Sep 17 00:00:00 2001
From: Gunnar Mills <gmills@us.ibm.com>
Date: Thu, 21 Jun 2018 13:16:54 -0500
Subject: 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>
---
 .../controllers/power-consumption-controller.html     |  5 -----
 .../controllers/power-consumption-controller.js       | 19 -------------------
 app/server-health/index.js                            |  6 ------
 app/server-health/styles/index.scss                   |  1 -
 app/server-health/styles/power-consumption.scss       |  0
 5 files changed, 31 deletions(-)
 delete mode 100644 app/server-health/controllers/power-consumption-controller.html
 delete mode 100644 app/server-health/controllers/power-consumption-controller.js
 delete mode 100644 app/server-health/styles/power-consumption.scss

(limited to 'app/server-health')

diff --git a/app/server-health/controllers/power-consumption-controller.html b/app/server-health/controllers/power-consumption-controller.html
deleted file mode 100644
index 7dfdf89..0000000
--- a/app/server-health/controllers/power-consumption-controller.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<div id="power-consumption">
-    <div class="row column">
-        <h1>Power consumption</h1>
-    </div>
-</div>
\ No newline at end of file
diff --git a/app/server-health/controllers/power-consumption-controller.js b/app/server-health/controllers/power-consumption-controller.js
deleted file mode 100644
index 51882e4..0000000
--- a/app/server-health/controllers/power-consumption-controller.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * Controller for server
- *
- * @module app/serverHealth
- * @exports powerConsumptionController
- * @name powerConsumptionController
- */
-
-window.angular && (function(angular) {
-  'use strict';
-
-  angular.module('app.serverHealth').controller('powerConsumptionController', [
-    '$scope', '$window', 'APIUtils', 'dataService',
-    function($scope, $window, APIUtils, dataService) {
-      $scope.dataService = dataService;
-    }
-  ]);
-
-})(angular);
diff --git a/app/server-health/index.js b/app/server-health/index.js
index e5eb9be..461e0bd 100644
--- a/app/server-health/index.js
+++ b/app/server-health/index.js
@@ -52,12 +52,6 @@ window.angular && (function(angular) {
                 'controller': 'sensorsController',
                 authenticated: true
               })
-              .when('/server-health/power-consumption', {
-                'template':
-                    require('./controllers/power-consumption-controller.html'),
-                'controller': 'powerConsumptionController',
-                authenticated: true
-              })
               .when('/server-health', {
                 'template': require('./controllers/log-controller.html'),
                 'controller': 'logController',
diff --git a/app/server-health/styles/index.scss b/app/server-health/styles/index.scss
index eeaabb2..009e991 100644
--- a/app/server-health/styles/index.scss
+++ b/app/server-health/styles/index.scss
@@ -1,4 +1,3 @@
 @import "./inventory.scss";
 @import "./log.scss";
 @import "./sensors.scss";
-@import "./power-consumption.scss";
diff --git a/app/server-health/styles/power-consumption.scss b/app/server-health/styles/power-consumption.scss
deleted file mode 100644
index e69de29..0000000
-- 
cgit v1.2.1