ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-06-20 16:10:23 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

[Limits] Show limits from scrolling list view

Browse Source 
WTD-1223.
This commit is contained in:
Victor Woeltjen
2015-06-08 11:57:05 -07:00
parent f4adc6a889
commit 4ab36bd421
5 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
platform/features/scrolling/res/templates/scrolling.html
View File

@ -38,8 +38,9 @@
</thead> </thead>
<tbody> <tbody>
<tr ng-repeat="row in rows"> <tr ng-repeat="row in rows">
<td ng-repeat="cell in row"> <td ng-repeat="cell in row"
{{cell}} ng-class="cell.cssClass">
{{cell.text}}
</td> </td>
</tr> </tr>
</tbody> </tbody>

8
platform/features/scrolling/src/DomainColumn.js
View File

@ -55,9 +55,11 @@ define(
* @returns {string} the text to display * @returns {string} the text to display
*/ */
getValue: function (domainObject, data, index) { getValue: function (domainObject, data, index) {
return telemetryFormatter.formatDomainValue( return {
data.getDomainValue(index, domainMetadata.key) text: telemetryFormatter.formatDomainValue(
); data.getDomainValue(index, domainMetadata.key)
)
};
} }
}; };
} }

4
platform/features/scrolling/src/NameColumn.js
View File

@ -50,7 +50,9 @@ define(
* @returns {string} the text to display * @returns {string} the text to display
*/ */
getValue: function (domainObject) { getValue: function (domainObject) {
return domainObject.getModel().name; return {
text: domainObject.getModel().name
};
} }
}; };
} }

8
platform/features/scrolling/src/RangeColumn.js
View File

@ -58,13 +58,11 @@ define(
var range = rangeMetadata.key, var range = rangeMetadata.key,
limit = domainObject.getCapability('limit'), limit = domainObject.getCapability('limit'),
value = data.getRangeValue(index, range), value = data.getRangeValue(index, range),
cell = telemetryFormatter.formatRangeValue(value); alarm = limit.evaluate(value, range);
return { return {
cssClass: limit && limit.evaluate(value, range), cssClass: alarm && alarm.cssClass,
toString: function () { text: telemetryFormatter.formatRangeValue(value)
return cell;
}
}; };
} }
}; };

2
platform/features/scrolling/src/ScrollingListPopulator.js
View File

@ -142,7 +142,7 @@ define(
// column object itself) // column object itself)
return values.map(function (value) { return values.map(function (value) {
return columns.map(function (column) { return columns.map(function (column) {
column.getValue( return column.getValue(
objects[value.objectIndex], objects[value.objectIndex],
datas[value.objectIndex], datas[value.objectIndex],
value.pointIndex value.pointIndex