lars/RaspberryPie
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

some minor changes

Browse Source
This commit is contained in:
Lars Bogner
2020-10-23 13:35:31 +02:00
parent 66df352e48
commit 4059267c4d
3 changed files with 61 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
RaspberryPie/flask_backend.py
+10 -1
View File
@@ -1,6 +1,15 @@
from flask import Flask, render_template, make_response from flask import Flask, render_template, make_response
import json
app = Flask(__name__) app = Flask(__name__)
@app.route("/") @app.route("/")
def index(): def index():
pass pass
@app.route("/data/<start>/<end>/")
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)
RaspberryPie/js/main.js
+50
View File
@@ -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
}
RaspberryPie/templates/index.html
+1 -1
View File
@@ -9,7 +9,7 @@
<script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.9.3/Chart.bundle.min.js" integrity="sha512-vBmx0N/uQOXznm/Nbkp7h0P1RfLSj0HQrFSzV8m7rOGyj30fYAOKHYvCNez+yM8IrfnW0TCodDEjRqf6fodf/Q==" crossorigin="anonymous"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.9.3/Chart.bundle.min.js" integrity="sha512-vBmx0N/uQOXznm/Nbkp7h0P1RfLSj0HQrFSzV8m7rOGyj30fYAOKHYvCNez+yM8IrfnW0TCodDEjRqf6fodf/Q==" crossorigin="anonymous"></script>
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.9.3/Chart.css" integrity="sha512-SUJFImtiT87gVCOXl3aGC00zfDl6ggYAw5+oheJvRJ8KBXZrr/TMISSdVJ5bBarbQDRC2pR5Kto3xTR0kpZInA==" crossorigin="anonymous" /> <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.9.3/Chart.css" integrity="sha512-SUJFImtiT87gVCOXl3aGC00zfDl6ggYAw5+oheJvRJ8KBXZrr/TMISSdVJ5bBarbQDRC2pR5Kto3xTR0kpZInA==" crossorigin="anonymous" />
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.9.3/Chart.min.css" integrity="sha512-/zs32ZEJh+/EO2N1b0PEdoA10JkdC3zJ8L5FTiQu82LR9S/rOQNfQN7U59U9BC12swNeRAz3HSzIL2vpp4fv3w==" crossorigin="anonymous" /> <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.9.3/Chart.min.css" integrity="sha512-/zs32ZEJh+/EO2N1b0PEdoA10JkdC3zJ8L5FTiQu82LR9S/rOQNfQN7U59U9BC12swNeRAz3HSzIL2vpp4fv3w==" crossorigin="anonymous" />
<script src="https://raw.githubusercontent.com/lade043/RaspberryPie/master/RaspberryPie/js/main.js"></script>
</head> </head>
<body> <body>
<h1>RaspberryPie</h1> <h1>RaspberryPie</h1>