diff options
| author | CamVan Nguyen <ctnguyen@us.ibm.com> | 2018-03-13 18:38:37 -0500 |
|---|---|---|
| committer | Gunnar Mills <gmills@us.ibm.com> | 2018-04-13 01:25:11 +0000 |
| commit | 3327583964a2b38bf2fd75f75d1d1f148f82f006 (patch) | |
| tree | 45d4413699cdc27b5b04c4c8a8ae3c2b106256fd /app/overview | |
| parent | a72686f76759faaefc76265f56b2dcc26c7c20de (diff) | |
| download | phosphor-webui-3327583964a2b38bf2fd75f75d1d1f148f82f006.tar.gz phosphor-webui-3327583964a2b38bf2fd75f75d1d1f148f82f006.zip | |
Display correct Power Consumption & Cap values
Current values are hard coded to '000 W'.
This fix is to do REST calls and display the correct values.
Resolves openbmc/openbmc#2735
Change-Id: I2f6766f1685a2bd52da62cda19998794f80270ec
Signed-off-by: CamVan Nguyen <ctnguyen@us.ibm.com>
Diffstat (limited to 'app/overview')
| -rw-r--r-- | app/overview/controllers/system-overview-controller.html | 4 | ||||
| -rw-r--r-- | app/overview/controllers/system-overview-controller.js | 16 |
2 files changed, 17 insertions, 3 deletions
diff --git a/app/overview/controllers/system-overview-controller.html b/app/overview/controllers/system-overview-controller.html index 094fac0..346e6e1 100644 --- a/app/overview/controllers/system-overview-controller.html +++ b/app/overview/controllers/system-overview-controller.html @@ -67,11 +67,11 @@ <ul class="overview__metadata-wrapper"> <li class="overview__metadata-block"> <p class="content-label">Power Consumption</p> - <p class="courier-bold">000 W</p> + <p class="courier-bold">{{power_consumption}}</p> </li> <li class="overview__metadata-block"> <p class="content-label">Power Cap</p> - <p class="courier-bold">000 W</p> + <p class="courier-bold">{{power_cap}}</p> </li> </ul> </div> diff --git a/app/overview/controllers/system-overview-controller.js b/app/overview/controllers/system-overview-controller.js index 2382a2a..af70d15 100644 --- a/app/overview/controllers/system-overview-controller.js +++ b/app/overview/controllers/system-overview-controller.js @@ -28,6 +28,8 @@ window.angular && (function (angular) { $scope.bmc_info = {}; $scope.bmc_firmware = ""; $scope.server_firmware = ""; + $scope.power_consumption = ""; + $scope.power_cap = ""; $scope.loading = false; loadOverviewData(); @@ -38,7 +40,9 @@ window.angular && (function (angular) { firmware: APIUtils.getFirmwares(), led: APIUtils.getLEDState(), ethernet: APIUtils.getBMCEthernetInfo(), - bmc_info: APIUtils.getBMCInfo() + bmc_info: APIUtils.getBMCInfo(), + power_consumption: APIUtils.getPowerConsumption(), + power_cap: APIUtils.getPowerCap(), }; $q.all(promises) .then(function(data){ @@ -51,6 +55,8 @@ window.angular && (function (angular) { $scope.displayLEDState(data.led); $scope.displayBMCEthernetInfo(data.ethernet); $scope.displayBMCInfo(data.bmc_info); + $scope.displayPowerConsumption(data.power_consumption); + $scope.displayPowerCap(data.power_cap); }) .finally(function(){ $scope.loading = false; @@ -92,6 +98,14 @@ window.angular && (function (angular) { }); } + $scope.displayPowerConsumption = function(data){ + $scope.power_consumption = data; + } + + $scope.displayPowerCap = function(data){ + $scope.power_cap = data; + } + var refreshDataListener = $rootScope.$on('refresh-data', function(event, args) { loadOverviewData(); }); |
