Add free water port handling
This commit is contained in:
parent
7c4a6a3a56
commit
bd528638df
@ -109,6 +109,10 @@ def garden():
|
|||||||
def greenhouse_1():
|
def greenhouse_1():
|
||||||
return render_template('greenhouse.html')
|
return render_template('greenhouse.html')
|
||||||
|
|
||||||
|
@app.route('/free_port')
|
||||||
|
def free_port():
|
||||||
|
return render_template('free_port.html')
|
||||||
|
|
||||||
@app.route('/sample/<idx>', methods=['GET'])
|
@app.route('/sample/<idx>', methods=['GET'])
|
||||||
def get_sample(idx='0'):
|
def get_sample(idx='0'):
|
||||||
"""Handle GET to /sample/<idx>"""
|
"""Handle GET to /sample/<idx>"""
|
||||||
|
116
greenhouseui/static/scripts/free_port.js
Normal file
116
greenhouseui/static/scripts/free_port.js
Normal file
@ -0,0 +1,116 @@
|
|||||||
|
var on_switch_water = function() {
|
||||||
|
var state = true;
|
||||||
|
if(document.getElementById("water_switch").value == "ausschalten") {
|
||||||
|
state = false;
|
||||||
|
}
|
||||||
|
var json_str = JSON.stringify({"id": "2", "waterstate": state});
|
||||||
|
patch_sample(json_str);
|
||||||
|
}
|
||||||
|
|
||||||
|
var on_switch_auto_state = function() {
|
||||||
|
var state = true;
|
||||||
|
if(document.getElementById("auto_switch").value == "ausschalten") {
|
||||||
|
state = false;
|
||||||
|
}
|
||||||
|
var json_str = JSON.stringify({"water": {"id": "2", "autostate": state}});
|
||||||
|
patch_config(json_str);
|
||||||
|
}
|
||||||
|
|
||||||
|
var on_change_config = function() {
|
||||||
|
var on_time_one = document.getElementById("water_on_one").value;
|
||||||
|
var off_time_one = document.getElementById("water_off_one").value;
|
||||||
|
var on_time_two = document.getElementById("water_on_two").value;
|
||||||
|
var off_time_two = document.getElementById("water_off_two").value;
|
||||||
|
var json_str = JSON.stringify({"water": {"id": "2", "times": [{"on_time": on_time_one, "off_time": off_time_one}, {"on_time": on_time_two, "off_time": off_time_two}]}});
|
||||||
|
patch_config(json_str);
|
||||||
|
}
|
||||||
|
|
||||||
|
var http_patch_config = new XMLHttpRequest();
|
||||||
|
http_patch_config.onreadystatechange = function () {
|
||||||
|
if (http_patch_config.readyState === 4) {
|
||||||
|
var status = http_patch_config.status;
|
||||||
|
if (status === 0 || (status >= 200 && status < 400)) {
|
||||||
|
// The request has been completed successfully
|
||||||
|
parse_config(http_patch_config.responseText);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// request error
|
||||||
|
}
|
||||||
|
}
|
||||||
|
var patch_config = function(config) {
|
||||||
|
http_patch_config.abort();
|
||||||
|
http_patch_config.open("PATCH", "/config");
|
||||||
|
http_patch_config.setRequestHeader("Content-Type", "application/json;charset=UTF-8");
|
||||||
|
http_patch_config.send(config);
|
||||||
|
}
|
||||||
|
|
||||||
|
var patch_http = new XMLHttpRequest();
|
||||||
|
var patch_sample = function(sample) {
|
||||||
|
patch_http.abort();
|
||||||
|
patch_http.open("PATCH", "/sample");
|
||||||
|
patch_http.setRequestHeader("Content-Type", "application/json;charset=UTF-8");
|
||||||
|
patch_http.send(sample);
|
||||||
|
}
|
||||||
|
|
||||||
|
var parse_config = function (event) {
|
||||||
|
var config = JSON.parse(event)
|
||||||
|
var output = "einschalten"
|
||||||
|
var visibility = 'hidden'
|
||||||
|
if(config.water && config.water.id == '2') {
|
||||||
|
if(config.water.autostate) {
|
||||||
|
output = "ausschalten"
|
||||||
|
visibility = "visible"
|
||||||
|
document.getElementById("water_on_one").value = config.water.times[0].on_time;
|
||||||
|
document.getElementById("water_off_one").value = config.water.times[0].off_time;
|
||||||
|
document.getElementById("water_on_two").value = config.water.times[1].on_time;
|
||||||
|
document.getElementById("water_off_two").value = config.water.times[1].off_time;
|
||||||
|
}
|
||||||
|
document.getElementById("auto_switch").value = output;
|
||||||
|
document.getElementById("water_times").style.visibility = visibility
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var parse_sample = function (event) {
|
||||||
|
var sample = JSON.parse(event)
|
||||||
|
if(sample.water && sample.water.id == '2') {
|
||||||
|
var switch_caption = "einschalten";
|
||||||
|
if(sample.water.state) {
|
||||||
|
switch_caption = "ausschalten";
|
||||||
|
}
|
||||||
|
document.getElementById("water_switch").value = switch_caption;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var http = new XMLHttpRequest();
|
||||||
|
http.onreadystatechange = function () {
|
||||||
|
if (http.readyState === 4) {
|
||||||
|
var status = http.status;
|
||||||
|
if (status === 0 || (status >= 200 && status < 400)) {
|
||||||
|
// The request has been completed successfully
|
||||||
|
parse_sample(http.responseText);
|
||||||
|
setTimeout(function () {
|
||||||
|
http.open("GET", 'sample/2');
|
||||||
|
http.send();
|
||||||
|
}, 500);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// request error
|
||||||
|
}
|
||||||
|
}
|
||||||
|
http.open("GET", "sample/2");
|
||||||
|
http.send();
|
||||||
|
|
||||||
|
var http_get_config = new XMLHttpRequest();
|
||||||
|
http_get_config.onreadystatechange = function () {
|
||||||
|
if (http_get_config.readyState === 4) {
|
||||||
|
var status = http_get_config.status;
|
||||||
|
if (status === 0 || (status >= 200 && status < 400)) {
|
||||||
|
// The request has been completed successfully
|
||||||
|
parse_config(http_get_config.responseText);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// request error
|
||||||
|
}
|
||||||
|
}
|
||||||
|
http_get_config.open("GET", "config/2");
|
||||||
|
http_get_config.send();
|
77
greenhouseui/templates/free_port.html
Normal file
77
greenhouseui/templates/free_port.html
Normal file
@ -0,0 +1,77 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html>
|
||||||
|
<head>
|
||||||
|
<title>Wasseranschluß</title>
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
|
<link href="/static/css/style.css" rel="stylesheet">
|
||||||
|
<script src="/static/scripts/free_port.js"></script>
|
||||||
|
</head>
|
||||||
|
|
||||||
|
<body>
|
||||||
|
<h1>Wasseranschluß</h1>
|
||||||
|
<table class="center">
|
||||||
|
<tr>
|
||||||
|
<td class="left">Bewässerung</td>
|
||||||
|
<td class="input">
|
||||||
|
<input id="water_switch" type="submit" value="" onclick="on_switch_water()"></input>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="left">Zeigesteuerte Bewässerung </td>
|
||||||
|
<td class="input">
|
||||||
|
<input id="auto_switch" type="submit" value="einschalten" onclick="on_switch_auto_state()"></input>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
|
<div id="water_times" style="visibility:hidden;">
|
||||||
|
<table class="center">
|
||||||
|
<tr>
|
||||||
|
<td>Vormittag</td>
|
||||||
|
<td>
|
||||||
|
<table>
|
||||||
|
<tr>
|
||||||
|
<td>Einschaltzeit</td>
|
||||||
|
<td class="input">
|
||||||
|
<input type="text" id="water_on_one" style="width: 70px;" onchange="on_change_config()"></input>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td>Ausschaltzeit</td>
|
||||||
|
<td class="input">
|
||||||
|
<input type="text" id="water_off_one" style="width: 70px;" onchange="on_change_config()"></input>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td>Nachmittag</td>
|
||||||
|
<td>
|
||||||
|
<table>
|
||||||
|
<tr>
|
||||||
|
<td>Einschaltzeit</td>
|
||||||
|
<td class="input">
|
||||||
|
<input type="text" id="water_on_two" style="width: 70px;" onchange="on_change_config()"></input>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td>Ausschaltzeit</td>
|
||||||
|
<td class="input">
|
||||||
|
<input type="text" id="water_off_two" style="width: 70px;" onchange="on_change_config()"></input>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
</body>
|
||||||
|
<footer>
|
||||||
|
<nav>
|
||||||
|
<a href="/">Home</a> | 
|
||||||
|
<a href="/greenhouse" class="center">Gewächshaus</a> | 
|
||||||
|
<a href="/free_port" class="center">Wasseranschluß</a> | 
|
||||||
|
<a href="/garden" class="center">Garten</a>
|
||||||
|
</nav>
|
||||||
|
</footer>
|
||||||
|
</html>
|
@ -70,6 +70,7 @@
|
|||||||
<nav>
|
<nav>
|
||||||
<a href="/">Home</a> | 
|
<a href="/">Home</a> | 
|
||||||
<a href="/greenhouse" class="center">Gewächshaus</a> | 
|
<a href="/greenhouse" class="center">Gewächshaus</a> | 
|
||||||
|
<a href="/free_port" class="center">Wasseranschluß</a> | 
|
||||||
<a href="/garden" class="center">Garten</a>
|
<a href="/garden" class="center">Garten</a>
|
||||||
</nav>
|
</nav>
|
||||||
</footer>
|
</footer>
|
||||||
|
@ -118,6 +118,7 @@
|
|||||||
<nav>
|
<nav>
|
||||||
<a href="/">Home</a> | 
|
<a href="/">Home</a> | 
|
||||||
<a href="/greenhouse" class="center">Gewächshaus</a> | 
|
<a href="/greenhouse" class="center">Gewächshaus</a> | 
|
||||||
|
<a href="/free_port" class="center">Wasseranschluß</a> | 
|
||||||
<a href="/garden" class="center">Garten</a>
|
<a href="/garden" class="center">Garten</a>
|
||||||
</nav>
|
</nav>
|
||||||
</footer>
|
</footer>
|
||||||
|
@ -10,6 +10,7 @@
|
|||||||
<h1>Garten</h1>
|
<h1>Garten</h1>
|
||||||
<div class="center">
|
<div class="center">
|
||||||
<a href="/greenhouse">Gewächshaus</a><br>
|
<a href="/greenhouse">Gewächshaus</a><br>
|
||||||
|
<a href="/free_port">Wasseranschluß</a><br>
|
||||||
<a href="/garden">Garten</a>
|
<a href="/garden">Garten</a>
|
||||||
</div>
|
</div>
|
||||||
</body>
|
</body>
|
||||||
@ -18,6 +19,7 @@
|
|||||||
<nav>
|
<nav>
|
||||||
<a href="/">Home</a> | 
|
<a href="/">Home</a> | 
|
||||||
<a href="/greenhouse" class="center">Gewächshaus</a> | 
|
<a href="/greenhouse" class="center">Gewächshaus</a> | 
|
||||||
|
<a href="/free_port" class="center">Wasseranschluß</a> | 
|
||||||
<a href="/garden" class="center">Garten</a>
|
<a href="/garden" class="center">Garten</a>
|
||||||
</nav>
|
</nav>
|
||||||
</footer>
|
</footer>
|
||||||
|
2
setup.py
2
setup.py
@ -6,7 +6,7 @@ from setuptools import setup
|
|||||||
from setuptools.command.install import install
|
from setuptools.command.install import install
|
||||||
|
|
||||||
NAME = 'Greenhouseui'
|
NAME = 'Greenhouseui'
|
||||||
VERSION = '4'
|
VERSION = '5'
|
||||||
AUTHOR = 'Thomas Klaehn'
|
AUTHOR = 'Thomas Klaehn'
|
||||||
EMAIL = 'tkl@blackfinn.de'
|
EMAIL = 'tkl@blackfinn.de'
|
||||||
PACKAGES = ['greenhouseui']
|
PACKAGES = ['greenhouseui']
|
||||||
|
Loading…
Reference in New Issue
Block a user