1 files changed, 89 insertions, 43 deletions
diff --git a/sdnr/wt/odlux/apps/performanceHistoryApp/src/components/crossPolarDiscrimination.tsx b/sdnr/wt/odlux/apps/performanceHistoryApp/src/components/crossPolarDiscrimination.tsx
index bbed8abfe..42e3f93a6 100644
--- a/sdnr/wt/odlux/apps/performanceHistoryApp/src/components/crossPolarDiscrimination.tsx
+++ b/sdnr/wt/odlux/apps/performanceHistoryApp/src/components/crossPolarDiscrimination.tsx
@@ -2,23 +2,25 @@ import * as React from 'react';
 
 import { withRouter, RouteComponentProps } from 'react-router-dom';
 
-import { MaterialTable, ColumnType, MaterialTableCtorType } from '../../../../framework/src/components/material-table';
+import { MaterialTable, ColumnType, MaterialTableCtorType, ColumnModel } from '../../../../framework/src/components/material-table';
 import { IApplicationStoreState } from '../../../../framework/src/store/applicationStore';
 import connect, { Connect, IDispatcher } from '../../../../framework/src/flux/connect';
 
 import { CrossPolarDiscriminationDataType } from '../models/crossPolarDiscriminationDataType';
-import { createCrossPolarDiscrimination15minProperties, createCrossPolarDiscrimination15minActions, crossPolarDiscrimination15minReloadAction } from '../handlers/crossPolarDiscrimination15minHandler';
-import { createCrossPolarDiscrimination24hoursProperties, createCrossPolarDiscrimination24hoursActions, crossPolarDiscrimination24hoursReloadAction } from '../handlers/crossPolarDiscrimination24hoursHandler';
-
+import { IDataSet, IDataSetsObject } from '../models/chartTypes';
+import { createCrossPolarDiscrimination15minProperties, createCrossPolarDiscrimination15minActions } from '../handlers/crossPolarDiscrimination15minHandler';
+import { createCrossPolarDiscrimination24hoursProperties, createCrossPolarDiscrimination24hoursActions } from '../handlers/crossPolarDiscrimination24hoursHandler';
+import { lineChart, sortDataByTimeStamp } from '../utils/chartUtils';
+import { addColumnLabels } from '../utils/tableUtils';
 
 const mapProps = (state: IApplicationStoreState) => ({
   crossPolarDiscrimination15minProperties: createCrossPolarDiscrimination15minProperties(state),
-  crossPolarDiscrimination24hoursProperties: createCrossPolarDiscrimination24hoursProperties(state),
+  crossPolarDiscrimination24hoursProperties: createCrossPolarDiscrimination24hoursProperties(state)
 });
 
 const mapDisp = (dispatcher: IDispatcher) => ({
   crossPolarDiscrimination15minActions: createCrossPolarDiscrimination15minActions(dispatcher.dispatch),
-  crossPolarDiscrimination24hoursActions: createCrossPolarDiscrimination24hoursActions(dispatcher.dispatch),
+  crossPolarDiscrimination24hoursActions: createCrossPolarDiscrimination24hoursActions(dispatcher.dispatch)
 });
 
 type CrossPolarDiscriminationComponentProps = RouteComponentProps & Connect<typeof mapProps, typeof mapDisp> & {
@@ -32,43 +34,87 @@ const CrossPolarDiscriminationTable = MaterialTable as MaterialTableCtorType<Cro
  */
 class CrossPolarDiscriminationComponent extends React.Component<CrossPolarDiscriminationComponentProps>{
   render(): JSX.Element {
-    if (this.props.selectedTimePeriod == "15min") {
-      return (
-        <CrossPolarDiscriminationTable idProperty={"_id"} columns={[
-          { property: "radio-signal-id", title: "Radio signal", type: ColumnType.text },
-          { property: "scanner-id", title: "Scanner ID", type: ColumnType.text },
-          { property: "time-stamp", title: "End Time", type: ColumnType.text, disableFilter: true },
-          {
-            property: "suspect-interval-flag", title: "Suspect Interval", type: ColumnType.custom, customControl: ({ rowData }) => {
-              const suspectIntervalFlag = rowData["suspect-interval-flag"].toString();
-              return <div >{suspectIntervalFlag} </div>
-            }
-          },
-          { property: "xpd-min", title: "CPD (min)[db]", type: ColumnType.text, disableFilter: true, disableSorting: true },
-          { property: "xpd-avg", title: "CPD (avg)[db]", type: ColumnType.text, disableFilter: true, disableSorting: true },
-          { property: "xpd-max", title: "CPD (max)[db]", type: ColumnType.text, disableFilter: true, disableSorting: true },
-        ]} {...this.props.crossPolarDiscrimination15minProperties} {...this.props.crossPolarDiscrimination15minActions} />
-      );
-    } else {
-      return (
-        <CrossPolarDiscriminationTable idProperty={"_id"} columns={[
-          { property: "radio-signal-id", title: "Radio signal", type: ColumnType.text },
-          { property: "scanner-id", title: "Scanner ID", type: ColumnType.text },
-          { property: "time-stamp", title: "End Time", type: ColumnType.text, disableFilter: true },
-          {
-            property: "suspect-interval-flag", title: "Suspect Interval", type: ColumnType.custom, customControl: ({ rowData }) => {
-              const suspectIntervalFlag = rowData["suspect-interval-flag"].toString();
-              return <div >{suspectIntervalFlag} </div>
-            }
-          },
-          { property: "xpd-min", title: "CPD (min)[db]", type: ColumnType.text, disableFilter: true, disableSorting: true },
-          { property: "xpd-avg", title: "CPD (avg)[db]", type: ColumnType.text, disableFilter: true, disableSorting: true },
-          { property: "xpd-max", title: "CPD (max)[db]", type: ColumnType.text, disableFilter: true, disableSorting: true },
-        ]} {...this.props.crossPolarDiscrimination24hoursProperties} {...this.props.crossPolarDiscrimination24hoursActions} />
-      );
-    }
+    const properties = this.props.selectedTimePeriod === "15min"
+      ? this.props.crossPolarDiscrimination15minProperties
+      : this.props.crossPolarDiscrimination24hoursProperties;
+    const actions = this.props.selectedTimePeriod === "15min"
+      ? this.props.crossPolarDiscrimination15minActions
+      : this.props.crossPolarDiscrimination24hoursActions;
+
+    const chartPagedData = this.getChartDataValues(properties.rows);
+
+    const cpdColumns: ColumnModel<CrossPolarDiscriminationDataType>[] = [
+      { property: "radio-signal-id", title: "Radio signal", type: ColumnType.text },
+      { property: "scanner-id", title: "Scanner ID", type: ColumnType.text },
+      { property: "time-stamp", title: "End Time", type: ColumnType.text, disableFilter: true },
+      {
+        property: "suspect-interval-flag", title: "Suspect Interval", type: ColumnType.custom, customControl: ({ rowData }) => {
+          const suspectIntervalFlag = rowData["suspect-interval-flag"].toString();
+          return <div >{suspectIntervalFlag} </div>
+        }
+      }
+    ];
+    
+    chartPagedData.datasets.forEach(ds => {
+      cpdColumns.push(addColumnLabels<CrossPolarDiscriminationDataType>(ds.name, ds.columnLabel));
+    });
+    return (
+      <>
+        {lineChart(chartPagedData)}
+        <CrossPolarDiscriminationTable idProperty={"_id"} columns={cpdColumns} {...properties} {...actions} />
+      </>
+    );
   };
-}
 
-export const CrossPolarDiscrimination = withRouter(connect(mapProps, mapDisp)(CrossPolarDiscriminationComponent));
+  /**
+   * This function gets the performance values for CPD according on the chartjs dataset structure 
+   * which is to be sent to the chart.
+   */
+  private getChartDataValues = (rows: CrossPolarDiscriminationDataType[]): IDataSetsObject => {
+    const _rows = [...rows];
+    sortDataByTimeStamp(_rows);
+
+    const datasets: IDataSet[] = [{
+      name: "xpd-min",
+      label: "xpd-min",
+      borderColor: '#0e17f3de',
+      bezierCurve: false,
+      lineTension: 0,
+      fill: false,
+      data: [],
+      columnLabel: "CPD (min)[db]"
+    }, {
+      name: "xpd-avg",
+      label: "xpd-avg",
+      borderColor: '#08edb6de',
+      bezierCurve: false,
+      lineTension: 0,
+      fill: false,
+      data: [],
+      columnLabel: "CPD (avg)[db]"
+    }, {
+      name: "xpd-max",
+      label: "xpd-max",
+      borderColor: '#b308edde',
+      bezierCurve: false,
+      lineTension: 0,
+      fill: false,
+      data: [],
+      columnLabel: "CPD (max)[db]"
+    }];
+
+    _rows.forEach(row => {
+      datasets.forEach(ds => {
+        ds.data.push({
+          x: row["time-stamp"],
+          y: row[ds.name as keyof CrossPolarDiscriminationDataType] as string
+        });
+      });
+    });
+    return {
+      datasets: datasets
+    };
+  }
+}
+const CrossPolarDiscrimination = withRouter(connect(mapProps, mapDisp)(CrossPolarDiscriminationComponent));
 export default CrossPolarDiscrimination;