Minor functional fixes in odlux apps

Minor functional fixes in odlux apps

Issue-ID: SDNC-845
Signed-off-by: sai-neetha <sai-neetha.phulmali@highstreet-technologies.com>
Change-Id: I8e64e7c67a21798832ad1a36441b08a070452034
Signed-off-by: sai-neetha <sai-neetha.phulmali@highstreet-technologies.com>

7 files changed, 251 insertions, 183 deletions

diff --git a/sdnr/wt/odlux/apps/performanceHistoryApp/src/components/adaptiveModulation.tsx b/sdnr/wt/odlux/apps/performanceHistoryApp/src/components/adaptiveModulation.tsx
index 281ee2f8d..2564d574a 100644
--- a/sdnr/wt/odlux/apps/performanceHistoryApp/src/components/adaptiveModulation.tsx
+++ b/sdnr/wt/odlux/apps/performanceHistoryApp/src/components/adaptiveModulation.tsx
@@ -1,3 +1,20 @@
+/**
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt odlux
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH Intellectual Property. All rights reserved.
+ * =================================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ * ============LICENSE_END==========================================================================
+ */
 import * as React from 'react';
 
 import { withRouter, RouteComponentProps } from 'react-router-dom';
@@ -8,19 +25,16 @@ import connect, { Connect, IDispatcher } from '../../../../framework/src/flux/co
 
 import { AdaptiveModulationDataType } from '../models/adaptiveModulationDataType';
 import { IDataSet, IDataSetsObject } from '../models/chartTypes';
-import { createAdaptiveModulation15minProperties, createAdaptiveModulation15minActions } from '../handlers/adaptiveModulation15minHandler';
-import { createAdaptiveModulation24hoursProperties, createAdaptiveModulation24hoursActions } from '../handlers/adaptiveModulation24hoursHandler';
+import { createAdaptiveModulationProperties, createAdaptiveModulationActions } from '../handlers/adaptiveModulationHandler';
 import { lineChart, sortDataByTimeStamp } from '../utils/chartUtils';
 import { addColumnLabels } from '../utils/tableUtils';
 
 const mapProps = (state: IApplicationStoreState) => ({
-  adaptiveModulation15minProperties: createAdaptiveModulation15minProperties(state),
-  adaptiveModulation24hoursProperties: createAdaptiveModulation24hoursProperties(state)
+  adaptiveModulationProperties: createAdaptiveModulationProperties(state),
 });
 
 const mapDisp = (dispatcher: IDispatcher) => ({
-  adaptiveModulation15minActions: createAdaptiveModulation15minActions(dispatcher.dispatch),
-  adaptiveModulation24hoursActions: createAdaptiveModulation24hoursActions(dispatcher.dispatch)
+  adaptiveModulationActions: createAdaptiveModulationActions(dispatcher.dispatch),
 });
 
 type AdaptiveModulationComponentProps = RouteComponentProps & Connect<typeof mapProps, typeof mapDisp> & {
@@ -34,22 +48,17 @@ const AdaptiveModulationTable = MaterialTable as MaterialTableCtorType<AdaptiveM
  */
 class AdaptiveModulationComponent extends React.Component<AdaptiveModulationComponentProps>{
   render(): JSX.Element {
-    const properties = this.props.selectedTimePeriod === "15min"
-      ? this.props.adaptiveModulation15minProperties
-      : this.props.adaptiveModulation24hoursProperties;
-
-    const actions = this.props.selectedTimePeriod === "15min"
-      ? this.props.adaptiveModulation15minActions
-      : this.props.adaptiveModulation24hoursActions;
+    const properties = this.props.adaptiveModulationProperties;
+    const actions = this.props.adaptiveModulationActions;
 
     const chartPagedData = this.getChartDataValues(properties.rows);
     const adaptiveModulationColumns: ColumnModel<AdaptiveModulationDataType>[] = [
-      { 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: "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: "suspect-interval-flag", title: "Suspect Interval", type: ColumnType.custom, customControl: ({ rowData }) => {
-          const suspectIntervalFlag = rowData["suspect-interval-flag"].toString();
+        property: "suspectIntervalFlag", title: "Suspect Interval", type: ColumnType.custom, customControl: ({ rowData }) => {
+          const suspectIntervalFlag = rowData["suspectIntervalFlag"].toString();
           return <div >{suspectIntervalFlag} </div>
         }
       }];
@@ -76,7 +85,7 @@ class AdaptiveModulationComponent extends React.Component<AdaptiveModulationComp
     sortDataByTimeStamp(_rows);
 
     const datasets: IDataSet[] = [{
-      name: "time2-states-s",
+      name: "time2StatesS",
       label: "QAM2S",
       borderColor: '#62a309fc',
       bezierCurve: false,
@@ -85,7 +94,7 @@ class AdaptiveModulationComponent extends React.Component<AdaptiveModulationComp
       data: [],
       columnLabel: "QAM2S",
     }, {
-      name: "time2-states",
+      name: "time2States",
       label: "QAM2",
       borderColor: '#62a309fc',
       bezierCurve: false,
@@ -94,7 +103,7 @@ class AdaptiveModulationComponent extends React.Component<AdaptiveModulationComp
       data: [],
       columnLabel: "QAM2",
     }, {
-      name: "time2-states-l",
+      name: "time2StatesL",
       label: "QAM2L",
       borderColor: '#62a309fc',
       bezierCurve: false,
@@ -103,7 +112,7 @@ class AdaptiveModulationComponent extends React.Component<AdaptiveModulationComp
       data: [],
       columnLabel: "QAM2L",
     }, {
-      name: "time4-states-s",
+      name: "time4StatesS",
       label: "QAM4S",
       borderColor: '#b308edde',
       bezierCurve: false,
@@ -112,7 +121,7 @@ class AdaptiveModulationComponent extends React.Component<AdaptiveModulationComp
       data: [],
       columnLabel: "QAM4S",
     }, {
-      name: "time4-states",
+      name: "time4States",
       label: "QAM4",
       borderColor: '#b308edde',
       bezierCurve: false,
@@ -121,7 +130,7 @@ class AdaptiveModulationComponent extends React.Component<AdaptiveModulationComp
       data: [],
       columnLabel: "QAM4",
     }, {
-      name: "time4-states-l",
+      name: "time4StatesL",
       label: "QAM4L",
       borderColor: '#b308edde',
       bezierCurve: false,
@@ -130,7 +139,7 @@ class AdaptiveModulationComponent extends React.Component<AdaptiveModulationComp
       data: [],
       columnLabel: "QAM4L",
     }, {
-      name: "time16-states-s",
+      name: "time16StatesS",
       label: "QAM16S",
       borderColor: '#9b15e2',
       bezierCurve: false,
@@ -139,7 +148,7 @@ class AdaptiveModulationComponent extends React.Component<AdaptiveModulationComp
       data: [],
       columnLabel: "QAM16S",
     }, {
-      name: "time16-states",
+      name: "time16States",
       label: "QAM16",
       borderColor: '#9b15e2',
       bezierCurve: false,
@@ -148,7 +157,7 @@ class AdaptiveModulationComponent extends React.Component<AdaptiveModulationComp
       data: [],
       columnLabel: "QAM16",
     }, {
-      name: "time16-states-l",
+      name: "time16StatesL",
       label: "QAM16L",
       borderColor: '#9b15e2',
       bezierCurve: false,
@@ -157,7 +166,7 @@ class AdaptiveModulationComponent extends React.Component<AdaptiveModulationComp
       data: [],
       columnLabel: "QAM16L",
     }, {
-      name: "time32-states-s",
+      name: "time32StatesS",
       label: "QAM32S",
       borderColor: '#2704f5f0',
       bezierCurve: false,
@@ -166,7 +175,7 @@ class AdaptiveModulationComponent extends React.Component<AdaptiveModulationComp
       data: [],
       columnLabel: "QAM32S",
     }, {
-      name: "time32-states",
+      name: "time32States",
       label: "QAM32",
       borderColor: '#2704f5f0',
       bezierCurve: false,
@@ -175,7 +184,7 @@ class AdaptiveModulationComponent extends React.Component<AdaptiveModulationComp
       data: [],
       columnLabel: "QAM32",
     }, {
-      name: "time32-states-l",
+      name: "time32StatesL",
       label: "QAM32L",
       borderColor: '#2704f5f0',
       bezierCurve: false,
@@ -184,7 +193,7 @@ class AdaptiveModulationComponent extends React.Component<AdaptiveModulationComp
       data: [],
       columnLabel: "QAM32L",
     }, {
-      name: "time64-states-s",
+      name: "time64StatesS",
       label: "QAM64S",
       borderColor: '#347692',
       bezierCurve: false,
@@ -193,7 +202,7 @@ class AdaptiveModulationComponent extends React.Component<AdaptiveModulationComp
       data: [],
       columnLabel: "QAM64S",
     }, {
-      name: "time64-states",
+      name: "time64States",
       label: "QAM64",
       borderColor: '#347692',
       bezierCurve: false,
@@ -202,7 +211,7 @@ class AdaptiveModulationComponent extends React.Component<AdaptiveModulationComp
       data: [],
       columnLabel: "QAM64",
     }, {
-      name: "time64-states-l",
+      name: "time64StatesL",
       label: "QAM64L",
       borderColor: '#347692',
       bezierCurve: false,
@@ -211,7 +220,7 @@ class AdaptiveModulationComponent extends React.Component<AdaptiveModulationComp
       data: [],
       columnLabel: "QAM64L",
     }, {
-      name: "time128-states-s",
+      name: "time128StatesS",
       label: "QAM128S",
       borderColor: '#885e22',
       bezierCurve: false,
@@ -220,7 +229,7 @@ class AdaptiveModulationComponent extends React.Component<AdaptiveModulationComp
       data: [],
       columnLabel: "QAM128S",
     }, {
-      name: "time128-states",
+      name: "time128States",
       label: "QAM128",
       borderColor: '#885e22',
       bezierCurve: false,
@@ -229,7 +238,7 @@ class AdaptiveModulationComponent extends React.Component<AdaptiveModulationComp
       data: [],
       columnLabel: "QAM128",
     }, {
-      name: "time128-states-l",
+      name: "time128StatesL",
       label: "QAM128L",
       borderColor: '#885e22',
       bezierCurve: false,
@@ -238,7 +247,7 @@ class AdaptiveModulationComponent extends React.Component<AdaptiveModulationComp
       data: [],
       columnLabel: "QAM128L",
     }, {
-      name: "time256-states-s",
+      name: "time256StatesS",
       label: "QAM256S",
       borderColor: '#de07807a',
       bezierCurve: false,
@@ -247,7 +256,7 @@ class AdaptiveModulationComponent extends React.Component<AdaptiveModulationComp
       data: [],
       columnLabel: "QAM256S",
     }, {
-      name: "time256-states",
+      name: "time256States",
       label: "QAM256",
       borderColor: '#de07807a',
       bezierCurve: false,
@@ -256,7 +265,7 @@ class AdaptiveModulationComponent extends React.Component<AdaptiveModulationComp
       data: [],
       columnLabel: "QAM256",
     }, {
-      name: "time256-states-l",
+      name: "time256StatesL",
       label: "QAM256L",
       borderColor: '#de07807a',
       bezierCurve: false,
@@ -265,7 +274,7 @@ class AdaptiveModulationComponent extends React.Component<AdaptiveModulationComp
       data: [],
       columnLabel: "QAM256L",
     }, {
-      name: "time512-states-s",
+      name: "time512StatesS",
       label: "QAM512S",
       borderColor: '#8fdaacde',
       bezierCurve: false,
@@ -274,7 +283,7 @@ class AdaptiveModulationComponent extends React.Component<AdaptiveModulationComp
       data: [],
       columnLabel: "QAM512S",
     }, {
-      name: "time512-states",
+      name: "time512States",
       label: "QAM512",
       borderColor: '#8fdaacde',
       bezierCurve: false,
@@ -284,7 +293,7 @@ class AdaptiveModulationComponent extends React.Component<AdaptiveModulationComp
       columnLabel: "QAM512",
     }, {
 
-      name: "time512-states-l",
+      name: "time512StatesL",
       label: "QAM512L",
       borderColor: '#8fdaacde',
       bezierCurve: false,
@@ -294,7 +303,7 @@ class AdaptiveModulationComponent extends React.Component<AdaptiveModulationComp
       columnLabel: "QAM512L",
     }, {
 
-      name: "time1024-states-s",
+      name: "time1024StatesS",
       label: "QAM1024S",
       borderColor: '#435b22',
       bezierCurve: false,
@@ -304,7 +313,7 @@ class AdaptiveModulationComponent extends React.Component<AdaptiveModulationComp
       columnLabel: "QAM1024S",
     }, {
 
-      name: "time1024-states",
+      name: "time1024States",
       label: "QAM1024",
       borderColor: '#435b22',
       bezierCurve: false,
@@ -314,7 +323,7 @@ class AdaptiveModulationComponent extends React.Component<AdaptiveModulationComp
       columnLabel: "QAM1024",
     }, {
 
-      name: "time1024-states-l",
+      name: "time1024StatesL",
       label: "QAM1024L",
       borderColor: '#435b22',
       bezierCurve: false,
@@ -323,7 +332,7 @@ class AdaptiveModulationComponent extends React.Component<AdaptiveModulationComp
       data: [],
       columnLabel: "QAM1024L",
     }, {
-      name: "time2048-states-s",
+      name: "time2048StatesS",
       label: "QAM2048S",
       borderColor: '#e87a5b',
       bezierCurve: false,
@@ -332,7 +341,7 @@ class AdaptiveModulationComponent extends React.Component<AdaptiveModulationComp
       data: [],
       columnLabel: "QAM2048S",
     }, {
-      name: "time2048-states",
+      name: "time2048States",
       label: "QAM2048",
       borderColor: '#e87a5b',
       bezierCurve: false,
@@ -341,7 +350,7 @@ class AdaptiveModulationComponent extends React.Component<AdaptiveModulationComp
       data: [],
       columnLabel: "QAM2048",
     }, {
-      name: "time2048-states-l",
+      name: "time2048StatesL",
       label: "QAM2048L",
       borderColor: '#e87a5b',
       bezierCurve: false,
@@ -350,7 +359,7 @@ class AdaptiveModulationComponent extends React.Component<AdaptiveModulationComp
       data: [],
       columnLabel: "QAM2048L",
     }, {
-      name: "time4096-states-s",
+      name: "time4096StatesS",
       label: "QAM4096S",
       borderColor: '#5be878',
       bezierCurve: false,
@@ -359,7 +368,7 @@ class AdaptiveModulationComponent extends React.Component<AdaptiveModulationComp
       data: [],
       columnLabel: "QAM4096S",
     }, {
-      name: "time4096-states",
+      name: "time4096States",
       label: "QAM4096",
       borderColor: '#5be878',
       bezierCurve: false,
@@ -368,7 +377,7 @@ class AdaptiveModulationComponent extends React.Component<AdaptiveModulationComp
       data: [],
       columnLabel: "QAM4096",
     }, {
-      name: "time4096-states-l",
+      name: "time4096StatesL",
       label: "QAM4096L",
       borderColor: '#5be878',
       bezierCurve: false,
@@ -377,7 +386,7 @@ class AdaptiveModulationComponent extends React.Component<AdaptiveModulationComp
       data: [],
       columnLabel: "QAM4096L",
     }, {
-      name: "time8192-states-s",
+      name: "time8192StatesS",
       label: "QAM8192s",
       borderColor: '#cb5be8',
       bezierCurve: false,
@@ -386,7 +395,7 @@ class AdaptiveModulationComponent extends React.Component<AdaptiveModulationComp
       data: [],
       columnLabel: "QAM8192S",
     }, {
-      name: "time8192-states",
+      name: "time8192States",
       label: "QAM8192",
       borderColor: '#cb5be8',
       bezierCurve: false,
@@ -395,7 +404,7 @@ class AdaptiveModulationComponent extends React.Component<AdaptiveModulationComp
       data: [],
       columnLabel: "QAM8192",
     }, {
-      name: "time8192-states-l",
+      name: "time8192StatesL",
       label: "QAM8192L",
       borderColor: '#cb5be8',
       bezierCurve: false,
@@ -409,7 +418,7 @@ class AdaptiveModulationComponent extends React.Component<AdaptiveModulationComp
     _rows.forEach(row => {
       datasets.forEach(ds => {
         ds.data.push({
-          x: row["time-stamp"],
+          x: row["utcTimeStamp" as keyof AdaptiveModulationDataType] as string,
           y: row[ds.name as keyof AdaptiveModulationDataType] as string
         });
       });
diff --git a/sdnr/wt/odlux/apps/performanceHistoryApp/src/components/crossPolarDiscrimination.tsx b/sdnr/wt/odlux/apps/performanceHistoryApp/src/components/crossPolarDiscrimination.tsx
index 42e3f93a6..8718171f7 100644
--- a/sdnr/wt/odlux/apps/performanceHistoryApp/src/components/crossPolarDiscrimination.tsx
+++ b/sdnr/wt/odlux/apps/performanceHistoryApp/src/components/crossPolarDiscrimination.tsx
@@ -1,3 +1,20 @@
+/**
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt odlux
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH Intellectual Property. All rights reserved.
+ * =================================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ * ============LICENSE_END==========================================================================
+ */
 import * as React from 'react';
 
 import { withRouter, RouteComponentProps } from 'react-router-dom';
@@ -8,19 +25,16 @@ import connect, { Connect, IDispatcher } from '../../../../framework/src/flux/co
 
 import { CrossPolarDiscriminationDataType } from '../models/crossPolarDiscriminationDataType';
 import { IDataSet, IDataSetsObject } from '../models/chartTypes';
-import { createCrossPolarDiscrimination15minProperties, createCrossPolarDiscrimination15minActions } from '../handlers/crossPolarDiscrimination15minHandler';
-import { createCrossPolarDiscrimination24hoursProperties, createCrossPolarDiscrimination24hoursActions } from '../handlers/crossPolarDiscrimination24hoursHandler';
+import { createCrossPolarDiscriminationProperties, createCrossPolarDiscriminationActions } from '../handlers/crossPolarDiscriminationHandler';
 import { lineChart, sortDataByTimeStamp } from '../utils/chartUtils';
 import { addColumnLabels } from '../utils/tableUtils';
 
 const mapProps = (state: IApplicationStoreState) => ({
-  crossPolarDiscrimination15minProperties: createCrossPolarDiscrimination15minProperties(state),
-  crossPolarDiscrimination24hoursProperties: createCrossPolarDiscrimination24hoursProperties(state)
+  crossPolarDiscriminationProperties: createCrossPolarDiscriminationProperties(state),
 });
 
 const mapDisp = (dispatcher: IDispatcher) => ({
-  crossPolarDiscrimination15minActions: createCrossPolarDiscrimination15minActions(dispatcher.dispatch),
-  crossPolarDiscrimination24hoursActions: createCrossPolarDiscrimination24hoursActions(dispatcher.dispatch)
+  crossPolarDiscriminationActions: createCrossPolarDiscriminationActions(dispatcher.dispatch),
 });
 
 type CrossPolarDiscriminationComponentProps = RouteComponentProps & Connect<typeof mapProps, typeof mapDisp> & {
@@ -34,27 +48,23 @@ const CrossPolarDiscriminationTable = MaterialTable as MaterialTableCtorType<Cro
  */
 class CrossPolarDiscriminationComponent extends React.Component<CrossPolarDiscriminationComponentProps>{
   render(): JSX.Element {
-    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 properties = this.props.crossPolarDiscriminationProperties;
+    const actions = this.props.crossPolarDiscriminationActions;
 
     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: "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: "suspect-interval-flag", title: "Suspect Interval", type: ColumnType.custom, customControl: ({ rowData }) => {
-          const suspectIntervalFlag = rowData["suspect-interval-flag"].toString();
+        property: "suspectIntervalFlag", title: "Suspect Interval", type: ColumnType.custom, customControl: ({ rowData }) => {
+          const suspectIntervalFlag = rowData["suspectIntervalFlag"].toString();
           return <div >{suspectIntervalFlag} </div>
         }
       }
     ];
-    
+
     chartPagedData.datasets.forEach(ds => {
       cpdColumns.push(addColumnLabels<CrossPolarDiscriminationDataType>(ds.name, ds.columnLabel));
     });
@@ -75,7 +85,7 @@ class CrossPolarDiscriminationComponent extends React.Component<CrossPolarDiscri
     sortDataByTimeStamp(_rows);
 
     const datasets: IDataSet[] = [{
-      name: "xpd-min",
+      name: "xpdMin",
       label: "xpd-min",
       borderColor: '#0e17f3de',
       bezierCurve: false,
@@ -84,7 +94,7 @@ class CrossPolarDiscriminationComponent extends React.Component<CrossPolarDiscri
       data: [],
       columnLabel: "CPD (min)[db]"
     }, {
-      name: "xpd-avg",
+      name: "xpdAvg",
       label: "xpd-avg",
       borderColor: '#08edb6de',
       bezierCurve: false,
@@ -93,7 +103,7 @@ class CrossPolarDiscriminationComponent extends React.Component<CrossPolarDiscri
       data: [],
       columnLabel: "CPD (avg)[db]"
     }, {
-      name: "xpd-max",
+      name: "xpdMax",
       label: "xpd-max",
       borderColor: '#b308edde',
       bezierCurve: false,
@@ -106,7 +116,7 @@ class CrossPolarDiscriminationComponent extends React.Component<CrossPolarDiscri
     _rows.forEach(row => {
       datasets.forEach(ds => {
         ds.data.push({
-          x: row["time-stamp"],
+          x: row["utcTimeStamp" as keyof CrossPolarDiscriminationDataType] as string,
           y: row[ds.name as keyof CrossPolarDiscriminationDataType] as string
         });
       });
diff --git a/sdnr/wt/odlux/apps/performanceHistoryApp/src/components/performanceData.tsx b/sdnr/wt/odlux/apps/performanceHistoryApp/src/components/performanceData.tsx
index 578022db7..fc44879dc 100644
--- a/sdnr/wt/odlux/apps/performanceHistoryApp/src/components/performanceData.tsx
+++ b/sdnr/wt/odlux/apps/performanceHistoryApp/src/components/performanceData.tsx
@@ -1,3 +1,20 @@
+/**
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt odlux
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH Intellectual Property. All rights reserved.
+ * =================================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ * ============LICENSE_END==========================================================================
+ */
 import * as React from 'react';
 
 import { withRouter, RouteComponentProps } from 'react-router-dom';
@@ -7,19 +24,16 @@ import { IApplicationStoreState } from '../../../../framework/src/store/applicat
 import connect, { Connect, IDispatcher } from '../../../../framework/src/flux/connect';
 import { PerformanceDataType } from '../models/performanceDataType';
 import { IDataSet, IDataSetsObject } from '../models/chartTypes';
-import { createPerformanceData15minProperties, createPerformanceData15minActions } from '../handlers/performanceData15minHandler';
-import { createPerformanceData24hoursProperties, createPerformanceData24hoursActions } from '../handlers/performanceData24hoursHandler';
+import { createPerformanceDataProperties, createPerformanceDataActions } from '../handlers/performanceDataHandler';
 import { lineChart, sortDataByTimeStamp } from '../utils/chartUtils';
 import { addColumnLabels } from '../utils/tableUtils';
 
 const mapProps = (state: IApplicationStoreState) => ({
-  performanceData15minProperties: createPerformanceData15minProperties(state),
-  performanceData24hoursProperties: createPerformanceData24hoursProperties(state)
+  performanceDataProperties: createPerformanceDataProperties(state),
 });
 
 const mapDisp = (dispatcher: IDispatcher) => ({
-  performanceData15minActions: createPerformanceData15minActions(dispatcher.dispatch),
-  performanceData24hoursActions: createPerformanceData24hoursActions(dispatcher.dispatch)
+  performanceDataActions: createPerformanceDataActions(dispatcher.dispatch),
 });
 
 type PerformanceDataComponentProps = RouteComponentProps & Connect<typeof mapProps, typeof mapDisp> & {
@@ -33,21 +47,17 @@ const PerformanceDataTable = MaterialTable as MaterialTableCtorType<PerformanceD
  */
 class PerformanceDataComponent extends React.Component<PerformanceDataComponentProps>{
   render(): JSX.Element {
-    const properties = this.props.selectedTimePeriod === "15min"
-      ? this.props.performanceData15minProperties
-      : this.props.performanceData24hoursProperties;
-    const actions = this.props.selectedTimePeriod === "15min"
-      ? this.props.performanceData15minActions
-      : this.props.performanceData24hoursActions;
+    const properties = this.props.performanceDataProperties;
+    const actions = this.props.performanceDataActions;
 
     const chartPagedData = this.getChartDataValues(properties.rows);
     const performanceColumns: ColumnModel<PerformanceDataType>[] = [
-      { 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: "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: "suspect-interval-flag", title: "Suspect Interval", type: ColumnType.custom, customControl: ({ rowData }) => {
-          const suspectIntervalFlag = rowData["suspect-interval-flag"].toString();
+        property: "suspectIntervalFlag", title: "Suspect Interval", type: ColumnType.custom, customControl: ({ rowData }) => {
+          const suspectIntervalFlag = rowData["suspectIntervalFlag"].toString();
           return <div >{suspectIntervalFlag} </div>
         }
       }
@@ -104,7 +114,7 @@ class PerformanceDataComponent extends React.Component<PerformanceDataComponentP
     _rows.forEach(row => {
       datasets.forEach(ds => {
         ds.data.push({
-          x: row["time-stamp"],
+          x: row["utcTimeStamp" as keyof PerformanceDataType] as string,
           y: row[ds.name as keyof PerformanceDataType] as string
         });
       });
diff --git a/sdnr/wt/odlux/apps/performanceHistoryApp/src/components/receiveLevel.tsx b/sdnr/wt/odlux/apps/performanceHistoryApp/src/components/receiveLevel.tsx
index b893ce149..9992f5bd8 100644
--- a/sdnr/wt/odlux/apps/performanceHistoryApp/src/components/receiveLevel.tsx
+++ b/sdnr/wt/odlux/apps/performanceHistoryApp/src/components/receiveLevel.tsx
@@ -1,3 +1,20 @@
+/**
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt odlux
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH Intellectual Property. All rights reserved.
+ * =================================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ * ============LICENSE_END==========================================================================
+ */
 import * as React from 'react';
 
 import { withRouter, RouteComponentProps } from 'react-router-dom';
@@ -8,19 +25,16 @@ import connect, { Connect, IDispatcher } from '../../../../framework/src/flux/co
 
 import { ReceiveLevelDataType } from '../models/receiveLevelDataType';
 import { IDataSet, IDataSetsObject } from '../models/chartTypes';
-import { createReceiveLevel15minProperties, createReceiveLevel15minActions } from '../handlers/receiveLevel15minHandler';
-import { createReceiveLevel24hoursProperties, createReceiveLevel24hoursActions } from '../handlers/receiveLevel24hoursHandler';
+import { createReceiveLevelProperties, createReceiveLevelActions } from '../handlers/receiveLevelHandler';
 import { lineChart, sortDataByTimeStamp } from '../utils/chartUtils';
 import { addColumnLabels } from '../utils/tableUtils';
 
 const mapProps = (state: IApplicationStoreState) => ({
-  receiveLevel15minProperties: createReceiveLevel15minProperties(state),
-  receiveLevel24hoursProperties: createReceiveLevel24hoursProperties(state)
+  receiveLevelProperties: createReceiveLevelProperties(state),
 });
 
 const mapDisp = (dispatcher: IDispatcher) => ({
-  receiveLevel15minActions: createReceiveLevel15minActions(dispatcher.dispatch),
-  receiveLevel24hoursActions: createReceiveLevel24hoursActions(dispatcher.dispatch)
+  receiveLevelActions: createReceiveLevelActions(dispatcher.dispatch),
 });
 
 type ReceiveLevelComponentProps = RouteComponentProps & Connect<typeof mapProps, typeof mapDisp> & {
@@ -34,21 +48,17 @@ const ReceiveLevelTable = MaterialTable as MaterialTableCtorType<ReceiveLevelDat
  */
 class ReceiveLevelComponent extends React.Component<ReceiveLevelComponentProps>{
   render(): JSX.Element {
-    const properties = this.props.selectedTimePeriod === "15min"
-      ? this.props.receiveLevel15minProperties
-      : this.props.receiveLevel24hoursProperties;
-    const actions = this.props.selectedTimePeriod === "15min"
-      ? this.props.receiveLevel15minActions
-      : this.props.receiveLevel24hoursActions;
+    const properties = this.props.receiveLevelProperties;
+    const actions = this.props.receiveLevelActions;
 
     const chartPagedData = this.getChartDataValues(properties.rows);
     const receiveLevelColumns: ColumnModel<ReceiveLevelDataType>[] = [
-      { 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: "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: "suspect-interval-flag", title: "Suspect Interval", type: ColumnType.custom, customControl: ({ rowData }) => {
-          const suspectIntervalFlag = rowData["suspect-interval-flag"].toString();
+        property: "suspectIntervalFlag", title: "Suspect Interval", type: ColumnType.custom, customControl: ({ rowData }) => {
+          const suspectIntervalFlag = rowData["suspectIntervalFlag"].toString();
           return <div >{suspectIntervalFlag} </div>
         }
       }
@@ -75,7 +85,7 @@ class ReceiveLevelComponent extends React.Component<ReceiveLevelComponentProps>{
     sortDataByTimeStamp(_rows);
 
     const datasets: IDataSet[] = [{
-      name: "rx-level-min",
+      name: "rxLevelMin",
       label: "rx-level-min",
       borderColor: '#0e17f3de',
       bezierCurve: false,
@@ -84,7 +94,7 @@ class ReceiveLevelComponent extends React.Component<ReceiveLevelComponentProps>{
       data: [],
       columnLabel: "Rx min"
     }, {
-      name: "rx-level-avg",
+      name: "rxLevelAvg",
       label: "rx-level-avg",
       borderColor: '#08edb6de',
       bezierCurve: false,
@@ -93,7 +103,7 @@ class ReceiveLevelComponent extends React.Component<ReceiveLevelComponentProps>{
       data: [],
       columnLabel: "Rx avg"
     }, {
-      name: "rx-level-max",
+      name: "rxLevelMax",
       label: "rx-level-max",
       borderColor: '#b308edde',
       bezierCurve: false,
@@ -106,7 +116,7 @@ class ReceiveLevelComponent extends React.Component<ReceiveLevelComponentProps>{
     _rows.forEach(row => {
       datasets.forEach(ds => {
         ds.data.push({
-          x: row["time-stamp"],
+          x: row["utcTimeStamp" as keyof ReceiveLevelDataType] as string,
           y: row[ds.name as keyof ReceiveLevelDataType] as string
         });
       });
diff --git a/sdnr/wt/odlux/apps/performanceHistoryApp/src/components/signalToInterference.tsx b/sdnr/wt/odlux/apps/performanceHistoryApp/src/components/signalToInterference.tsx
index 90ed1a9cb..98017ae2f 100644
--- a/sdnr/wt/odlux/apps/performanceHistoryApp/src/components/signalToInterference.tsx
+++ b/sdnr/wt/odlux/apps/performanceHistoryApp/src/components/signalToInterference.tsx
@@ -1,3 +1,20 @@
+/**
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt odlux
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH Intellectual Property. All rights reserved.
+ * =================================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ * ============LICENSE_END==========================================================================
+ */
 import * as React from 'react';
 
 import { withRouter, RouteComponentProps } from 'react-router-dom';
@@ -8,19 +25,16 @@ import connect, { Connect, IDispatcher } from '../../../../framework/src/flux/co
 
 import { SignalToInterferenceDataType } from '../models/signalToInteferenceDataType';
 import { IDataSet, IDataSetsObject } from '../models/chartTypes';
-import { createSignalToInterference15minProperties, createSignalToInterference15minActions } from '../handlers/signalToInterference15minHandler';
-import { createSignalToInterference24hoursProperties, createSignalToInterference24hoursActions } from '../handlers/signalToInterference24hoursHandler';
+import { createSignalToInterferenceProperties, createSignalToInterferenceActions } from '../handlers/signalToInterferenceHandler';
 import { lineChart, sortDataByTimeStamp } from '../utils/chartUtils';
 import { addColumnLabels } from '../utils/tableUtils';
 
 const mapProps = (state: IApplicationStoreState) => ({
-  signalToInterference15minProperties: createSignalToInterference15minProperties(state),
-  signalToInterference24hoursProperties: createSignalToInterference24hoursProperties(state)
+  signalToInterferenceProperties: createSignalToInterferenceProperties(state),
 });
 
 const mapDisp = (dispatcher: IDispatcher) => ({
-  signalToInterference15minActions: createSignalToInterference15minActions(dispatcher.dispatch),
-  signalToInterference24hoursActions: createSignalToInterference24hoursActions(dispatcher.dispatch)
+  signalToInterferenceActions: createSignalToInterferenceActions(dispatcher.dispatch),
 });
 
 type SignalToInterferenceComponentProps = RouteComponentProps & Connect<typeof mapProps, typeof mapDisp> & {
@@ -34,28 +48,23 @@ const SignalToInterferenceTable = MaterialTable as MaterialTableCtorType<SignalT
  */
 class SignalToInterferenceComponent extends React.Component<SignalToInterferenceComponentProps>{
   render(): JSX.Element {
-    const properties = this.props.selectedTimePeriod === "15min"
-      ? this.props.signalToInterference15minProperties
-      : this.props.signalToInterference24hoursProperties;
-    const actions = this.props.selectedTimePeriod === "15min"
-      ? this.props.signalToInterference15minActions
-      : this.props.signalToInterference24hoursActions;
+    const properties = this.props.signalToInterferenceProperties;
+    const actions = this.props.signalToInterferenceActions;
 
     const chartPagedData = this.getChartDataValues(properties.rows);
 
     const sinrColumns: ColumnModel<SignalToInterferenceDataType>[] = [
-
-      { 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: "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: "suspect-interval-flag", title: "Suspect Interval", type: ColumnType.custom, customControl: ({ rowData }) => {
-          const suspectIntervalFlag = rowData["suspect-interval-flag"].toString();
+        property: "suspectIntervalFlag", title: "Suspect Interval", type: ColumnType.custom, customControl: ({ rowData }) => {
+          const suspectIntervalFlag = rowData["suspectIntervalFlag"].toString();
           return <div >{suspectIntervalFlag} </div>
         }
       }
     ];
-    
+
     chartPagedData.datasets.forEach(ds => {
       sinrColumns.push(addColumnLabels<SignalToInterferenceDataType>(ds.name, ds.columnLabel));
     });
@@ -78,7 +87,7 @@ class SignalToInterferenceComponent extends React.Component<SignalToInterference
     sortDataByTimeStamp(_rows);
 
     const datasets: IDataSet[] = [{
-      name: "snir-min",
+      name: "snirMin",
       label: "snir-min",
       borderColor: '#0e17f3de',
       bezierCurve: false,
@@ -87,7 +96,7 @@ class SignalToInterferenceComponent extends React.Component<SignalToInterference
       data: [],
       columnLabel: "SINR (min)[db]"
     }, {
-      name: "snir-avg",
+      name: "snirAvg",
       label: "snir-avg",
       borderColor: '#08edb6de',
       bezierCurve: false,
@@ -96,7 +105,7 @@ class SignalToInterferenceComponent extends React.Component<SignalToInterference
       data: [],
       columnLabel: "SINR (avg)[db]"
     }, {
-      name: "snir-max",
+      name: "snirMax",
       label: "snir-max",
       borderColor: '#b308edde',
       bezierCurve: false,
@@ -109,7 +118,7 @@ class SignalToInterferenceComponent extends React.Component<SignalToInterference
     _rows.forEach(row => {
       datasets.forEach(ds => {
         ds.data.push({
-          x: row["time-stamp"],
+          x: row["utcTimeStamp" as keyof SignalToInterferenceDataType] as string,
           y: row[ds.name as keyof SignalToInterferenceDataType] as string
         });
       });
diff --git a/sdnr/wt/odlux/apps/performanceHistoryApp/src/components/temperature.tsx b/sdnr/wt/odlux/apps/performanceHistoryApp/src/components/temperature.tsx
index f105bfd46..f1e62cf33 100644
--- a/sdnr/wt/odlux/apps/performanceHistoryApp/src/components/temperature.tsx
+++ b/sdnr/wt/odlux/apps/performanceHistoryApp/src/components/temperature.tsx
@@ -1,3 +1,20 @@
+/**
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt odlux
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH Intellectual Property. All rights reserved.
+ * =================================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ * ============LICENSE_END==========================================================================
+ */
 import * as React from 'react';
 
 import { withRouter, RouteComponentProps } from 'react-router-dom';
@@ -8,19 +25,16 @@ import connect, { Connect, IDispatcher } from '../../../../framework/src/flux/co
 
 import { TemperatureDataType } from '../models/temperatureDataType';
 import { IDataSet, IDataSetsObject } from '../models/chartTypes';
-import { createTemperature15minProperties, createTemperature15minActions } from '../handlers/temperature15minHandler';
-import { createTemperature24hoursProperties, createTemperature24hoursActions } from '../handlers/temperature24hoursHandler';
+import { createTemperatureProperties, createTemperatureActions } from '../handlers/temperatureHandler';
 import { lineChart, sortDataByTimeStamp } from '../utils/chartUtils';
 import { addColumnLabels } from '../utils/tableUtils';
 
 const mapProps = (state: IApplicationStoreState) => ({
-  temperature15minProperties: createTemperature15minProperties(state),
-  temperature24hoursProperties: createTemperature24hoursProperties(state)
+  temperatureProperties: createTemperatureProperties(state),
 });
 
 const mapDisp = (dispatcher: IDispatcher) => ({
-  temperature15minActions: createTemperature15minActions(dispatcher.dispatch),
-  temperature24hoursActions: createTemperature24hoursActions(dispatcher.dispatch)
+  temperatureActions: createTemperatureActions(dispatcher.dispatch),
 });
 
 type TemperatureComponentProps = RouteComponentProps & Connect<typeof mapProps, typeof mapDisp> & {
@@ -34,26 +48,22 @@ const TemperatureTable = MaterialTable as MaterialTableCtorType<TemperatureDataT
  */
 class TemperatureComponent extends React.Component<TemperatureComponentProps>{
   render(): JSX.Element {
-    const properties = this.props.selectedTimePeriod === "15min"
-      ? this.props.temperature15minProperties
-      : this.props.temperature24hoursProperties;
-    const actions = this.props.selectedTimePeriod === "15min"
-      ? this.props.temperature15minActions
-      : this.props.temperature24hoursActions;
+    const properties = this.props.temperatureProperties;
+    const actions = this.props.temperatureActions;
 
     const chartPagedData = this.getChartDataValues(properties.rows);
     const temperatureColumns: ColumnModel<TemperatureDataType>[] = [
-      { 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: "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: "suspect-interval-flag", title: "Suspect Interval", type: ColumnType.custom, customControl: ({ rowData }) => {
-          const suspectIntervalFlag = rowData["suspect-interval-flag"].toString();
+        property: "suspectIntervalFlag", title: "Suspect Interval", type: ColumnType.custom, customControl: ({ rowData }) => {
+          const suspectIntervalFlag = rowData["suspectIntervalFlag"].toString();
           return <div >{suspectIntervalFlag} </div>
         }
       }
     ];
-    
+
     chartPagedData.datasets.forEach(ds => {
       temperatureColumns.push(addColumnLabels<TemperatureDataType>(ds.name, ds.columnLabel));
     });
@@ -75,7 +85,7 @@ class TemperatureComponent extends React.Component<TemperatureComponentProps>{
     sortDataByTimeStamp(_rows);
 
     const datasets: IDataSet[] = [{
-      name: "rf-temp-min",
+      name: "rfTempMin",
       label: "rf-temp-min",
       borderColor: '#0e17f3de',
       bezierCurve: false,
@@ -84,7 +94,7 @@ class TemperatureComponent extends React.Component<TemperatureComponentProps>{
       data: [],
       columnLabel: "Rf Temp Min[deg C]"
     }, {
-      name: "rf-temp-avg",
+      name: "rfTempAvg",
       label: "rf-temp-avg",
       borderColor: '#08edb6de',
       bezierCurve: false,
@@ -93,7 +103,7 @@ class TemperatureComponent extends React.Component<TemperatureComponentProps>{
       data: [],
       columnLabel: "Rf Temp Avg[deg C]"
     }, {
-      name: "rf-temp-max",
+      name: "rfTempMax",
       label: "rf-temp-max",
       borderColor: '#b308edde',
       bezierCurve: false,
@@ -106,7 +116,7 @@ class TemperatureComponent extends React.Component<TemperatureComponentProps>{
     _rows.forEach(row => {
       datasets.forEach(ds => {
         ds.data.push({
-          x: row["time-stamp"],
+          x: row["utcTimeStamp" as keyof TemperatureDataType] as string,
           y: row[ds.name as keyof TemperatureDataType] as string
         });
       });
diff --git a/sdnr/wt/odlux/apps/performanceHistoryApp/src/components/transmissionPower.tsx b/sdnr/wt/odlux/apps/performanceHistoryApp/src/components/transmissionPower.tsx
index 088a83eed..8ec4561a4 100644
--- a/sdnr/wt/odlux/apps/performanceHistoryApp/src/components/transmissionPower.tsx
+++ b/sdnr/wt/odlux/apps/performanceHistoryApp/src/components/transmissionPower.tsx
@@ -1,3 +1,20 @@
+/**
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt odlux
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH Intellectual Property. All rights reserved.
+ * =================================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ * ============LICENSE_END==========================================================================
+ */
 import * as React from 'react';
 
 import { withRouter, RouteComponentProps } from 'react-router-dom';
@@ -8,19 +25,16 @@ import connect, { Connect, IDispatcher } from '../../../../framework/src/flux/co
 
 import { TransmissionPowerDataType } from '../models/transmissionPowerDataType';
 import { IDataSet, IDataSetsObject } from '../models/chartTypes';
-import { createTransmissionPower15minProperties, createTransmissionPower15minActions } from '../handlers/transmissionPower15minHandler';
-import { createTransmissionPower24hoursProperties, createTransmissionPower24hoursActions } from '../handlers/transmissionPower24hoursHandler';
+import { createTransmissionPowerProperties, createTransmissionPowerActions } from '../handlers/transmissionPowerHandler';
 import { lineChart, sortDataByTimeStamp } from '../utils/chartUtils';
 import { addColumnLabels } from '../utils/tableUtils';
 
 const mapProps = (state: IApplicationStoreState) => ({
-  transmissionPower15minProperties: createTransmissionPower15minProperties(state),
-  transmissionPower24hoursProperties: createTransmissionPower24hoursProperties(state)
+  transmissionPowerProperties: createTransmissionPowerProperties(state),
 });
 
 const mapDisp = (dispatcher: IDispatcher) => ({
-  transmissionPower15minActions: createTransmissionPower15minActions(dispatcher.dispatch),
-  transmissionPower24hoursActions: createTransmissionPower24hoursActions(dispatcher.dispatch)
+  transmissionPowerActions: createTransmissionPowerActions(dispatcher.dispatch),
 });
 
 type TransmissionPowerComponentProps = RouteComponentProps & Connect<typeof mapProps, typeof mapDisp> & {
@@ -34,27 +48,23 @@ const TransmissionPowerTable = MaterialTable as MaterialTableCtorType<Transmissi
  */
 class TransmissionPowerComponent extends React.Component<TransmissionPowerComponentProps>{
   render(): JSX.Element {
-    const properties = this.props.selectedTimePeriod === "15min"
-      ? this.props.transmissionPower15minProperties
-      : this.props.transmissionPower24hoursProperties;
-    const actions = this.props.selectedTimePeriod === "15min"
-      ? this.props.transmissionPower15minActions
-      : this.props.transmissionPower24hoursActions;
+    const properties = this.props.transmissionPowerProperties
+    const actions = this.props.transmissionPowerActions
 
     const chartPagedData = this.getChartDataValues(properties.rows);
 
     const transmissionColumns: ColumnModel<TransmissionPowerDataType>[] = [
-      { 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: "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: "suspect-interval-flag", title: "Suspect Interval", type: ColumnType.custom, customControl: ({ rowData }) => {
-          const suspectIntervalFlag = rowData["suspect-interval-flag"].toString();
+        property: "suspectIntervalFlag", title: "Suspect Interval", type: ColumnType.custom, customControl: ({ rowData }) => {
+          const suspectIntervalFlag = rowData["suspectIntervalFlag"].toString();
           return <div >{suspectIntervalFlag} </div>
         }
       }
     ];
-    
+
     chartPagedData.datasets.forEach(ds => {
       transmissionColumns.push(addColumnLabels<TransmissionPowerDataType>(ds.name, ds.columnLabel));
     });
@@ -77,7 +87,7 @@ class TransmissionPowerComponent extends React.Component<TransmissionPowerCompon
     sortDataByTimeStamp(_rows);
 
     const datasets: IDataSet[] = [{
-      name: "tx-level-min",
+      name: "txLevelMin",
       label: "tx-level-min",
       borderColor: '#0e17f3de',
       bezierCurve: false,
@@ -86,7 +96,7 @@ class TransmissionPowerComponent extends React.Component<TransmissionPowerCompon
       data: [],
       columnLabel: "Tx min"
     }, {
-      name: "tx-level-avg",
+      name: "txLevelAvg",
       label: "tx-level-avg",
       borderColor: '#08edb6de',
       bezierCurve: false,
@@ -95,7 +105,7 @@ class TransmissionPowerComponent extends React.Component<TransmissionPowerCompon
       data: [],
       columnLabel: "Tx avg"
     }, {
-      name: "tx-level-max",
+      name: "txLevelMax",
       label: "tx-level-max",
       borderColor: '#b308edde',
       bezierCurve: false,
@@ -108,7 +118,7 @@ class TransmissionPowerComponent extends React.Component<TransmissionPowerCompon
     _rows.forEach(row => {
       datasets.forEach(ds => {
         ds.data.push({
-          x: row["time-stamp"],
+          x: row["utcTimeStamp" as keyof TransmissionPowerDataType] as string,
           y: row[ds.name as keyof TransmissionPowerDataType] as string
         });
       });