[Fixed Position] Show limits in fixed position

Show limits in fixed position view, WTD-1223.
This commit is contained in:
Victor Woeltjen
2015-06-09 10:18:28 -07:00
parent 51852e1322
commit de3c6e4543
2 changed files with 31 additions and 25 deletions

View File

@@ -21,7 +21,6 @@
--> -->
<div <div
class="l-fixed-position-text l-telemetry" class="l-fixed-position-text l-telemetry"
ng-class="{ 's-stale': 1 }"
ng-style="{ background: ngModel.fill(), 'border-color': ngModel.stroke(), color: ngModel.color() }" ng-style="{ background: ngModel.fill(), 'border-color': ngModel.stroke(), color: ngModel.color() }"
> >
<div <div
@@ -37,7 +36,7 @@
<!-- ng-class is temporarily hard-coded in next element --> <!-- ng-class is temporarily hard-coded in next element -->
<span <span
class="l-value-bg s-value-bg" class="l-value-bg s-value-bg"
ng-class="{ 's-limit-upr-yellow': ngModel.value < 0 }" ng-class="ngModel.cssClass"
> >
{{ngModel.value}} {{ngModel.value}}
</span> </span>

View File

@@ -123,7 +123,13 @@ define(
// Update the displayed value for this object // Update the displayed value for this object
function updateValue(telemetryObject) { function updateValue(telemetryObject) {
var id = telemetryObject && telemetryObject.getId(); var id = telemetryObject && telemetryObject.getId(),
limit = telemetryObject &&
telemetryObject.getCapability('limit'),
datum = telemetryObject &&
subscription.getDatum(telemetryObject),
alarm = limit && datum && limit.evaluate(datum);
if (id) { if (id) {
(elementProxiesById[id] || []).forEach(function (element) { (elementProxiesById[id] || []).forEach(function (element) {
names[id] = telemetryObject.getModel().name; names[id] = telemetryObject.getModel().name;
@@ -132,6 +138,7 @@ define(
); );
element.name = names[id]; element.name = names[id];
element.value = values[id]; element.value = values[id];
element.cssClass = alarm && alarm.cssClass;
}); });
} }
} }