1 files changed, 8 insertions, 5 deletions
diff --git a/sdnr/wt/odlux/apps/performanceHistoryApp/src/components/crossPolarDiscrimination.tsx b/sdnr/wt/odlux/apps/performanceHistoryApp/src/components/crossPolarDiscrimination.tsx
index 8718171f7..267e00bbe 100644
--- a/sdnr/wt/odlux/apps/performanceHistoryApp/src/components/crossPolarDiscrimination.tsx
+++ b/sdnr/wt/odlux/apps/performanceHistoryApp/src/components/crossPolarDiscrimination.tsx
@@ -23,7 +23,7 @@ import { MaterialTable, ColumnType, MaterialTableCtorType, ColumnModel } from '.
 import { IApplicationStoreState } from '../../../../framework/src/store/applicationStore';
 import connect, { Connect, IDispatcher } from '../../../../framework/src/flux/connect';
 
-import { CrossPolarDiscriminationDataType } from '../models/crossPolarDiscriminationDataType';
+import { CrossPolarDiscriminationDataType, CrossPolarDiscriminationDatabaseDataType } from '../models/crossPolarDiscriminationDataType';
 import { IDataSet, IDataSetsObject } from '../models/chartTypes';
 import { createCrossPolarDiscriminationProperties, createCrossPolarDiscriminationActions } from '../handlers/crossPolarDiscriminationHandler';
 import { lineChart, sortDataByTimeStamp } from '../utils/chartUtils';
@@ -56,9 +56,9 @@ class CrossPolarDiscriminationComponent extends React.Component<CrossPolarDiscri
     const cpdColumns: ColumnModel<CrossPolarDiscriminationDataType>[] = [
       { 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 CrossPolarDiscriminationComponent extends React.Component<CrossPolarDiscri
     }];
 
     _rows.forEach(row => {
+      row.xpdMin = row.performanceData.xpdMin;
+      row.xpdAvg = row.performanceData.xpdAvg;
+      row.xpdMax = row.performanceData.xpdMax;
       datasets.forEach(ds => {
         ds.data.push({
-          x: row["utcTimeStamp" as keyof CrossPolarDiscriminationDataType] as string,
-          y: row[ds.name as keyof CrossPolarDiscriminationDataType] as string
+          x: row["timeStamp" as keyof CrossPolarDiscriminationDataType] as string,
+          y: row.performanceData[ds.name as keyof CrossPolarDiscriminationDatabaseDataType] as string
         });
       });
     });