mirror of
https://github.com/nasa/openmct.git
synced 2024-12-22 14:32:22 +00:00
Fixed issue with non-named columns
This commit is contained in:
parent
b63b7b1e5d
commit
f653362247
@ -60,10 +60,10 @@ define(
|
|||||||
|
|
||||||
metadata.forEach(function (metadatum) {
|
metadata.forEach(function (metadatum) {
|
||||||
//Push domains first
|
//Push domains first
|
||||||
metadatum.domains.forEach(function (domainMetadata) {
|
(metadatum.domains || []).forEach(function (domainMetadata) {
|
||||||
self.addColumn(new DomainColumn(domainMetadata, self.telemetryFormatter));
|
self.addColumn(new DomainColumn(domainMetadata, self.telemetryFormatter));
|
||||||
});
|
});
|
||||||
metadatum.ranges.forEach(function (rangeMetadata) {
|
(metadatum.ranges || []).forEach(function (rangeMetadata) {
|
||||||
self.addColumn(new RangeColumn(rangeMetadata, self.telemetryFormatter));
|
self.addColumn(new RangeColumn(rangeMetadata, self.telemetryFormatter));
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
@ -100,8 +100,8 @@ define(
|
|||||||
*/
|
*/
|
||||||
TableConfiguration.prototype.getHeaders = function() {
|
TableConfiguration.prototype.getHeaders = function() {
|
||||||
var self = this;
|
var self = this;
|
||||||
return this.columns.map(function (column){
|
return this.columns.map(function (column, i){
|
||||||
return self.getColumnTitle(column);
|
return self.getColumnTitle(column) || 'Column ' + (i + 1);
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -115,8 +115,8 @@ define(
|
|||||||
*/
|
*/
|
||||||
TableConfiguration.prototype.getRowValues = function(telemetryObject, datum) {
|
TableConfiguration.prototype.getRowValues = function(telemetryObject, datum) {
|
||||||
var self = this;
|
var self = this;
|
||||||
return this.columns.reduce(function(rowObject, column){
|
return this.columns.reduce(function(rowObject, column, i){
|
||||||
var columnTitle = self.getColumnTitle(column),
|
var columnTitle = self.getColumnTitle(column) || 'Column ' + (i + 1),
|
||||||
columnValue = column.getValue(telemetryObject, datum);
|
columnValue = column.getValue(telemetryObject, datum);
|
||||||
|
|
||||||
if (columnValue !== undefined && columnValue.text === undefined){
|
if (columnValue !== undefined && columnValue.text === undefined){
|
||||||
|
Loading…
Reference in New Issue
Block a user