From f862e4b8da3374c83e1372f045461abc134987b9 Mon Sep 17 00:00:00 2001 From: kunkliricsi Date: Sat, 21 Nov 2020 18:10:36 +0100 Subject: [PATCH] Added all charts (pre optimization) --- .../src/components/dashboard/Dashboard.jsx | 6 ++---- .../src/components/dashboard/charts/BarChart.jsx | 12 ------------ .../src/components/dashboard/charts/DonutChart.jsx | 14 -------------- .../components/dashboard/charts/HeatmapChart.jsx | 14 -------------- .../src/components/dashboard/charts/LineChart.jsx | 6 +++--- 5 files changed, 5 insertions(+), 47 deletions(-) diff --git a/Birdmap.API/ClientApp/src/components/dashboard/Dashboard.jsx b/Birdmap.API/ClientApp/src/components/dashboard/Dashboard.jsx index 8f55d68..f1a891d 100644 --- a/Birdmap.API/ClientApp/src/components/dashboard/Dashboard.jsx +++ b/Birdmap.API/ClientApp/src/components/dashboard/Dashboard.jsx @@ -252,11 +252,8 @@ class Dashboard extends Component { } getLineSeries() { - const xSecondsAgo = new Date( Date.now() - 1000 * 2 ); - const aSecondAgo = new Date( Date.now() - 1000 * 1); const messages = {}; - var counter = 0; for (var p of this.context.heatmapPoints) { var shortDate = p.date.toUTCString(); var message = messages[shortDate]; @@ -267,13 +264,14 @@ class Dashboard extends Component { } } - const series = [{data: []}]; + const series = [{name: "message/sec", data: []}]; for (var m in messages) { series[0].data.push({ x: new Date(m).getTime(), y: messages[m], }) } + return series; } diff --git a/Birdmap.API/ClientApp/src/components/dashboard/charts/BarChart.jsx b/Birdmap.API/ClientApp/src/components/dashboard/charts/BarChart.jsx index 8032d25..1d081cf 100644 --- a/Birdmap.API/ClientApp/src/components/dashboard/charts/BarChart.jsx +++ b/Birdmap.API/ClientApp/src/components/dashboard/charts/BarChart.jsx @@ -16,18 +16,6 @@ export class BarChart extends Component { this.setState({options: { chart: { stacked: true, - animations: { - enabled: false, - easing: 'linear', - speed: 1000, - animateGradually: { - enabled: false, - }, - dynamicAnimation: { - enabled: true, - speed: 500 - } - } }, plotOptions: { bar: { diff --git a/Birdmap.API/ClientApp/src/components/dashboard/charts/DonutChart.jsx b/Birdmap.API/ClientApp/src/components/dashboard/charts/DonutChart.jsx index 75c2f43..a70667e 100644 --- a/Birdmap.API/ClientApp/src/components/dashboard/charts/DonutChart.jsx +++ b/Birdmap.API/ClientApp/src/components/dashboard/charts/DonutChart.jsx @@ -9,20 +9,6 @@ export class DonutChart extends Component { this.state = { options: { - chart: { - animations: { - enabled: false, - easing: 'linear', - speed: 1000, - animateGradually: { - enabled: false, - }, - dynamicAnimation: { - enabled: true, - speed: 500 - } - } - }, legend: { fontSize: '18px', }, diff --git a/Birdmap.API/ClientApp/src/components/dashboard/charts/HeatmapChart.jsx b/Birdmap.API/ClientApp/src/components/dashboard/charts/HeatmapChart.jsx index bbd45cd..7249e69 100644 --- a/Birdmap.API/ClientApp/src/components/dashboard/charts/HeatmapChart.jsx +++ b/Birdmap.API/ClientApp/src/components/dashboard/charts/HeatmapChart.jsx @@ -8,20 +8,6 @@ export class HeatmapChart extends Component { this.state = { options: { - chart: { - animations: { - enabled: false, - easing: 'linear', - speed: 1000, - animateGradually: { - enabled: false, - }, - dynamicAnimation: { - enabled: true, - speed: 500 - } - } - }, dataLabels: { enabled: false }, diff --git a/Birdmap.API/ClientApp/src/components/dashboard/charts/LineChart.jsx b/Birdmap.API/ClientApp/src/components/dashboard/charts/LineChart.jsx index 49cf99f..7dbf6c2 100644 --- a/Birdmap.API/ClientApp/src/components/dashboard/charts/LineChart.jsx +++ b/Birdmap.API/ClientApp/src/components/dashboard/charts/LineChart.jsx @@ -10,15 +10,15 @@ export class LineChart extends Component { options: { chart: { animations: { - enabled: false, + enabled: true, easing: 'linear', speed: 1000, animateGradually: { enabled: false, }, dynamicAnimation: { - enabled: true, - speed: 500 + enabled: false, + speed: 1000 } }, zoom: {