diff options
Diffstat (limited to 'web')
| -rw-r--r-- | web/js/AllDataChart.js (renamed from web/js/chartOfReadings.js) | 2 | ||||
| -rw-r--r-- | web/js/LastWeekDataChart.js | 71 | 
2 files changed, 72 insertions, 1 deletions
| diff --git a/web/js/chartOfReadings.js b/web/js/AllDataChart.js index 83f656a..8de05cf 100644 --- a/web/js/chartOfReadings.js +++ b/web/js/AllDataChart.js @@ -27,7 +27,7 @@ var datasets = [{ -fetch('/lastweek') +fetch('/AllDataAverage')      .then(function(response) {          return response.json();      }) diff --git a/web/js/LastWeekDataChart.js b/web/js/LastWeekDataChart.js new file mode 100644 index 0000000..a24d51a --- /dev/null +++ b/web/js/LastWeekDataChart.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('/LastWeekDataAverage') +    .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' +                    } +                }] +            } +        } +    }); +} |