From de9d471c5e1bb213c6ea9c8e968ac5f10a0457ca Mon Sep 17 00:00:00 2001 From: Ralf Bauer Date: Sun, 21 May 2023 23:05:18 +0200 Subject: [PATCH] GChart --- webapp/index.html | 4 +++- webapp/src/components/DatabaseChart.vue | 14 +++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/webapp/index.html b/webapp/index.html index 9c0466a8a..4c29f0c29 100644 --- a/webapp/index.html +++ b/webapp/index.html @@ -4,7 +4,9 @@ - + OpenDTU diff --git a/webapp/src/components/DatabaseChart.vue b/webapp/src/components/DatabaseChart.vue index 1be0d08f8..1e5a283bb 100644 --- a/webapp/src/components/DatabaseChart.vue +++ b/webapp/src/components/DatabaseChart.vue @@ -24,13 +24,6 @@ export default defineComponent({ fetch("/api/database", { headers: authHeader() }) .then((response) => handleResponse(response, this.$emitter, this.$router)) .then((energy) => { - var end = new Date() - var start = new Date() - var interval = 1 - start.setDate(end.getDate() - interval) - start.setHours(start.getHours() - 1) - google.charts.setOnLoadCallback(drawBasic()); - function drawBasic() { var data = new google.visualization.DataTable(); data.addColumn('datetime', 'Time'); @@ -67,6 +60,13 @@ export default defineComponent({ var chart = new google.visualization.ColumnChart(document.getElementById('chart_div')); chart.draw(data, options); } + + var end = new Date() + var start = new Date() + var interval = 1 // number of days to show in the chart + start.setDate(end.getDate() - interval) + start.setHours(start.getHours() - 1) + google.charts.setOnLoadCallback(drawBasic()); }); } }