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

Compare commits

base: Roman_Schenk:ca294dd17ae7d4968d2f3ee5183620f727c07a5f
Branches Tags
Roman_Schenk:master
Roman_Schenk:Webserver_Layout
..
compare: Roman_Schenk:ba3afd129dfbcc3db757905ab8998d10f77cc587
Branches Tags
Roman_Schenk:Webserver_Layout
Roman_Schenk:master

No commits in common. "ca294dd17ae7d4968d2f3ee5183620f727c07a5f" and "ba3afd129dfbcc3db757905ab8998d10f77cc587" have entirely different histories.
ca294dd17a ... ba3afd129d

13 changed files with 292 additions and 460 deletions
Show Stats Expand all files Collapse all files

87
Webserver/Templates/dashboard/dashboard.html
View File

@ -1,9 +1,7 @@
{% include "header.html" %}
<!DOCTYPE html> <!DOCTYPE html>
<html lang="de"> <html lang="de">
<head> <head>
<link rel="stylesheet" href="{{ url_for('static', filename='Styles/dashboard.css') }}"> <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> <title>{{ translater.getTranslation("Irrigation") }}{{ translater.getTranslation("system") }}</title>
@ -26,8 +24,26 @@
</style> </style>
<script>
function refreshZone(zone) {
executeAction('get_dashboard_zone_html', zone, '0', 'zone_'+ zone);
}
function refreshPipeline() {
executeAction('get_dashboard_pipeline_html', '0', '0', 'pipeline');
}
function refreshContent() {
refreshPipeline();
{% for zone in zoneManager.zones %}
refreshZone({{zone.number}});
{% endfor %}
}
</script>
</head> </head>
<body> <body>
{% include "header.html" %}
<main> <main>
@ -35,29 +51,15 @@
<h2>{{ translater.getTranslation("Dashboard") }}</h2> <h2>{{ translater.getTranslation("Dashboard") }}</h2>
<div id="pipeline" class="scrollingtable"> <h3>{{ translater.getTranslation("planed irrigationjobs") }}</h3>
<div> <p>
<div> <button onclick="refreshPipeline()">
<table> refresh
<caption>{{ translater.getTranslation("planed irrigationjobs") }}</caption> </button>
<thead> </p>
<tr> <div id="pipeline">
<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" %} {% include "dashboard/pipeline.html" %}
</tbody>
</table>
</div> </div>
Text unter Table
</div>
</div>
<h3>{{ translater.getTranslation("irrigation zones") }}</h3> <h3>{{ translater.getTranslation("irrigation zones") }}</h3>
@ -78,42 +80,3 @@
</body> </body>
</html> </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
View File

@ -1,7 +0,0 @@
<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>

26
Webserver/Templates/dashboard/pipeline.html
View File

@ -1,9 +1,21 @@
<table>
<thead>
<tr>
<td>ID</td>
<td>{{ translater.getTranslation("Zone") }}</td>
<td>{{ translater.getTranslation("planed duration") }}</td>
</tr>
{% for job in zoneManager.pipeLine %} </thead>
{% include "dashboard/irrigationJob.html" %}
{% endfor %}
<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="deleteJobById('delete_job_by_id','{{ job.id }}', {{ job.zone.number }})">{{ translater.getTranslation("delete") }}</button></td>
</tr>
{% endfor %}
</tbody>
</table>

71
Webserver/Templates/dashboard/zone.html
View File

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

15
Webserver/Templates/footer.html
View File

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

39
Webserver/Templates/header.html
View File

@ -1,20 +1,18 @@
<!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">
<script> <!-- <meta http-equiv="refresh" content="5" > -->
function sleep (time) { <script>
return new Promise((resolve) => setTimeout(resolve, time));
}
function executeAction(command, index, value, handleResponse) { function executeAction(command, index, value, elementId) {
var url = '{{url_for("executeAction")}}'; var url = '{{url_for("executeAction")}}';
var messageString = 'no'; var messageString = 'no';
var varString = 'command=' + command + '&index=' + index + '&value=' + value; var varString = 'command=' + command + '&index=' + index + '&value=' + value;
send_web_request(url, messageString, varString, handleResponse); send_web_request(url, messageString, varString, elementId);
} }
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;
@ -26,42 +24,47 @@
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(() => { sleep(1000).then(() => {
refreshContent(); refreshZone(zone);
refreshPipeline();
}); });
} }
function switchZoneState(command, zone, value) { function switchZoneState(command, zone, value) {
executeAction(command, zone, value); executeAction(command, zone, value);
sleep(1000).then(() => { sleep(1000).then(() => {
refreshContent(); refreshZone(zone);
refreshPipeline();
}); });
} }
function switchZoneStateByValueID(command, zone, valueID, valueFactor) { function switchZoneStateByValueID(command, zone, valueID, valueFactor) {
executeActionByValueID(command, zone, valueID, valueFactor); executeActionByValueID(command, zone, valueID, valueFactor);
sleep(1000).then(() => { sleep(1000).then(() => {
refreshContent(); refreshZone(zone);
refreshPipeline();
}); });
} }
function deleteJobsForZone(command, zone) { function deleteJobsForZone(command, zone) {
executeAction(command, zone); executeAction(command, zone);
sleep(1000).then(() => { sleep(1000).then(() => {
refreshContent(); refreshZone(zone);
refreshPipeline();
}); });
} }
function deleteJobById(command, jobId) { function deleteJobById(command, jobId, zone) {
executeAction(command, jobId); executeAction(command, jobId);
sleep(1000).then(() => { sleep(1000).then(() => {
refreshContent(); refreshZone(zone);
refreshPipeline();
}); });
} }
setInterval(refreshContent, {{ (zoneManager.systemSettings.cronJobFrequency + 1) * 1000 }})
</script>
</script> </head>
<body>
</head>
<body>
<header> <header>
<nav> <nav>
<ul> <ul>
@ -86,6 +89,6 @@
</header> </header>
<script src="{{ url_for('static', filename='js/action.js') }}"></script> <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>

34
Webserver/__init__.py
View File

@ -50,21 +50,6 @@ class Webserver:
value = int(value_str) value = int(value_str)
except: except:
pass 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)
except:
pass
match command: match command:
case "switch_zone_on": case "switch_zone_on":
if (index and value): if (index and value):
@ -109,14 +94,15 @@ class Webserver:
case "get_dashboard_pipeline_html": case "get_dashboard_pipeline_html":
return render_template("dashboard/pipeline.html", translater=self.translater, zoneManager=self.zoneManager) return render_template("dashboard/pipeline.html", translater=self.translater, zoneManager=self.zoneManager)
case "get_zone_list": case "get_zone_list":
return self.zoneManager.zonesToJSON(self.translater) return self.zoneManager.zonesToJSON()
case "get_zone_info": case "get_zone_info":
if (index): if (index):
zone = self.zoneManager.getZone(index) zone = self.zoneManager.getZone(index)
return zone.toJSON(self.translater) return zone.toJSON()
case "get_pipeline": case "get_pipeline":
return self.zoneManager.pipelineToJSON(self.translater) return self.zoneManager.pipelineToJSON()
return render_template('action.html', translater=self.translater, zones=self.zoneManager.zones, sucess=sucess) return self.zoneManager.zonesToJSON()
#return render_template('action.html', translater=self.translater, zones=self.zoneManager.zones, sucess=sucess)
@app.route('/dashboard') @app.route('/dashboard')
@ -127,16 +113,16 @@ class Webserver:
@app.route('/zones/<zoneNumber>') @app.route('/zones/<zoneNumber>')
def showZones(zoneNumber=False): def showZones(zoneNumber=False):
if (zoneNumber): if (zoneNumber):
return render_template('zones/zone.html', translater=self.translater, zoneManager=self.zoneManager, zone=self.zoneManager.getZone(zoneNumber)) return render_template('zones/zone.html', translater=self.translater, zone=self.zoneManager.getZone(zoneNumber))
else: else:
return render_template('zones/zones.html', translater=self.translater, zoneManager=self.zoneManager) return render_template('zones/zones.html', translater=self.translater, zones=self.zoneManager.zones)
@app.route('/times') @app.route('/times')
def showTimes(): def showTimes():
return render_template('times.html', translater=self.translater, zoneManager=self.zoneManager) return render_template('times.html', translater=self.translater)
@app.route('/system') @app.route('/system')
def showSystem(): def showSystem():
return render_template('system.html', translater=self.translater, zoneManager=self.zoneManager) return render_template('system.html', translater=self.translater)
app.run(debug=True, host="0.0.0.0", port=self.port) app.run(debug=True, port=self.port)

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

@ -1,5 +1,3 @@
#zones{ #zones{
display: grid; display: grid;
grid-template-columns: repeat(3, 1fr); grid-template-columns: repeat(3, 1fr);
@ -59,10 +57,6 @@ 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
View File

@ -1,118 +0,0 @@
.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*/

25
Webserver/static/js/webhook.js
View File

@ -1,4 +1,12 @@
function send_web_request(url, messageString, varString, handleResponse) { function sleep (time) {
return new Promise((resolve) => setTimeout(resolve, time));
}
function send_web_request(url, messageString, varString, elementId) {
// Browserkompatibles Request-Objekt erzeugen: // Browserkompatibles Request-Objekt erzeugen:
r = null; r = null;
@ -32,20 +40,17 @@ function send_web_request(url, messageString, varString, handleResponse) {
{ {
// HTTP-POST
r.onreadystatechange = function() {
if (this.readyState == 4 && this.status == 200) {
document.getElementById(elementId).innerHTML = this.responseText;
}
};
r.open('POST', url, true); r.open('POST', url, true);
r.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded'); 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); r.send(varString);

4
Zone.py
View File

@ -14,16 +14,14 @@ class Zone:
self.endTimeSetState = endTimeSetState self.endTimeSetState = endTimeSetState
self.planedDuration = planedDuration self.planedDuration = planedDuration
def toJSON(self, translater): def toJSON(self):
return { return {
"number": self.number, "number": self.number,
"name": self.name, "name": self.name,
"actualHumidity": self.actualHumidity, "actualHumidity": self.actualHumidity,
"desiredHumidity": self.desiredHumidity, "desiredHumidity": self.desiredHumidity,
"autoMode": self.autoMode, "autoMode": self.autoMode,
"operationMode_text": translater.getTranslation("automatic mode" if self.autoMode else "manual mode"),
"state": self.state, "state": self.state,
"state_text": translater.getTranslation("switched on" if self.state else "switched off"),
"setState": self.setState, "setState": self.setState,
"endTimeSetState" : self.endTimeSetState, "endTimeSetState" : self.endTimeSetState,
"planedDuration": self.planedDuration, "planedDuration": self.planedDuration,

16
ZoneManager.py
View File

@ -16,17 +16,17 @@ class ZoneManager:
self.pipeLine = [] self.pipeLine = []
self.piplineMutexLock = threading.Lock() self.piplineMutexLock = threading.Lock()
def zonesToJSON(self, translater): def zonesToJSON(self):
zoneList = [] zoneList = []
for zone in self.zones: for zone in self.zones:
zoneList.append(zone.toJSON(translater)) zoneList.append(zone.toJSON())
return zoneList return zoneList
def pipelineToJSON(self, translater): def pipelineToJSON(self):
jobList = [] jobList = []
with self.piplineMutexLock: with self.piplineMutexLock:
for irrigationJob in self.pipeLine: for irrigationJob in self.pipeLine:
jobList.append(irrigationJob.toJSON(translater)) jobList.append(irrigationJob.toJSON())
return jobList return jobList
@ -67,9 +67,7 @@ class ZoneManager:
return False return False
def switchZoneState(self, zone, state, duration, instant=False): def switchZoneState(self, zone, state, duration, instant=False):
if(not duration > 0): if(instant or self.systemSettings.multiZoneIrrigation or state==False ): #or (not self.isAnyZoneBusy())
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))
@ -117,10 +115,10 @@ 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): def toJSON(self):
return { return {
"id": self.id, "id": self.id,
"zone": self.zone.toJSON(translater), "zone": self.zone.toJSON(),
"duration": self.duration, "duration": self.duration,
} }

2
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(cronJobFrequency=0.5, dataDir="/Data", multiZoneIrrigation=False, defaultAutoIrrigationDuration=10, defaultManualIrrigationDuration=10, defaultManualOffDuration=10, webDurationOptions=[1, 5, 10, 15, 20, 25, 30, 45, 60]) systemSettings = SystemSettings(cronJobFrequency=2, 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)