python/greenhouseui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: python:85d8ba58b4eb5ae5b469cfb0a51fdc640aed89ca
Branches Tags
python:master
python:4
..
compare: python:20788ca6a968bec93e73f711d21e62da376f0ff8
Branches Tags
python:master
python:4

4 Commits
85d8ba58b4 ... 20788ca6a9

Author SHA1 Message Date
Thomas Klaehn
20788ca6a9 version bump 3 2022-03-30 15:36:49 +02:00
Thomas Klaehn
b0b9783882 Water switch is only visible id auto water is off 2022-03-30 15:36:15 +02:00
Thomas Klaehn
11fdbc753d Heat switch is only visible id auto heat is off 2022-03-30 15:27:58 +02:00
Thomas Klaehn
140eb62927 Add .gitignore 2022-03-30 15:27:33 +02:00
4 changed files with 29 additions and 17 deletions
Show Stats Expand all files Collapse all files

2
.gitignore vendored Normal file
View File

@ -0,0 +1,2 @@
*.egg-info
build

8
greenhouseui/static/scripts/greenhouse.js
View File

@ -94,27 +94,35 @@ var parse_config = function (event) {
var config = JSON.parse(event) var config = JSON.parse(event)
var output = "einschalten" var output = "einschalten"
var visibility = 'hidden' var visibility = 'hidden'
var visibility_heat = 'visible'
if(config.heat && config.heat.id == '1') { if(config.heat && config.heat.id == '1') {
if(config.heat.autostate) { if(config.heat.autostate) {
output = "ausschalten" output = "ausschalten"
visibility = "visible" visibility = "visible"
visibility_heat = "hidden"
document.getElementById("on_temperature").innerHTML = config.heat.on_temperature; document.getElementById("on_temperature").innerHTML = config.heat.on_temperature;
document.getElementById("off_temperature").innerHTML = config.heat.off_temperature; document.getElementById("off_temperature").innerHTML = config.heat.off_temperature;
} }
document.getElementById("heat_switch_label").style.visibility = visibility_heat
document.getElementById("heat_switch").style.visibility = visibility_heat
document.getElementById("heat_auto_switch").value = output; document.getElementById("heat_auto_switch").value = output;
document.getElementById("config_temperatures").style.visibility = visibility document.getElementById("config_temperatures").style.visibility = visibility
} }
output = "einschalten" output = "einschalten"
visibility = 'hidden' visibility = 'hidden'
var visibility_water = "visible"
if(config.water && config.water.id == '1') { if(config.water && config.water.id == '1') {
if(config.water.autostate) { if(config.water.autostate) {
output = "ausschalten" output = "ausschalten"
visibility = "visible" visibility = "visible"
visibility_water = "hidden"
document.getElementById("water_on_one").value = config.water.times[0].on_time; 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_off_one").value = config.water.times[0].off_time;
document.getElementById("water_on_two").value = config.water.times[1].on_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("water_off_two").value = config.water.times[1].off_time;
} }
document.getElementById("water_switch_label").style.visibility = visibility_water
document.getElementById("water_switch").style.visibility = visibility_water
document.getElementById("water_auto_switch").value = output; document.getElementById("water_auto_switch").value = output;
document.getElementById("water_times").style.visibility = visibility document.getElementById("water_times").style.visibility = visibility
} }

34
greenhouseui/templates/index.html
View File

@ -20,20 +20,22 @@
<div> <div>
<img src="{{url_for('static', filename='greenhouse_temperature.png')}}"/> <img src="{{url_for('static', filename='greenhouse_temperature.png')}}"/>
</div> </div>
<table class="center"> <div>
<tr> <table class="center">
<td class="table_left">Heizung</td> <tr>
<td class="input"> <td class="table_left" id="heat_switch_label" style="visibility: hidden;">Heizung </td>
<input id="heat_switch" type="submit" value="" onclick="on_switch_heat()"></input> <td class="input">
</td> <input id="heat_switch" style="visibility: hidden;" type="submit" value="" onclick="on_switch_heat()"></input>
</tr> </td>
<tr> </tr>
<td class="table_left">Frostwächter</td> <tr>
<td class="input"> <td class="table_left">Frostwächter</td>
<input id="heat_auto_switch" type="submit" value="" onclick="on_switch_heat_autostate()"></input> <td class="input">
</td> <input id="heat_auto_switch" type="submit" value="" onclick="on_switch_heat_autostate()"></input>
</tr> </td>
</table> </tr>
</table>
</div>
<div id="config_temperatures" style="visibility:hidden;"> <div id="config_temperatures" style="visibility:hidden;">
<table class="center"> <table class="center">
<tr> <tr>
@ -61,9 +63,9 @@
<hr> <hr>
<table class="center"> <table class="center">
<tr> <tr>
<td class="table_left">Bewässerung</td> <td class="table_left" id="water_switch_label" style="visibility: hidden;">Bewässerung</td>
<td class="input"> <td class="input">
<input id="water_switch" type="submit" value="" onclick="on_switch_water()"></input> <input id="water_switch" style="visibility: hidden;" type="submit" value="" onclick="on_switch_water()"></input>
</td> </td>
</tr> </tr>
<tr> <tr>

2
setup.py
View File

@ -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 = '2' VERSION = '3'
AUTHOR = 'Thomas Klaehn' AUTHOR = 'Thomas Klaehn'
EMAIL = 'tkl@blackfinn.de' EMAIL = 'tkl@blackfinn.de'
PACKAGES = ['greenhouseui'] PACKAGES = ['greenhouseui']