Merge "YANG Model update for A1 Adapter"

[ccsdk/features.git] / sdnr / wt / odlux / apps / performanceHistoryApp / src / components / transmissionPower.tsx

diff --git a/sdnr/wt/odlux/apps/performanceHistoryApp/src/components/transmissionPower.tsx b/sdnr/wt/odlux/apps/performanceHistoryApp/src/components/transmissionPower.tsx
index 8ec4561..635cbf1 100644 (file)
--- a/sdnr/wt/odlux/apps/performanceHistoryApp/src/components/transmissionPower.tsx
+++ b/sdnr/wt/odlux/apps/performanceHistoryApp/src/components/transmissionPower.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 { TransmissionPowerDataType } from '../models/transmissionPowerDataType';
+import { TransmissionPowerDataType, TransmissionPowerDatabaseDataType } from '../models/transmissionPowerDataType';
 import { IDataSet, IDataSetsObject } from '../models/chartTypes';
 import { createTransmissionPowerProperties, createTransmissionPowerActions } from '../handlers/transmissionPowerHandler';
 import { lineChart, sortDataByTimeStamp } from '../utils/chartUtils';
@@ -56,9 +56,9 @@ class TransmissionPowerComponent extends React.Component<TransmissionPowerCompon
     const transmissionColumns: ColumnModel<TransmissionPowerDataType>[] = [
       { 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>
         }
@@ -116,10 +116,13 @@ class TransmissionPowerComponent extends React.Component<TransmissionPowerCompon
     }];
 
     _rows.forEach(row => {
+      row.txLevelMin = row.performanceData.txLevelMin;
+      row.txLevelAvg = row.performanceData.txLevelAvg;
+      row.txLevelMax = row.performanceData.txLevelMax;
       datasets.forEach(ds => {
         ds.data.push({
-          x: row["utcTimeStamp" as keyof TransmissionPowerDataType] as string,
-          y: row[ds.name as keyof TransmissionPowerDataType] as string
+          x: row["timeStamp" as keyof TransmissionPowerDataType] as string,
+          y: row.performanceData[ds.name as keyof TransmissionPowerDatabaseDataType] as string
         });
       });
     });