2 files changed, 88 insertions, 33 deletions
diff --git a/sdnr/wt/odlux/apps/performanceHistoryApp/src/utils/chartUtils.tsx b/sdnr/wt/odlux/apps/performanceHistoryApp/src/utils/chartUtils.tsx
index 5d583e855..52b5ddb58 100644
--- a/sdnr/wt/odlux/apps/performanceHistoryApp/src/utils/chartUtils.tsx
+++ b/sdnr/wt/odlux/apps/performanceHistoryApp/src/utils/chartUtils.tsx
@@ -1,51 +1,75 @@
+/**
+ * ============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 { IDataSetsObject } from '../models/chartTypes';
 import { Line } from 'react-chartjs-2';
 import * as moment from 'moment';
 import { ITimeStamp } from 'models/chartTypes';
 
+const style: React.CSSProperties = {
+  height: "350px"
+}
 export const lineChart = (chartPagedData: IDataSetsObject) => {
   return (
-    <Line ref="chart" data={chartPagedData} options={{
-      scales: {
-        xAxes: [{
-          type: 'time',
-          time: {
-            displayFormats: {
-              'second': 'DD MMM YYYY HH:mm:ss',
-              'minute': 'DD MMM YYYY HH:mm:ss',
-              'hour': 'DD MMM YYYY HH:mm:ss',
-              'year': 'DD MMM YYYY HH:mm:ss',
+    <div style={style}>
+      <Line ref="chart" data={chartPagedData} options={{
+        responsive: true,
+        maintainAspectRatio: false,
+        scales: {
+          xAxes: [{
+            type: 'time',
+            time: {
+              displayFormats: {
+                'second': 'DD MMM YYYY HH:mm:ss',
+                'minute': 'DD MMM YYYY HH:mm:ss',
+                'hour': 'DD MMM YYYY HH:mm:ss',
+                'year': 'DD MMM YYYY HH:mm:ss',
+              },
+              parser: function (date: string) {
+                let offsetValue = new Date().getTimezoneOffset();
+                var utcDate = moment(date, 'YYYY-MM-DDTHH:mm:ss').utcOffset(offsetValue).utc(false);
+                return utcDate;
+              }
             },
-            parser: function (date: string) {
-              let offsetValue = new Date().getTimezoneOffset();
-              var utcDate = moment(date, 'YYYY-MM-DDTHH:mm:ss').utcOffset(offsetValue).utc(false);
-              return utcDate;
-            }
-          },
-          display: true,
-          scaleLabel: {
-            display: true,
-            labelString: 'Timestamp'
-          }
-        }],
-        yAxes: [{
-          ticks: {
-            beginAtZero: true
-          },
-          scaleLabel: {
             display: true,
-            labelString: 'Value'
-          }
-        }]
-      }
-    }} />
+            scaleLabel: {
+              display: true,
+              labelString: 'Timestamp'
+            }
+          }],
+          yAxes: [{
+            ticks: {
+              beginAtZero: true
+            },
+            scaleLabel: {
+              display: true,
+              labelString: 'Value'
+            }
+          }]
+        }
+      }} />
+    </div>
   );
 }
 
 export const sortDataByTimeStamp = <T extends ITimeStamp>(_rows: T[]): T[] => {
   return (_rows.sort((a, b) => {
-    const result = Date.parse(a["time-stamp"]) - Date.parse(b["time-stamp"]);
+    const result = Date.parse(a["utcTimeStamp"]) - Date.parse(b["utcTimeStamp"]);
     return isNaN(result) ? 0 : result;
   }));
 }
 \ No newline at end of file
diff --git a/sdnr/wt/odlux/apps/performanceHistoryApp/src/utils/tableUtils.ts b/sdnr/wt/odlux/apps/performanceHistoryApp/src/utils/tableUtils.ts
index ad50e5165..865d89c88 100644
--- a/sdnr/wt/odlux/apps/performanceHistoryApp/src/utils/tableUtils.ts
+++ b/sdnr/wt/odlux/apps/performanceHistoryApp/src/utils/tableUtils.ts
@@ -1,5 +1,36 @@
+/**
+ * ============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 { ColumnType, ColumnModel } from '../../../../framework/src/components/material-table';
 
+import { PmDataInterval } from '../models/performanceDataType';
+import { getPmDataInterval } from '../plugin';
+
 export const addColumnLabels = <T>(name: string, title: string, disableFilter = true, disableSorting = true): ColumnModel<T> => {
   return { property: name as keyof T, title: title, type: ColumnType.text, disableFilter: disableFilter, disableSorting: disableSorting };
 }
+
+export function getFilter(): string {
+  switch (getPmDataInterval()) {
+      case PmDataInterval.pmInterval15Min:
+          return "sdnperformance/historicalperformance15min";
+      case PmDataInterval.pmInterval24Hours:
+          return "sdnperformance/historicalperformance24h";
+      default:
+          throw new Error("Unknown time intervall");
+  }
+}
+\ No newline at end of file