Roman_Schenk
/
Bewaesserungsanlage
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Compare commits

base: Roman_Schenk:0363682d7ceef0e351868abd6f39207d4ab070cb
Branches Tags
Roman_Schenk:master
Roman_Schenk:Webserver_Layout
...
compare: Roman_Schenk:4c77aa60704f2712d95220cca281a7952d581e94
Branches Tags
Roman_Schenk:Webserver_Layout
Roman_Schenk:master

7 Commits
0363682d7c ... 4c77aa6070

Author SHA1 Message Date
Roman Schenk 4c77aa6070 Merge pull request 'Autorefresh of Dashboard' (#3) from Webserver_Layout into master 
Reviewed-on: #3
 2022-08-26 15:31:54 -07:00
schrom01 ca294dd17a implemented autorefresh 2022-08-27 00:29:46 +02:00
schrom01 b1c371d9b3 implemented autorefresh 2022-08-27 00:29:22 +02:00
schrom01 ba3afd129d implemented autorefresh 2022-08-25 15:37:54 +02:00
schrom01 1066adcc63 moved Dashboard.html in speparate folder to refresh zones. 2022-08-25 13:24:11 +02:00
schrom01 442a7a8b11 implemented action get_zone_info 2022-08-24 21:20:54 +02:00
schrom01 2747b79f37 implemented actions get_zone_list and get_pipeline 2022-08-23 23:47:43 +02:00
19 changed files with 621 additions and 217 deletions
Show Stats Expand all files Collapse all files

3
SystemSettings.py
View File

@ -1,7 +1,8 @@
class SystemSettings: class SystemSettings:
def __init__(self, dataDir="/Data", multiZoneIrrigation=False, defaultAutoIrrigationDuration=10, defaultManualIrrigationDuration=10, defaultManualOffDuration=10, webDurationOptions=[5, 10, 15, 20, 25, 30, 45, 60]): def __init__(self, cronJobFrequency=2, dataDir="/Data", multiZoneIrrigation=False, defaultAutoIrrigationDuration=10, defaultManualIrrigationDuration=10, defaultManualOffDuration=10, webDurationOptions=[5, 10, 15, 20, 25, 30, 45, 60]):
self.cronJobFrequency = cronJobFrequency
self.dataDir = dataDir self.dataDir = dataDir
self.multiZoneIrrigation = multiZoneIrrigation self.multiZoneIrrigation = multiZoneIrrigation
self.defaultAutoIrrigationDuration = defaultAutoIrrigationDuration self.defaultAutoIrrigationDuration = defaultAutoIrrigationDuration

23
Webserver/Templates/action.html Normal file
View File

@ -0,0 +1,23 @@
<!DOCTYPE html>
<html lang="de">
<head>
<title>{{ translater.getTranslation("Irrigation") }}{{ translater.getTranslation("system") }}</title>
</head>
<body>
{% include "header.html" %}
<main>
<h2>Action</h2>
<div>
<p>
Sucess: {{ sucess }}
</p>
</div>
</main>
</body>
</html>

161
Webserver/Templates/dashboard.html
View File

@ -1,161 +0,0 @@
<!DOCTYPE html>
<html lang="de">
<head>
<link rel="stylesheet" href="{{ url_for('static', filename='Styles/dashboard.css') }}">
<title>{{ translater.getTranslation("Irrigation") }}{{ translater.getTranslation("system") }}</title>
<style>
@media screen and (min-width: 2051px){
#zones{
grid-template-rows: repeat( {{ (zoneManager.zones|length / 3) + 1 }} , minmax(150px, auto));
}
}
@media screen and (max-width: 2050px) and (min-width: 1351px){
#zones{
grid-template-rows: repeat( {{ (zoneManager.zones|length / 2) + 1 }} , minmax(150px, auto));
}
}
@media screen and (max-width: 1350px){
#zones{
grid-template-rows: repeat( {{ zoneManager.zones|length }} , minmax(150px, auto));
}
}
</style>
</head>
<body>
{% include "header.html" %}
<main>
<h2>{{ translater.getTranslation("Dashboard") }}</h2>
<h3>{{ translater.getTranslation("planed irrigationjobs") }}</h3>
<div id="pipeline">
<table>
<thead>
<tr>
<td>ID</td>
<td>{{ translater.getTranslation("Zone") }}</td>
<td>{{ translater.getTranslation("planed duration") }}</td>
</tr>
</thead>
<tbody>
{% for job in zoneManager.pipeLine %}
<tr>
<td>{{ job.id }}</td>
<td>{{ job.zone.number|string + ": " + job.zone.name }}</td>
<td>{{ ((job.duration/60)|int)|string + " " + translater.getTranslation("minutes")}}</td>
<td><button onclick="executeAction('delete_job_by_id','{{ job.id }}', 0)">{{ translater.getTranslation("delete") }}</button></td>
</tr>
{% endfor %}
</tbody>
</table>
</div>
<h3>{{ translater.getTranslation("irrigation zones") }}</h3>
<div id="zones">
{% for zone in zoneManager.zones %}
<div id="zone_{{ zone.number }}" class="zone">
<a href="/zones/{{ zone.number}}">
<h4>{{ zone.name }}</h3>
</a>
<table>
<tbody>
<tr>
<td class="icon">
<span class="outer_dot">
<span class="inner_icon {{ 'dot_green' if zone.state else 'dot_red' }}"></span>
</span>
</td>
<td class="property">{{ translater.getTranslation("state") }}:</td>
<td class="value">
{{ translater.getTranslation("switched on") if zone.state else translater.getTranslation("switched off") }}
</td>
<td>
<select id="duration_zone_{{ zone.number }}">
{% for option in zoneManager.systemSettings.webDurationOptions %}
<option value="{{ option }}">{{ option }} {{ translater.getTranslation("minutes") }}</option>
{% endfor %}
</select>
<button onclick="executeActionByValueID({{'"switch_zone_off"' if zone.state else '"switch_zone_on"'}},'{{ zone.number }}', 'duration_zone_{{ zone.number }}', 60)">{{ translater.getTranslation("turn off") if zone.state else translater.getTranslation("turn on") }}</button>
</td>
</tr>
{% if (zone.setState == 1 or zone.setState == 2) %}
<tr>
<td></td>
<td></td>
<td>
{{translater.getTranslation("until") + zone.endTimeSetState|string}}
</td>
<td>
<button onclick="executeAction({{'"switch_zone_off"' if zone.state else '"switch_zone_on"'}},'{{ zone.number }}', -1)">{{ translater.getTranslation("cancel") }}</button>
</td>
</tr>
{% endif %}
{% if zone.planedDuration > 0 %}
<tr>
<td></td>
<td></td>
<td>
{{translater.getTranslation("irragation is planed for") + " " + ((zone.planedDuration/60)|int)|string + " " + translater.getTranslation("minutes") + "." }}
</td>
<td>
<button onclick="executeAction('delete_jobs_for_zone','{{ zone.number }}', 0)">{{ translater.getTranslation("delete") }}</button>
</td>
</tr>
{% endif %}
<tr>
<td>
<label class="toggle">
<input type="checkbox" {{ "checked" if zone.autoMode }} onchange="switchZoneMode(this.checked, {{ zone.number }})">
<span class="slider"></span>
<span class="labels" data-on="A" data-off="H"></span>
</label>
</td>
<td class="property">{{ translater.getTranslation("operating mode") }}:</td>
<td class="value">{{translater.getTranslation("automatic mode") if zone.autoMode else translater.getTranslation("manual mode")}}</td>
<td>
<button onclick="executeAction('switch_zone_mode','{{ zone.number }}', '{{ 'manual' if zone.autoMode else 'automatic' }}')">{{translater.getTranslation("switch to manual mode") if zone.autoMode else translater.getTranslation("switch to automatic mode")}}</button>
</td>
</tr>
<tr>
<td class="icon">
<span class="outer_dot">
<span class="inner_icon {{ 'dot_green' if(zone.actualHumidity >= zone.desiredHumidity) else 'dot_red' }}"></span>
</span>
</td>
<td class="property">{{ translater.getTranslation("actual humidity") }}:</td>
<td class="value">{{ zone.actualHumidity}}</td>
</tr>
<tr>
<td class="icon">
</td>
<td class="property">{{ translater.getTranslation("desired humidity") }}:</td>
<td class="value">{{ zone.desiredHumidity }}</td>
</tr>
</tbody>
</table>
<p class="zone_number">{{ zone.number }}</p>
</div>
{% endfor %}
</div>
</main>
<p><br><br></p>
</body>
</html>

119
Webserver/Templates/dashboard/dashboard.html Normal file
View File

@ -0,0 +1,119 @@
{% include "header.html" %}
<!DOCTYPE html>
<html lang="de">
<head>
<link rel="stylesheet" href="{{ url_for('static', filename='Styles/dashboard.css') }}">
<link rel="stylesheet" href="{{ url_for('static', filename='Styles/scrollingTable.css') }}">
<title>{{ translater.getTranslation("Irrigation") }}{{ translater.getTranslation("system") }}</title>
<style>
@media screen and (min-width: 2051px){
#zones{
grid-template-rows: repeat( {{ (zoneManager.zones|length / 3) + 1 }} , minmax(150px, auto));
}
}
@media screen and (max-width: 2050px) and (min-width: 1351px){
#zones{
grid-template-rows: repeat( {{ (zoneManager.zones|length / 2) + 1 }} , minmax(150px, auto));
}
}
@media screen and (max-width: 1350px){
#zones{
grid-template-rows: repeat( {{ zoneManager.zones|length }} , minmax(150px, auto));
}
}
</style>
</head>
<body>
<main>
<h2>{{ translater.getTranslation("Dashboard") }}</h2>
<div id="pipeline" class="scrollingtable">
<div>
<div>
<table>
<caption>{{ translater.getTranslation("planed irrigationjobs") }}</caption>
<thead>
<tr>
<th><div label="Nr."></div></th>
<th><div label="{{ translater.getTranslation("Zone") }}"></div></th>
<th><div label="{{ translater.getTranslation("planed duration") }}"></div></th>
<th><div label="{{ translater.getTranslation("delete") }}"></div></th>
<th class="scrollbarhead"></th> <!--ALWAYS ADD THIS EXTRA CELL AT END OF HEADER ROW-->
</tr>
</thead>
<tbody id="jobListBody">
{% include "dashboard/pipeline.html" %}
</tbody>
</table>
</div>
Text unter Table
</div>
</div>
<h3>{{ translater.getTranslation("irrigation zones") }}</h3>
<div id="zones">
{% for zone in zoneManager.zones %}
<div id="zone_{{ zone.number }}" class="zone">
{% include "dashboard/zone.html" %}
</div>
{% endfor %}
</div>
</main>
<p><br><br></p>
</body>
</html>
<script>
function refreshZone(zone_json) {
const zone = JSON.parse(zone_json);
document.getElementById("name_zone_" + zone.number).innerHTML = zone.name;
document.getElementById("inner_icon_state_zone_" + zone.number).className = 'inner_icon ' + (zone.state ? 'dot_green' : 'dot_red');
document.getElementById("state_text_zone_" + zone.number).innerHTML = zone.state_text;
document.getElementById("end_time_row_zone_" + zone.number).style.display = ((zone.setState == 1 || zone.setState == 2) ? 'table-row' : 'none');
document.getElementById("end_time_zone_" + zone.number).innerHTML = zone.endTimeSetState;
document.getElementById("planed_duration_row_zone_" + zone.number).style.display = ((zone.planedDuration > 0) ? 'table-row' : 'none');
document.getElementById("planed_duration_zone" + zone.number).innerHTML = zone.planedDuration/60;
document.getElementById("inner_icon_mode_zone_" + zone.number).innerHTML = zone.autoMode ? 'A' : 'M';
document.getElementById("slider_state_zone_" + zone.number).checked = zone.autoMode ? true : false;
document.getElementById("mode_text_zone_" + zone.number).innerHTML = zone.operationMode_text;
document.getElementById("inner_icon_humidity_zone_" + zone.number).className = 'inner_icon ' + ((zone.actualHumidity >= zone.desiredHumidity) ? 'dot_green' : 'dot_red');
document.getElementById("acutal_humidity_zone_" + zone.number).innerHTML = zone.actualHumidity;
document.getElementById("desired_humidity_zone_" + zone.number).innerHTML = zone.desiredHumidity;
}
function buttonDeleteJobById(jobId) {
deleteJobById('delete_job_by_id',jobId);
var jobToDelete = document.getElementById("job_" + jobId);
document.getElementById("jobListBody").removeChild(jobToDelete);
}
function refreshPipeline(pipeline_html) {
document.getElementById("jobListBody").innerHTML = pipeline_html;
}
function refreshContent() {
executeAction('get_dashboard_pipeline_html', '0', '0', refreshPipeline);
{% for zone in zoneManager.zones %}
executeAction('get_zone_info', {{ zone.number }}, '0', refreshZone);
{% endfor %}
}
refreshContent();
</script>
{% include "footer.html" %}

7
Webserver/Templates/dashboard/irrigationJob.html Normal file
View File

@ -0,0 +1,7 @@
<tr id="job_{{ job.id }}">
<!-- <td>{{ job.id }}</td> -->
<td>{{ job.zone.number|string}}</td>
<td>{{job.zone.name }}</td>
<td>{{ ((job.duration/60)|int)|string + " " + translater.getTranslation("minutes")}}</td>
<td><button onclick="buttonDeleteJobById('{{ job.id }}')">{{ translater.getTranslation("delete") }}</button></td>
</tr>

9
Webserver/Templates/dashboard/pipeline.html Normal file
View File

@ -0,0 +1,9 @@
{% for job in zoneManager.pipeLine %}
{% include "dashboard/irrigationJob.html" %}
{% endfor %}

79
Webserver/Templates/dashboard/zone.html Normal file
View File

@ -0,0 +1,79 @@
<a href="/zones/{{ zone.number}}">
<h4 id="name_zone_{{ zone.number }}">{{ zone.name }}</h3>
</a>
<table>
<tbody>
<tr>
<td class="icon">
<span class="outer_dot">
<span id="inner_icon_state_zone_{{ zone.number }}"></span>
</span>
</td>
<td class="property">{{ translater.getTranslation("state") }}:</td>
<td class="value" id="state_text_zone_{{ zone.number }}"></td>
<td>
<select id="duration_zone_{{ zone.number }}">
{% for option in zoneManager.systemSettings.webDurationOptions %}
<option value="{{ option }}">{{ option }} {{ translater.getTranslation("minutes") }}</option>
{% endfor %}
</select>
<button onclick="switchZoneStateByValueID('switch_zone_on','{{ zone.number }}', 'duration_zone_{{ zone.number }}', 60)">{{ translater.getTranslation("turn on") }}</button>
<button onclick="switchZoneStateByValueID('switch_zone_off','{{ zone.number }}', 'duration_zone_{{ zone.number }}', 60)">{{ translater.getTranslation("turn off") }}</button>
</td>
</tr>
<tr id="end_time_row_zone_{{ zone.number }}">
<td></td>
<td></td>
<td>
{{translater.getTranslation("until") }} <p id="end_time_zone_{{ zone.number }}" class="end_time_value"></p>
</td>
<td>
<button onclick="switchZoneState('switch_zone_off','{{ zone.number }}', -1)">{{ translater.getTranslation("cancel") }}</button>
</td>
</tr>
<tr id="planed_duration_row_zone_{{ zone.number }}">
<td></td>
<td></td>
<td>
{{translater.getTranslation("irragation is planed for") }} <p id="planed_duration_zone{{ zone.number }}" class="planed_duration_value"></p> {{ translater.getTranslation("minutes") + "." }}
</td>
<td>
<button onclick="deleteJobsForZone('delete_jobs_for_zone','{{ zone.number }}')">{{ translater.getTranslation("delete") }}</button>
</td>
</tr>
<tr>
<td class="icon">
<span class="outer_dot">
<p id="inner_icon_mode_zone_{{ zone.number }}" class="inner_icon"></p>
</span>
</td>
<td>
<label class="toggle">
<input type="checkbox" id="slider_state_zone_{{ zone.number }}" onchange="switchZoneMode(this.checked, {{ zone.number }})">
<span class="slider"></span>
<span class="labels" data-on="A" data-off="M"></span>
</label>
</td>
<td class="property">{{ translater.getTranslation("operating mode") }}:</td>
<td id="mode_text_zone_{{ zone.number }}" class="value"></td>
</tr>
<tr>
<td class="icon">
<span class="outer_dot">
<span id="inner_icon_humidity_zone_{{ zone.number }}"></span>
</span>
</td>
<td class="property">{{ translater.getTranslation("actual humidity") }}:</td>
<td id="acutal_humidity_zone_{{ zone.number }}" class="value"></td>
</tr>
<tr>
<td class="icon">
</td>
<td class="property">{{ translater.getTranslation("desired humidity") }}:</td>
<td id="desired_humidity_zone_{{ zone.number }}" class="value"></td>
</tr>
</tbody>
</table>
<p class="zone_number">{{ zone.number }}</p>

15
Webserver/Templates/footer.html Normal file
View File

@ -0,0 +1,15 @@
<!DOCTYPE html>
<html lang="de">
<head>
<meta charset="UTF-8">
</head>
<body>
</body>
</html>
<script>
setInterval(refreshContent, {{ (zoneManager.systemSettings.cronJobFrequency + 5) * 1000 }})
</script>

60
Webserver/Templates/header.html
View File

@ -1,26 +1,67 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="de"> <html lang="de">
<head> <head>
<link rel="stylesheet" href="{{ url_for('static', filename='Styles/header.css') }}"> <link rel="stylesheet" href="{{ url_for('static', filename='Styles/header.css') }}">
<link rel="stylesheet" href="{{ url_for('static', filename='Styles/main.css') }}"> <link rel="stylesheet" href="{{ url_for('static', filename='Styles/main.css') }}">
<link rel="stylesheet" href="{{ url_for('static', filename='Styles/switch.css') }}"> <link rel="stylesheet" href="{{ url_for('static', filename='Styles/switch.css') }}">
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta http-equiv="refresh" content="5" >
<script> <script>
function executeAction(command, index, value) { function sleep (time) {
send_web_request('{{url_for("executeAction")}}/' + command + '/' + index + '/' + value, 'no', 'variable'); return new Promise((resolve) => setTimeout(resolve, time));
}
function executeAction(command, index, value, handleResponse) {
var url = '{{url_for("executeAction")}}';
var messageString = 'no';
var varString = 'command=' + command + '&index=' + index + '&value=' + value;
send_web_request(url, messageString, varString, handleResponse);
} }
function executeActionByValueID(command, index, valueID, valueFactor){ function executeActionByValueID(command, index, valueID, valueFactor){
var value = document.getElementById(valueID).value * valueFactor; var value = document.getElementById(valueID).value * valueFactor;
executeAction(command, index, value); executeAction(command, index, value);
} }
function switchZoneMode(autoMode, zone) { function switchZoneMode(autoMode, zone) {
executeAction('switch_zone_mode' ,zone, (autoMode ? 'automatic' : 'manual')) executeAction('switch_zone_mode' ,zone, (autoMode ? 'automatic' : 'manual'));
sleep(1000).then(() => {
refreshContent();
});
} }
function switchZoneState(command, zone, value) {
executeAction(command, zone, value);
sleep(1000).then(() => {
refreshContent();
});
}
function switchZoneStateByValueID(command, zone, valueID, valueFactor) {
executeActionByValueID(command, zone, valueID, valueFactor);
sleep(1000).then(() => {
refreshContent();
});
}
function deleteJobsForZone(command, zone) {
executeAction(command, zone);
sleep(1000).then(() => {
refreshContent();
});
}
function deleteJobById(command, jobId) {
executeAction(command, jobId);
sleep(1000).then(() => {
refreshContent();
});
}
</script> </script>
</head>
<body> </head>
<body>
<header> <header>
<nav> <nav>
<ul> <ul>
@ -43,7 +84,8 @@
<img src="{{ url_for('static', filename='img/header/blumenbeet.jpg') }}" alt="" class="header-img"> <img src="{{ url_for('static', filename='img/header/blumenbeet.jpg') }}" alt="" class="header-img">
</header> </header>
<script src="{{ url_for('static', filename='js/action.js') }}"></script>
<script src="{{ url_for('static', filename='js/webhook.js') }}"></script> <script src="{{ url_for('static', filename='js/webhook.js') }}"></script>
</body> </body>
</html> </html>

0
Webserver/Templates/zone.html → Webserver/Templates/zones/zone.html
View File

0
Webserver/Templates/zones.html → Webserver/Templates/zones/zones.html
View File

57
Webserver/__init__.py
View File

@ -33,13 +33,35 @@ class Webserver:
return redirect(url_for('showDashboard')) return redirect(url_for('showDashboard'))
@app.route('/action', methods=['GET', 'POST']) @app.route('/action', methods=['GET', 'POST'])
@app.route('/action/<command>', methods=['GET', 'POST'])
@app.route('/action/<command>/<index_str>', methods=['GET', 'POST'])
@app.route('/action/<command>/<index_str>/<value_str>', methods=['GET', 'POST'])
def executeAction(command=False, index_str=False, value_str=False): def executeAction(command=False, index_str=False, value_str=False):
sucess = False sucess = False
if(request.method == 'POST'):
try: try:
command = request.form['command']
except:
pass
try:
index_str = request.form['index']
index = int(index_str) index = int(index_str)
except:
pass
try:
value_str = request.form['value']
value = int(value_str)
except:
pass
elif(request.method == 'GET'):
try:
command = request.args['command']
except:
pass
try:
index_str = request.args['index']
index = int(index_str)
except:
pass
try:
value_str = request.args['value']
value = int(value_str) value = int(value_str)
except: except:
pass pass
@ -80,28 +102,41 @@ class Webserver:
case "delete_job_by_id": case "delete_job_by_id":
if (index): if (index):
self.zoneManager.deleteIrrigationJobByID(index) self.zoneManager.deleteIrrigationJobByID(index)
case "get_dashboard_zone_html":
if (index):
zone = self.zoneManager.getZone(index)
return render_template('dashboard/zone.html', translater=self.translater, zoneManager=self.zoneManager, zone=zone)
case "get_dashboard_pipeline_html":
return render_template("dashboard/pipeline.html", translater=self.translater, zoneManager=self.zoneManager)
case "get_zone_list":
return self.zoneManager.zonesToJSON(self.translater)
case "get_zone_info":
if (index):
zone = self.zoneManager.getZone(index)
return zone.toJSON(self.translater)
case "get_pipeline":
return self.zoneManager.pipelineToJSON(self.translater)
return render_template('action.html', translater=self.translater, zones=self.zoneManager.zones, sucess=sucess) return render_template('action.html', translater=self.translater, zones=self.zoneManager.zones, sucess=sucess)
@app.route('/dashboard') @app.route('/dashboard')
def showDashboard(): def showDashboard():
return render_template('dashboard.html', translater=self.translater, zoneManager=self.zoneManager) return render_template('dashboard/dashboard.html', translater=self.translater, zoneManager=self.zoneManager)
@app.route('/zones') @app.route('/zones')
@app.route('/zones/<zoneNumber>') @app.route('/zones/<zoneNumber>')
def showZones(zoneNumber=False): def showZones(zoneNumber=False):
if (zoneNumber): if (zoneNumber):
return render_template('zone.html', translater=self.translater, zone=self.zoneManager.getZone(zoneNumber)) return render_template('zones/zone.html', translater=self.translater, zoneManager=self.zoneManager, zone=self.zoneManager.getZone(zoneNumber))
else: else:
return render_template('zones.html', translater=self.translater, zones=self.zoneManager.zones) return render_template('zones/zones.html', translater=self.translater, zoneManager=self.zoneManager)
@app.route('/times') @app.route('/times')
def showTimes(): def showTimes():
return render_template('times.html', translater=self.translater) return render_template('times.html', translater=self.translater, zoneManager=self.zoneManager)
@app.route('/system') @app.route('/system')
def showSystem(): def showSystem():
return render_template('system.html', translater=self.translater) return render_template('system.html', translater=self.translater, zoneManager=self.zoneManager)
app.run(debug=True, port=self.port) app.run(debug=True, host="0.0.0.0", port=self.port)

6
Webserver/static/Styles/dashboard.css
View File

@ -1,3 +1,5 @@
#zones{ #zones{
display: grid; display: grid;
grid-template-columns: repeat(3, 1fr); grid-template-columns: repeat(3, 1fr);
@ -57,6 +59,10 @@ td.value{
text-align: left; text-align: left;
position: relative; position: relative;
} }
p.end_time_value, p.planed_duration_value {
display: inline;
}

118
Webserver/static/Styles/scrollingTable.css Normal file
View File

@ -0,0 +1,118 @@
.scrollingtable {
box-sizing: border-box;
display: inline-block;
vertical-align: middle;
overflow: hidden;
width: auto; /*set table width here if using fixed value*/
/*min-width: 100%;*/ /*set table width here if using %*/
height: 300px; /*set table height here; can be fixed value or %*/
/*min-height: 104px;*/ /*if using % height, make this at least large enough to fit scrollbar arrows + captions + thead*/
font-family: Verdana, Tahoma, sans-serif;
font-size: 15px;
line-height: 20px;
padding-top: 20px; /*this determines top caption height*/
padding-bottom: 20px; /*this determines bottom caption height*/
text-align: left;
}
.scrollingtable * {box-sizing: border-box;}
.scrollingtable > div {
position: relative;
border-top: 1px solid black; /*top table border*/
height: 100%;
padding-top: 20px; /*this determines column header height*/
}
.scrollingtable > div:before {
top: 0;
background: cornflowerblue; /*column header background color*/
}
.scrollingtable > div:before,
.scrollingtable > div > div:after {
content: "";
position: absolute;
z-index: -1;
width: 100%;
height: 50%;
left: 0;
}
.scrollingtable > div > div {
/*min-height: 43px;*/ /*if using % height, make this at least large enough to fit scrollbar arrows*/
max-height: 100%;
overflow: scroll; /*set to auto if using fixed or % width; else scroll*/
overflow-x: hidden;
border: 1px solid black; /*border around table body*/
}
.scrollingtable > div > div:after {background: white;} /*match page background color*/
.scrollingtable > div > div > table {
width: 100%;
border-spacing: 0;
margin-top: -20px; /*inverse of column header height*/
/*margin-right: 17px;*/ /*uncomment if using % width*/
}
.scrollingtable > div > div > table > caption {
position: absolute;
top: -20px; /*inverse of caption height*/
margin-top: -1px; /*inverse of border-width*/
width: 100%;
font-weight: bold;
text-align: center;
}
.scrollingtable > div > div > table > * > tr > * {padding: 0;}
.scrollingtable > div > div > table > thead {
vertical-align: bottom;
white-space: nowrap;
text-align: center;
}
.scrollingtable > div > div > table > thead > tr > * > div {
display: inline-block;
padding: 0 6px 0 6px; /*header cell padding*/
}
.scrollingtable > div > div > table > thead > tr > :first-child:before {
content: "";
position: absolute;
top: 0;
left: 0;
height: 20px; /*match column header height*/
border-left: 1px solid black; /*leftmost header border*/
}
.scrollingtable > div > div > table > thead > tr > * > div[label]:before,
.scrollingtable > div > div > table > thead > tr > * > div > div:first-child,
.scrollingtable > div > div > table > thead > tr > * + :before {
position: absolute;
top: 0;
white-space: pre-wrap;
color: white; /*header row font color*/
}
.scrollingtable > div > div > table > thead > tr > * > div[label]:before,
.scrollingtable > div > div > table > thead > tr > * > div[label]:after {content: attr(label);}
.scrollingtable > div > div > table > thead > tr > * + :before {
content: "";
display: block;
min-height: 20px; /*match column header height*/
padding-top: 1px;
border-left: 1px solid black; /*borders between header cells*/
}
.scrollingtable .scrollbarhead {float: right;}
.scrollingtable .scrollbarhead:before {
position: absolute;
width: 100px;
top: -1px; /*inverse border-width*/
background: white; /*match page background color*/
}
.scrollingtable > div > div > table > tbody > tr:after {
content: "";
display: table-cell;
position: relative;
padding: 0;
border-top: 1px solid black;
top: -1px; /*inverse of border width*/
}
.scrollingtable > div > div > table > tbody {vertical-align: top;}
.scrollingtable > div > div > table > tbody > tr {background: white;}
.scrollingtable > div > div > table > tbody > tr > * {
border-bottom: 1px solid black;
padding: 0 6px 0 6px;
height: 20px; /*match column header height*/
}
.scrollingtable > div > div > table > tbody:last-of-type > tr:last-child > * {border-bottom: none;}
.scrollingtable > div > div > table > tbody > tr:nth-child(even) {background: gainsboro;} /*alternate row color*/
.scrollingtable > div > div > table > tbody > tr > * + * {border-left: 1px solid black;} /*borders between body cells*/

1
Webserver/static/js/action.js Normal file
View File

@ -0,0 +1 @@

70
Webserver/static/js/webhook.js Normal file
View File

@ -0,0 +1,70 @@
function send_web_request(url, messageString, varString, handleResponse) {
// Browserkompatibles Request-Objekt erzeugen:
r = null;
if(window.XMLHttpRequest)
{
r = new XMLHttpRequest();
}
else if(window.ActiveXObject)
{
try
{
r = new ActiveXObject('Msxml2.XMLHTTP');
}
catch(e1)
{
try
{
r = new ActiveXObject('Microsoft.XMLHTTP');
}
catch(e2)
{
alert("Ein Fehler ist aufgetreten. Bitte versuchen Sie es erneut.");
}
}
}
// Wenn Request-Objekt vorhanden, dann Anfrage senden:
if(r != null)
{
r.open('POST', url, true);
r.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
if(handleResponse != null) {
// HTTP-POST
r.onreadystatechange = function() {
if (this.readyState == 4 && this.status == 200) {
handleResponse(this.responseText);
}
};
}
r.send(varString);
if(messageString != 'no')
{
alert(messageString);
}
sleep(500).then(() => {
//window.location.href = window.location.href;
//document.location.reload();
});
}
else
{
alert("Ein Fehler ist aufgetreten. Bitte versuchen Sie es erneut.");
}
}

16
Zone.py
View File

@ -1,4 +1,5 @@
import time import time
import json
class Zone: class Zone:
@ -13,6 +14,21 @@ class Zone:
self.endTimeSetState = endTimeSetState self.endTimeSetState = endTimeSetState
self.planedDuration = planedDuration self.planedDuration = planedDuration
def toJSON(self, translater):
return {
"number": self.number,
"name": self.name,
"actualHumidity": self.actualHumidity,
"desiredHumidity": self.desiredHumidity,
"autoMode": self.autoMode,
"operationMode_text": translater.getTranslation("automatic mode" if self.autoMode else "manual mode"),
"state": self.state,
"state_text": translater.getTranslation("switched on" if self.state else "switched off"),
"setState": self.setState,
"endTimeSetState" : self.endTimeSetState,
"planedDuration": self.planedDuration,
}
def setZoneManager(self, zoneManager): def setZoneManager(self, zoneManager):
self.zoneManager = zoneManager self.zoneManager = zoneManager

28
ZoneManager.py
View File

@ -1,6 +1,7 @@
import json
import threading import threading
from random import Random from random import Random
from time import time
from FileIO import FileIO from FileIO import FileIO
@ -15,6 +16,20 @@ class ZoneManager:
self.pipeLine = [] self.pipeLine = []
self.piplineMutexLock = threading.Lock() self.piplineMutexLock = threading.Lock()
def zonesToJSON(self, translater):
zoneList = []
for zone in self.zones:
zoneList.append(zone.toJSON(translater))
return zoneList
def pipelineToJSON(self, translater):
jobList = []
with self.piplineMutexLock:
for irrigationJob in self.pipeLine:
jobList.append(irrigationJob.toJSON(translater))
return jobList
def getZone(self, number): def getZone(self, number):
for zone in self.zones: for zone in self.zones:
if(zone.number == number): if(zone.number == number):
@ -52,7 +67,9 @@ class ZoneManager:
return False return False
def switchZoneState(self, zone, state, duration, instant=False): def switchZoneState(self, zone, state, duration, instant=False):
if(instant or self.systemSettings.multiZoneIrrigation or state==False ): #or (not self.isAnyZoneBusy()) if(not duration > 0):
zone.switchState(state=False, duration=0, instant=True)
elif(instant or self.systemSettings.multiZoneIrrigation or state==False ): #or (not self.isAnyZoneBusy())
zone.switchState(state=state, duration=duration, instant=True) zone.switchState(state=state, duration=duration, instant=True)
else: else:
self.addIrrigationJob(IrrigationJob(id=self.random.randint(a=100000000, b=999999999), zone=zone, duration=duration)) self.addIrrigationJob(IrrigationJob(id=self.random.randint(a=100000000, b=999999999), zone=zone, duration=duration))
@ -100,5 +117,12 @@ class IrrigationJob:
self.duration = duration self.duration = duration
self.zone.switchState(state=True, duration=duration, instant=False) self.zone.switchState(state=True, duration=duration, instant=False)
def toJSON(self, translater):
return {
"id": self.id,
"zone": self.zone.toJSON(translater),
"duration": self.duration,
}
def process(self): def process(self):
self.zone.switchState(state=True, duration=self.duration, instant=True) self.zone.switchState(state=True, duration=self.duration, instant=True)

4
main.py
View File

@ -6,7 +6,7 @@ from ZoneManager import ZoneManager
from SystemSettings import SystemSettings from SystemSettings import SystemSettings
from FileIO import FileIO from FileIO import FileIO
systemSettings = SystemSettings(dataDir="/Data", multiZoneIrrigation=False, defaultAutoIrrigationDuration=10, defaultManualIrrigationDuration=10, defaultManualOffDuration=10, webDurationOptions=[1, 5, 10, 15, 20, 25, 30, 45, 60]) systemSettings = SystemSettings(cronJobFrequency=0.5, dataDir="/Data", multiZoneIrrigation=False, defaultAutoIrrigationDuration=10, defaultManualIrrigationDuration=10, defaultManualOffDuration=10, webDurationOptions=[1, 5, 10, 15, 20, 25, 30, 45, 60])
fileIO = FileIO(systemSettings) fileIO = FileIO(systemSettings)
zoneManager = ZoneManager(systemSettings=systemSettings, fileIO=fileIO) zoneManager = ZoneManager(systemSettings=systemSettings, fileIO=fileIO)
webserver = Webserver(zoneManager=zoneManager, port=80) webserver = Webserver(zoneManager=zoneManager, port=80)
@ -15,7 +15,7 @@ def cronJobs():
while True: while True:
zoneManager.cronJobs() zoneManager.cronJobs()
print("Cronjobs done\nactual Time: " + str(time.time())) print("Cronjobs done\nactual Time: " + str(time.time()))
time.sleep(0.5) time.sleep(systemSettings.cronJobFrequency)
if __name__ == "__main__": if __name__ == "__main__":
cronjob_Thread = threading.Thread(target=cronJobs) cronjob_Thread = threading.Thread(target=cronJobs)