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

Compare commits

base: Roman_Schenk/Bewaesserungsanlage:ba3afd129dfbcc3db757905ab8998d10f77cc587
Branches Tags
Roman_Schenk/Bewaesserungsanlage:master Roman_Schenk/Bewaesserungsanlage:Webserver_Layout
..
compare: Roman_Schenk/Bewaesserungsanlage:Webserver_Layout
Branches Tags
Roman_Schenk/Bewaesserungsanlage:Webserver_Layout Roman_Schenk/Bewaesserungsanlage:master
12 Commits
ba3afd129d .. Webserver_Layout
Author SHA1 Message Date
schrom01 0135609919 implemented alert to delete all jobs 
#8
 2022-08-27 22:06:58 +02:00
schrom01 0ed508f70d styling of scrolling Table 2022-08-27 21:01:50 +02:00
schrom01 ab12bf7b02 implemented Text to show if there are no Jobs. 
fixed Bug #11
 2022-08-27 20:47:03 +02:00
schrom01 18e78b7783 implemented to cancel all jobs if all jobs are deleted. 2022-08-27 20:02:49 +02:00
schrom01 cb9a3b6830 implemented Time formating 
solved #5
 2022-08-27 19:41:01 +02:00
schrom01 0264375d3f implemented Buttons to switch all Operation Modes 
#7
 2022-08-27 19:16:23 +02:00
schrom01 d5a9e4781c Fixed Bug #2 2022-08-27 19:08:50 +02:00
schrom01 279c9e74be implemented Action to switch Mode of all Zones. 
Fixed Bug #2
 2022-08-27 13:54:23 +02:00
schrom01 453542d431 refactoring file structure 2022-08-27 00:43:51 +02:00
schrom01 be897ab076 refactoring file structure 2022-08-27 00:43:15 +02: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
16 changed files with 546 additions and 304 deletions
Expand all files Collapse all files
Webserver/Templates/dashboard/dashboard.html
+46 -19
View File
@@ -1,7 +1,9 @@
{% 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>
@@ -24,26 +26,32 @@
</style> </style>
<script src="{{ url_for('static', filename='js/dashboard.js') }}"></script>
<script> <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() { function refreshContent() {
refreshPipeline(); executeAction('get_dashboard_pipeline_html', '0', '0', refreshPipeline);
{% for zone in zoneManager.zones %} {% for zone in zoneManager.zones %}
refreshZone({{zone.number}}); executeAction('get_zone_info', {{ zone.number }}, '0', refreshZone);
{% endfor %} {% endfor %}
} }
function buttonDeleteJobById(jobId) {
if(jobId == "all") {
if(confirm('{{ translater.getTranslation("delete all planed and cancel running jobs?")}}')){
document.getElementById("jobListBody").innerHTML = "";
} else {
return
}
} else {
var jobToDelete = document.getElementById("job_" + jobId);
document.getElementById("jobListBody").removeChild(jobToDelete);
}
deleteJobById('delete_job_by_id',jobId);
}
</script> </script>
</head> </head>
<body> <body>
{% include "header.html" %}
<main> <main>
@@ -51,18 +59,35 @@
<h2>{{ translater.getTranslation("Dashboard") }}</h2> <h2>{{ translater.getTranslation("Dashboard") }}</h2>
<h3>{{ translater.getTranslation("planed irrigationjobs") }}</h3> <div id="pipeline" class="scrollingtable">
<p> <div id="jobListTable">
<button onclick="refreshPipeline()"> <div>
refresh <table>
</button> <caption>{{ translater.getTranslation("planed irrigationjobs") }}</caption>
</p> <thead id="jobListHead">
<div id="pipeline"> <tr>
{% include "dashboard/pipeline.html" %} <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>
<p id="text_no_jobs">{{ translater.getTranslation("currently there are no planned jobs.")}}</p>
<button id="button_delete_all_jobs" onclick="buttonDeleteJobById('all')">{{ translater.getTranslation("delete and cancel all jobs")}}</button>
</div>
</div> </div>
<h3>{{ translater.getTranslation("irrigation zones") }}</h3> <h3>{{ translater.getTranslation("irrigation zones") }}</h3>
<button onclick="switchZoneMode(false, 'all')">{{ translater.getTranslation("switch all to")}} {{ translater.getTranslation("manual mode") }}</button>
<button onclick="switchZoneMode(true, 'all')">{{ translater.getTranslation("switch all to")}} {{ translater.getTranslation("automatic mode") }}</button>
<div id="zones"> <div id="zones">
{% for zone in zoneManager.zones %} {% for zone in zoneManager.zones %}
<div id="zone_{{ zone.number }}" class="zone"> <div id="zone_{{ zone.number }}" class="zone">
@@ -80,3 +105,5 @@
</body> </body>
</html> </html>
{% include "footer.html" %}
Webserver/Templates/dashboard/irrigationJob.html
+7
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))|string + " " + translater.getTranslation("minutes")}}</td>
<td><button onclick="buttonDeleteJobById('{{ job.id }}')">{{ translater.getTranslation("delete") }}</button></td>
</tr>
Webserver/Templates/dashboard/pipeline.html
+7 -19
View File
@@ -1,21 +1,9 @@
<table>
<thead>
<tr>
<td>ID</td>
<td>{{ translater.getTranslation("Zone") }}</td>
<td>{{ translater.getTranslation("planed duration") }}</td>
</tr>
</thead> {% for job in zoneManager.pipeLine %}
{% 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>
Webserver/Templates/dashboard/zone.html
+64 -77
View File
@@ -1,92 +1,79 @@
<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" id="state_text_zone_{{ zone.number }}">
{{ 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="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>
</td>
<td>
<button onclick="refreshZone({{ zone.number }})">
refresh
</button>
</td>
</tr> <a href="/zones/{{ zone.number}}">
{% if (zone.setState == 1 or zone.setState == 2) %} <h4 id="name_zone_{{ zone.number }}">{{ zone.name }}</h3>
</a>
<table>
<tbody>
<tr> <tr>
<td></td> <td class="icon">
<td></td> <span class="outer_dot">
<td> <span id="inner_icon_state_zone_{{ zone.number }}"></span>
{{translater.getTranslation("until") + zone.endTimeSetState|string}} </span>
</td> </td>
<td class="property">{{ translater.getTranslation("state") }}:</td>
<td class="value" id="state_text_zone_{{ zone.number }}"></td>
<td> <td>
<button onclick="switchZoneState({{'"switch_zone_off"' if zone.state else '"switch_zone_on"'}},'{{ zone.number }}', -1)">{{ translater.getTranslation("cancel") }}</button> <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> </td>
</tr> </tr>
{% endif %} <tr id="end_time_row_zone_{{ zone.number }}">
{% if zone.planedDuration > 0 %}
<tr>
<td></td> <td></td>
<td></td> <td></td>
<td> <td>
{{translater.getTranslation("irragation is planed for") + " " + ((zone.planedDuration/60)|int)|string + " " + translater.getTranslation("minutes") + "." }} {{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("irrigation is planed.") }}<br>{{ translater.getTranslation("planed duration")}}: <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> </tr>
<td> <tr>
<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 class="icon">
</td> <span class="outer_dot">
</tr> <span id="inner_icon_humidity_zone_{{ zone.number }}"></span>
<tr> </span>
<td class="icon"> </td>
<span class="outer_dot"> <td class="property">{{ translater.getTranslation("actual humidity") }}:</td>
<span class="inner_icon {{ 'dot_green' if(zone.actualHumidity >= zone.desiredHumidity) else 'dot_red' }}"></span> <td id="acutal_humidity_zone_{{ zone.number }}" class="value"></td>
</span> </tr>
</td> <tr>
<td class="property">{{ translater.getTranslation("actual humidity") }}:</td> <td class="icon">
<td class="value">{{ zone.actualHumidity}}</td>
</tr>
<tr>
<td class="icon">
</td> </td>
<td class="property">{{ translater.getTranslation("desired humidity") }}:</td> <td class="property">{{ translater.getTranslation("desired humidity") }}:</td>
<td class="value">{{ zone.desiredHumidity }}</td> <td id="desired_humidity_zone_{{ zone.number }}" class="value"></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
<p class="zone_number">{{ zone.number }}</p> <p class="zone_number">{{ zone.number }}</p>
Webserver/Templates/footer.html
+15
View File
@@ -0,0 +1,15 @@
<!DOCTYPE html>
<html lang="de">
<head>
<meta charset="UTF-8">
</head>
<body>
</body>
</html>
<script>
refreshContent();
setInterval(refreshContent, {{ (zoneManager.systemSettings.cronJobFrequency + 5) * 1000 }})
</script>
Webserver/Templates/header.html
+43 -83
View File
@@ -1,94 +1,54 @@
<!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 src="{{ url_for('static', filename='js/action.js') }}"></script>
<script> <script src="{{ url_for('static', filename='js/webhook.js') }}"></script>
<script>
function sleep (time) {
return new Promise((resolve) => setTimeout(resolve, time));
}
function executeAction(command, index, value, elementId) { function executeAction(command, index, value, handleResponse) {
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, elementId); 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);
} }
</script>
</head>
<body>
<header>
<nav>
<ul>
{% for item in nav.top %}
<li {{ 'class=active' if item.is_active else '' }}>
<a href="{{ item.url }}">
{{ item.label }}
</a>
</li>
{% endfor %}
</ul>
</nav>
function switchZoneMode(autoMode, zone) { <a class="heading" href="{{ url_for('startPage')}}">
executeAction('switch_zone_mode' ,zone, (autoMode ? 'automatic' : 'manual')); <img src="{{ url_for('static', filename='img/header/wassertropfen.png') }}" alt="" class="title-img">
sleep(1000).then(() => {
refreshZone(zone);
refreshPipeline();
});
} <h1>{{ translater.getTranslation("Irrigation") }}-<br>{{ translater.getTranslation("system") }}</h1>
function switchZoneState(command, zone, value) { </a>
executeAction(command, zone, value);
sleep(1000).then(() => {
refreshZone(zone);
refreshPipeline();
});
}
function switchZoneStateByValueID(command, zone, valueID, valueFactor) {
executeActionByValueID(command, zone, valueID, valueFactor);
sleep(1000).then(() => {
refreshZone(zone);
refreshPipeline();
});
}
function deleteJobsForZone(command, zone) {
executeAction(command, zone);
sleep(1000).then(() => {
refreshZone(zone);
refreshPipeline();
});
}
function deleteJobById(command, jobId, zone) {
executeAction(command, jobId);
sleep(1000).then(() => {
refreshZone(zone);
refreshPipeline();
});
}
<img src="{{ url_for('static', filename='img/header/blumenbeet.jpg') }}" alt="" class="header-img">
setInterval(refreshContent, {{ (zoneManager.systemSettings.cronJobFrequency + 1) * 1000 }}) </header>
</body>
</script>
</head>
<body>
<header>
<nav>
<ul>
{% for item in nav.top %}
<li {{ 'class=active' if item.is_active else '' }}>
<a href="{{ item.url }}">
{{ item.label }}
</a>
</li>
{% endfor %}
</ul>
</nav>
<a class="heading" href="{{ url_for('startPage')}}">
<img src="{{ url_for('static', filename='img/header/wassertropfen.png') }}" alt="" class="title-img">
<h1>{{ translater.getTranslation("Irrigation") }}-<br>{{ translater.getTranslation("system") }}</h1>
</a>
<img src="{{ url_for('static', filename='img/header/blumenbeet.jpg') }}" alt="" class="header-img">
</header>
<script src="{{ url_for('static', filename='js/action.js') }}"></script>
<script src="{{ url_for('static', filename='js/webhook.js') }}"></script>
</body>
</html> </html>
Webserver/Translater.py
+18 -1
View File
@@ -1,4 +1,6 @@
from enum import Enum from enum import Enum
from time import strftime
from time import gmtime
class Language(Enum): class Language(Enum):
ENGLISH = 1 ENGLISH = 1
GERMAN = 2 GERMAN = 2
@@ -27,11 +29,15 @@ class Translater:
"switch to automatic mode": "Auf Automatikbetrieb umstellen", "switch to automatic mode": "Auf Automatikbetrieb umstellen",
"minutes": "Minuten", "minutes": "Minuten",
"until": "bis", "until": "bis",
"irragation is planed for": "Bewässerung ist geplant für", "irrigation is planed.": "Bewässerung ist geplant.",
"planed irrigationjobs": "geplante Bewässerungsaufträge", "planed irrigationjobs": "geplante Bewässerungsaufträge",
"planed duration": "geplante Dauer", "planed duration": "geplante Dauer",
"cancel": "abbrechen", "cancel": "abbrechen",
"delete": "löschen", "delete": "löschen",
"delete and cancel all jobs": "alle Aufträge löschen und abbrechen",
"switch all to": "stelle alle um auf",
"currently there are no planned jobs.": "momentan sind keine Aufträge geplant.",
"delete all planed and cancel running jobs?": "Sollen alle geplanten Aufträge gelöscht und laufende abgerochen werden?",
} }
@@ -43,3 +49,14 @@ class Translater:
return self.dict_german[english_String] return self.dict_german[english_String]
case _: case _:
return "no translations for these language" return "no translations for these language"
def formatTime(self, timeInt):
format = ""
match self.language:
case Language.ENGLISH:
format = "%I.%S %p"
case Language.GERMAN:
format = "%H:%M:%S"
case _:
format = ""
return strftime(format, gmtime(timeInt))
Webserver/__init__.py
+85 -59
View File
@@ -34,7 +34,6 @@ class Webserver:
@app.route('/action', methods=['GET', 'POST']) @app.route('/action', 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
if(request.method == 'POST'): if(request.method == 'POST'):
try: try:
command = request.form['command'] command = request.form['command']
@@ -50,59 +49,86 @@ class Webserver:
value = int(value_str) value = int(value_str)
except: except:
pass pass
match command: elif(request.method == 'GET'):
case "switch_zone_on": try:
if (index and value): command = request.args['command']
self.zoneManager.switchZoneIndexState(zoneIndex=index, state=True, duration=value) except:
sucess = True pass
elif(index): try:
self.zoneManager.switchZoneIndexState(zoneIndex=index, state=True, duration=self.zoneManager.systemSettings.defaultManualIrrigationDuration) index_str = request.args['index']
sucess = True index = int(index_str)
case "switch_zone_off": except:
if (index and value): pass
self.zoneManager.switchZoneIndexState(zoneIndex=index, state=False, duration=value, instant=True) try:
sucess = True value_str = request.args['value']
elif(index): value = int(value_str)
self.zoneManager.switchZoneIndexState(zoneIndex=index, state=False, duration=self.zoneManager.systemSettings.defaultManualOffDuration, instant=True) except:
sucess = True pass
case "switch_zone_mode": match command:
if (index and value_str): case "switch_zone_on":
zone = self.zoneManager.getZone(index) if (index and value):
match value_str: self.zoneManager.switchZoneIndexState(zoneIndex=index, state=True, duration=value)
case "automatic": return "True"
zone.switchMode(autoMode=True) elif(index):
sucess = True self.zoneManager.switchZoneIndexState(zoneIndex=index, state=True, duration=self.zoneManager.systemSettings.defaultManualIrrigationDuration)
case "manual": return "True"
zone.switchMode(autoMode=False) case "switch_zone_off":
sucess = True if (index and value):
case "set_desired_humidity": self.zoneManager.switchZoneIndexState(zoneIndex=index, state=False, duration=value, instant=True)
if (index and value): return "True"
zone = self.zoneManager.getZone(index) elif(index):
zone.desiredHumidity = value self.zoneManager.switchZoneIndexState(zoneIndex=index, state=False, duration=self.zoneManager.systemSettings.defaultManualOffDuration, instant=True)
sucess = True return "True"
case "delete_jobs_for_zone": case "switch_zone_mode":
if (index): zonesToSwitch = []
zone = self.zoneManager.getZone(index) if(index_str == "all" and value_str):
self.zoneManager.deleteIrrigationJobsForZone(zone) zonesToSwitch = self.zoneManager.zones
case "delete_job_by_id": elif (index and value_str):
if (index): zonesToSwitch.append(self.zoneManager.getZone(index))
self.zoneManager.deleteIrrigationJobByID(index) else:
case "get_dashboard_zone_html": return "False"
if (index): automode = False
zone = self.zoneManager.getZone(index) if(value_str == "automatic"):
return render_template('dashboard/zone.html', translater=self.translater, zoneManager=self.zoneManager, zone=zone) automode = True
case "get_dashboard_pipeline_html": elif(value_str == "manual"):
return render_template("dashboard/pipeline.html", translater=self.translater, zoneManager=self.zoneManager) automode = False
case "get_zone_list": else:
return self.zoneManager.zonesToJSON() return "False"
case "get_zone_info": for zone in zonesToSwitch:
if (index): zone.switchMode(autoMode=automode)
zone = self.zoneManager.getZone(index) return "True"
return zone.toJSON() case "set_desired_humidity":
case "get_pipeline": if (index and value):
return self.zoneManager.pipelineToJSON() zone = self.zoneManager.getZone(index)
return self.zoneManager.zonesToJSON() zone.desiredHumidity = value
#return render_template('action.html', translater=self.translater, zones=self.zoneManager.zones, sucess=sucess) return "True"
case "delete_jobs_for_zone":
if (index):
zone = self.zoneManager.getZone(index)
self.zoneManager.deleteIrrigationJobsForZone(zone)
return "True"
case "delete_job_by_id":
if(index_str == "all"):
self.zoneManager.clearIrrigationJobs()
return "True"
if (index):
self.zoneManager.deleteIrrigationJobByID(index)
return "True"
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 "False"
@app.route('/dashboard') @app.route('/dashboard')
@@ -113,16 +139,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, 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/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)
Webserver/static/Styles/dashboard.css
+6
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;
}
Webserver/static/Styles/scrollingTable.css
+121
View File
@@ -0,0 +1,121 @@
.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: 25px;
padding-top: 25px; /*this determines top caption height*/
padding-bottom: 25px; /*this determines bottom caption height*/
text-align: left;
}
#button_delete_all_jobs{
margin-top: 25px;
}
.scrollingtable * {box-sizing: border-box;}
.scrollingtable > div {
position: relative;
border-top: 1px solid black; /*top table border*/
height: 100%;
padding-top: 25px; /*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: 200px;
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: -25px; /*inverse of column header height*/
/*margin-right: 17px;*/ /*uncomment if using % width*/
}
.scrollingtable > div > div > table > caption {
position: absolute;
top: -25px; /*inverse of caption height*/
margin-top: -1px; /*inverse of border-width*/
width: 100%;
font-weight: bold;
text-align: left;
}
.scrollingtable > div > div > table > * > tr > * {padding: 0;}
.scrollingtable > div > div > table > thead {
vertical-align: bottom;
white-space: nowrap;
text-align: left;
}
.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: 25px; /*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: 25px; /*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: 25px; /*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*/
Webserver/static/js/action.js
+31
View File
@@ -1 +1,32 @@
function switchZoneMode(autoMode, zone) {
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();
});
}
Webserver/static/js/dashboard.js
+32
View File
@@ -0,0 +1,32 @@
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.endTimeSetStateFormated;
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 refreshPipeline(pipeline_html) {
//alert("refreshing Pipeline");
var jobListBody = document.getElementById("jobListBody");
jobListBody.innerHTML = pipeline_html;
if(!jobListBody.childElementCount){
document.getElementById("button_delete_all_jobs").style.display = 'none';
document.getElementById("text_no_jobs").style.display = 'block';
} else {
document.getElementById("button_delete_all_jobs").style.display = 'block';
document.getElementById("text_no_jobs").style.display = 'none';
}
}
Webserver/static/js/webhook.js
+10 -15
View File
@@ -1,12 +1,4 @@
function sleep (time) { function send_web_request(url, messageString, varString, handleResponse) {
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;
@@ -40,17 +32,20 @@ function send_web_request(url, messageString, varString, elementId) {
{ {
// 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);
Zone.py
+23 -6
View File
@@ -14,16 +14,19 @@ class Zone:
self.endTimeSetState = endTimeSetState self.endTimeSetState = endTimeSetState
self.planedDuration = planedDuration self.planedDuration = planedDuration
def toJSON(self): def toJSON(self, translater):
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,
"endTimeSetStateFormated" : translater.formatTime(self.endTimeSetState),
"planedDuration": self.planedDuration, "planedDuration": self.planedDuration,
} }
@@ -43,13 +46,19 @@ class Zone:
self.zoneManager.switchZoneState(zone=self, state=True, duration=self.zoneManager.systemSettings.defaultAutoIrrigationDuration, instant=False) self.zoneManager.switchZoneState(zone=self, state=True, duration=self.zoneManager.systemSettings.defaultAutoIrrigationDuration, instant=False)
case 1: case 1:
if(self.timeOver()): if(self.timeOver()):
self.setState = 0 if (self.planedDuration > 0):
self.setState = 3
else:
self.setState = 0
self.refreshStateAutomode() self.refreshStateAutomode()
else: else:
self.state = False self.state = False
case 2: case 2:
if (self.timeOver()): if (self.timeOver()):
self.setState = 0 if (self.planedDuration > 0):
self.setState = 3
else:
self.setState = 0
self.refreshStateAutomode() self.refreshStateAutomode()
else: else:
self.state = True self.state = True
@@ -68,11 +77,17 @@ class Zone:
self.setState = 3 self.setState = 3
case 1: case 1:
if(self.timeOver()): if(self.timeOver()):
self.setState = 0 if (self.planedDuration > 0):
self.setState = 3
else:
self.setState = 0
self.state = False self.state = False
case 2: case 2:
if (self.timeOver()): if (self.timeOver()):
self.setState = 0 if (self.planedDuration > 0):
self.setState = 3
else:
self.setState = 0
self.state = False self.state = False
else: else:
self.state = True self.state = True
@@ -103,7 +118,9 @@ class Zone:
self.setState = 2 self.setState = 2
self.endTimeSetState = time.time() + duration self.endTimeSetState = time.time() + duration
else: else:
if(state): if(self.setState == 1 or self.setState == 2):
pass
elif(state):
self.setState = 3 self.setState = 3
self.refreshState() self.refreshState()
ZoneManager.py
+28 -15
View File
@@ -16,17 +16,17 @@ class ZoneManager:
self.pipeLine = [] self.pipeLine = []
self.piplineMutexLock = threading.Lock() self.piplineMutexLock = threading.Lock()
def zonesToJSON(self): def zonesToJSON(self, translater):
zoneList = [] zoneList = []
for zone in self.zones: for zone in self.zones:
zoneList.append(zone.toJSON()) zoneList.append(zone.toJSON(translater))
return zoneList return zoneList
def pipelineToJSON(self): def pipelineToJSON(self, translater):
jobList = [] jobList = []
with self.piplineMutexLock: with self.piplineMutexLock:
for irrigationJob in self.pipeLine: for irrigationJob in self.pipeLine:
jobList.append(irrigationJob.toJSON()) jobList.append(irrigationJob.toJSON(translater))
return jobList return jobList
@@ -60,6 +60,12 @@ class ZoneManager:
else: else:
i = i + 1 i = i + 1
def clearIrrigationJobs(self):
with self.piplineMutexLock:
self.pipeLine = []
for zone in self.zones:
self.switchZoneState(zone=zone, state=False, duration=-1, instant=True)
def isAnyZoneBusy(self): def isAnyZoneBusy(self):
for zone in self.zones: for zone in self.zones:
if(zone.state): if(zone.state):
@@ -67,14 +73,16 @@ 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))
def switchZoneIndexState(self, zoneIndex, state, duration, instant=False): def switchZoneIndexState(self, zoneIndex, state, duration, instant=False):
zone = self.getZone(zoneIndex) zone = self.getZone(zoneIndex)
self.switchZoneState(zone, state, duration, instant) self.switchZoneState(zone=zone, state=state, duration=duration, instant=instant)
def getPlanedDurationForZone(self, zone): def getPlanedDurationForZone(self, zone):
totalDuration = 0 totalDuration = 0
@@ -90,13 +98,18 @@ class ZoneManager:
def processPipeline(self): def processPipeline(self):
self.piplineMutexLock.acquire() self.piplineMutexLock.acquire()
if(len(self.pipeLine) > 0 and (not self.isAnyZoneBusy())): index = 0
irrigationJob = self.pipeLine[0] while(len(self.pipeLine) > index and (not self.isAnyZoneBusy())):
self.pipeLine.pop(0) irrigationJob = self.pipeLine[index]
self.piplineMutexLock.release() if(not irrigationJob.zone.setState == 1):
irrigationJob.process() self.pipeLine.pop(index)
else: self.piplineMutexLock.release()
self.piplineMutexLock.release() irrigationJob.process()
return
else:
index = index + 1
self.piplineMutexLock.release()
@@ -115,10 +128,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): def toJSON(self, translater):
return { return {
"id": self.id, "id": self.id,
"zone": self.zone.toJSON(), "zone": self.zone.toJSON(translater),
"duration": self.duration, "duration": self.duration,
} }
main.py
+1 -1
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=2, 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)