From 4059267c4d5da63a30dd5c53efdecd059883e11a Mon Sep 17 00:00:00 2001 From: Lars Bogner Date: Fri, 23 Oct 2020 13:35:31 +0200 Subject: [PATCH] some minor changes --- RaspberryPie/flask_backend.py | 11 ++++++- RaspberryPie/js/main.js | 50 +++++++++++++++++++++++++++++++ RaspberryPie/templates/index.html | 2 +- 3 files changed, 61 insertions(+), 2 deletions(-) diff --git a/RaspberryPie/flask_backend.py b/RaspberryPie/flask_backend.py index fb8b7cf..59a3eed 100644 --- a/RaspberryPie/flask_backend.py +++ b/RaspberryPie/flask_backend.py @@ -1,6 +1,15 @@ from flask import Flask, render_template, make_response +import json app = Flask(__name__) @app.route("/") def index(): - pass \ No newline at end of file + pass +@app.route("/data///") +def functionName(start, end): + data = {} + db_entries = getEnvironment(int(start), int(end)) + data["labels"] = db_entries["temperature"][0] + data["temp"] = db_entries["temperature"][1] + data["humi"] = db_entries["humidity"][1] + return json.dumps(data) \ No newline at end of file diff --git a/RaspberryPie/js/main.js b/RaspberryPie/js/main.js index e69de29..25f1c10 100644 --- a/RaspberryPie/js/main.js +++ b/RaspberryPie/js/main.js @@ -0,0 +1,50 @@ +var chrtArea = document.getElementById("EnvironmentChart").getContext('2d'); +var chrt = new Chart(chrtArea, { + type: 'line', + data: {}, + options: { + scales: { + xAxes: [{ + ticks: { + maxTicksLimit: 8 + } + }], + yAxes:[{ + id: "Temp", + type: "linear", + position: "left" + }, { + id: "Humi", + type: "linear", + position: "right" + }] + } + } +}); + +function getEnvironmentData(range){ + var response = fetch("/data/environment/" + range[0] + "/" + range[1]) + var labels = []; + response.labels.forEach(element => { + labels.push(unixToHuman(element)) + }); + return { + labels: labels, + datasets: [{ + label: "Temperature", + yAxisID: "Temp", + data: response.temp + }, + { + label: "Humidity", + yAxisID: "Humi", + data: response.humi + }] + }; +} + + +function unixToHuman(unix){ + var str = new Date(unix).toLocaleTimeString() + return str +} diff --git a/RaspberryPie/templates/index.html b/RaspberryPie/templates/index.html index d5154a3..f43550b 100644 --- a/RaspberryPie/templates/index.html +++ b/RaspberryPie/templates/index.html @@ -9,7 +9,7 @@ - +

RaspberryPie