diff options
Diffstat (limited to 'sdnr/wt/odlux/apps/performanceHistoryApp/src/components/temperature.tsx')
-rw-r--r-- | sdnr/wt/odlux/apps/performanceHistoryApp/src/components/temperature.tsx | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/sdnr/wt/odlux/apps/performanceHistoryApp/src/components/temperature.tsx b/sdnr/wt/odlux/apps/performanceHistoryApp/src/components/temperature.tsx index f1e62cf33..256911c2d 100644 --- a/sdnr/wt/odlux/apps/performanceHistoryApp/src/components/temperature.tsx +++ b/sdnr/wt/odlux/apps/performanceHistoryApp/src/components/temperature.tsx @@ -23,7 +23,7 @@ import { MaterialTable, ColumnType, ColumnModel, MaterialTableCtorType } from '. import { IApplicationStoreState } from '../../../../framework/src/store/applicationStore'; import connect, { Connect, IDispatcher } from '../../../../framework/src/flux/connect'; -import { TemperatureDataType } from '../models/temperatureDataType'; +import { TemperatureDataType, TemperatureDatabaseDataType } from '../models/temperatureDataType'; import { IDataSet, IDataSetsObject } from '../models/chartTypes'; import { createTemperatureProperties, createTemperatureActions } from '../handlers/temperatureHandler'; import { lineChart, sortDataByTimeStamp } from '../utils/chartUtils'; @@ -55,9 +55,9 @@ class TemperatureComponent extends React.Component<TemperatureComponentProps>{ const temperatureColumns: ColumnModel<TemperatureDataType>[] = [ { property: "radioSignalId", title: "Radio signal", type: ColumnType.text }, { property: "scannerId", title: "Scanner ID", type: ColumnType.text }, - { property: "utcTimeStamp", title: "End Time", type: ColumnType.text, disableFilter: true }, + { property: "timeStamp", title: "End Time", type: ColumnType.text }, { - property: "suspectIntervalFlag", title: "Suspect Interval", type: ColumnType.custom, customControl: ({ rowData }) => { + property: "suspectIntervalFlag", title: "Suspect Interval", customControl: ({ rowData }) => { const suspectIntervalFlag = rowData["suspectIntervalFlag"].toString(); return <div >{suspectIntervalFlag} </div> } @@ -114,10 +114,13 @@ class TemperatureComponent extends React.Component<TemperatureComponentProps>{ }]; _rows.forEach(row => { + row.rfTempMin = row.performanceData.rfTempMin; + row.rfTempAvg = row.performanceData.rfTempAvg; + row.rfTempMax = row.performanceData.rfTempMax; datasets.forEach(ds => { ds.data.push({ - x: row["utcTimeStamp" as keyof TemperatureDataType] as string, - y: row[ds.name as keyof TemperatureDataType] as string + x: row["timeStamp" as keyof TemperatureDataType] as string, + y: row.performanceData[ds.name as keyof TemperatureDatabaseDataType] as string }); }); }); |