ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-06-21 08:39:59 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

[Timeline] Include units for utilizations

Browse Source
This commit is contained in:
Victor Woeltjen
2016-05-25 12:12:11 -07:00
parent 463f7ccf65
commit 23c71b7218
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
platform/features/timeline/bundle.js
View File

@ -557,8 +557,7 @@ define([
{ {
"key": "comms", "key": "comms",
"name": "Comms", "name": "Comms",
"units": "Kbps", "units": "Kbps"
"foo": "Kb"
}, },
{ {
"key": "battery", "key": "battery",

10
platform/features/timeline/src/actions/UtilizationColumn.js
View File

@ -34,6 +34,14 @@ define([], function () {
this.resource = resource; this.resource = resource;
} }
UtilizationColumn.prototype.getUnits = function () {
var instantaneousUnits = this.resource.units;
return {
"Kbps": "Kb",
"Watts": "joules",
}[instantaneousUnits] || "unknown units";
};
UtilizationColumn.prototype.name = function () { UtilizationColumn.prototype.name = function () {
return this.resource.name; return this.resource.name;
}; };
@ -57,7 +65,7 @@ define([], function () {
return utilizations.map(getCost).reduce(function (a, b) { return utilizations.map(getCost).reduce(function (a, b) {
return a + b; return a + b;
}, 0); }, 0) + " (" + this.getUnits() + ")";
} }
return !domainObject.hasCapability('utilization') ? return !domainObject.hasCapability('utilization') ?