1 files changed, 9 insertions, 5 deletions
diff --git a/sdnr/wt/odlux/apps/performanceHistoryApp/src/components/performanceData.tsx b/sdnr/wt/odlux/apps/performanceHistoryApp/src/components/performanceData.tsx
index fc44879dc..c58c49c9e 100644
--- a/sdnr/wt/odlux/apps/performanceHistoryApp/src/components/performanceData.tsx
+++ b/sdnr/wt/odlux/apps/performanceHistoryApp/src/components/performanceData.tsx
@@ -22,7 +22,7 @@ import { withRouter, RouteComponentProps } from 'react-router-dom';
 import { MaterialTable, ColumnType, ColumnModel, MaterialTableCtorType } from '../../../../framework/src/components/material-table';
 import { IApplicationStoreState } from '../../../../framework/src/store/applicationStore';
 import connect, { Connect, IDispatcher } from '../../../../framework/src/flux/connect';
-import { PerformanceDataType } from '../models/performanceDataType';
+import { PerformanceDataType, PerformanceDatabaseDataType } from '../models/performanceDataType';
 import { IDataSet, IDataSetsObject } from '../models/chartTypes';
 import { createPerformanceDataProperties, createPerformanceDataActions } from '../handlers/performanceDataHandler';
 import { lineChart, sortDataByTimeStamp } from '../utils/chartUtils';
@@ -54,9 +54,9 @@ class PerformanceDataComponent extends React.Component<PerformanceDataComponentP
     const performanceColumns: ColumnModel<PerformanceDataType>[] = [
       { 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>
         }
@@ -112,13 +112,17 @@ class PerformanceDataComponent extends React.Component<PerformanceDataComponentP
     }];
 
     _rows.forEach(row => {
+      row.es = row.performanceData.es;
+      row.ses = row.performanceData.ses;
+      row.unavailability = row.performanceData.unavailability;
       datasets.forEach(ds => {
         ds.data.push({
-          x: row["utcTimeStamp" as keyof PerformanceDataType] as string,
-          y: row[ds.name as keyof PerformanceDataType] as string
+          x: row["timeStamp" as keyof PerformanceDataType] as string,
+          y: row.performanceData[ds.name as keyof PerformanceDatabaseDataType] as string
         });
       });
     });
+
     return {
       datasets: datasets
     };