From 28f9bff968d0147eb9406a468e232a5e4cc06467 Mon Sep 17 00:00:00 2001 From: marwolaethblack Date: Mon, 4 Dec 2017 12:29:01 +0100 Subject: sort data by day, add lien chart with data from last week --- web/js/chartOfReadings.js | 71 +++++++++++++++++++++++++++++++++++++++++++++++ web/js/realtime.js | 4 +++ 2 files changed, 75 insertions(+) create mode 100644 web/js/chartOfReadings.js (limited to 'web/js') diff --git a/web/js/chartOfReadings.js b/web/js/chartOfReadings.js new file mode 100644 index 0000000..83f656a --- /dev/null +++ b/web/js/chartOfReadings.js @@ -0,0 +1,71 @@ +var gasReading = { + Co: [], + No: [], + So: [] +}; + +var canvas = document.querySelector('#ctx'); +var ctx = canvas.getContext('2d'); + +var datasets = [{ + label: "Co", + borderColor: "rgb(5, 0, 0)", + fill: false, + data: [] +}, { + label: "No", + borderColor: "rgb(69, 169, 230)", + fill: false, + data: [] +}, { + label: "So", + borderColor: "rgb(246, 250, 15)", + fill: false, + data: [] +}] + + + + +fetch('/lastweek') + .then(function(response) { + return response.json(); + }) + .then(function(data) { + drawChart(data, datasets); + }) + + + + + +function drawChart(gasData, datasets) { + + var finishedData = { + labels: [] + } + + Object.keys(gasData).forEach(function(key) { + finishedData.labels.push(key); + datasets[0].data.push(gasData[key].Co) + datasets[1].data.push(gasData[key].No); + datasets[2].data.push(gasData[key].So); + }); + + finishedData.datasets = datasets; + + + var myLineChart = new Chart(ctx, { + type: 'line', + data: finishedData, + options: { + scales: { + xAxes: [{ + time: { + unit: 'day' + } + }] + } + } + }); +} diff --git a/web/js/realtime.js b/web/js/realtime.js index e090d05..1f5ef22 100644 --- a/web/js/realtime.js +++ b/web/js/realtime.js @@ -88,6 +88,10 @@ function update() { +} + +function drawChart() { + } setInterval(update, 10000); -- cgit v1.2.3