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

implemented Text to show if there are no Jobs. 

fixed Bug #11
This commit is contained in:
schrom01 2022-08-27 20:47:03 +02:00
parent 18e78b7783
commit ab12bf7b02
4 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,7 +64,8 @@
</tbody>
</table>
</div>
<button onclick="buttonDeleteJobById('all')">{{ translater.getTranslation("delete and cancel all jobs")}}</button>
<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>

1
Webserver/Translater.py
View File

@ -36,6 +36,7 @@ class Translater:
"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."
}

6
Webserver/static/js/dashboard.js
View File

@ -17,7 +17,11 @@ function refreshZone(zone_json) {
function refreshPipeline(pipeline_html) {
document.getElementById("jobListBody").innerHTML = pipeline_html;
//alert("refreshing Pipeline");
var jobListBody = document.getElementById("jobListBody");
jobListBody.innerHTML = pipeline_html;
document.getElementById("text_no_jobs").style.display = jobListBody.childElementCount ? 'none' : 'block';
document.getElementById("button_delete_all_jobs").style.display = jobListBody.childElementCount ? 'block' : 'none';
}
function buttonDeleteJobById(jobId) {

8
Zone.py
View File

@ -55,6 +55,9 @@ class Zone:
self.state = False
case 2:
if (self.timeOver()):
if (self.planedDuration > 0):
self.setState = 3
else:
self.setState = 0
self.refreshStateAutomode()
else:
@ -81,6 +84,9 @@ class Zone:
self.state = False
case 2:
if (self.timeOver()):
if (self.planedDuration > 0):
self.setState = 3
else:
self.setState = 0
self.state = False
else:
@ -112,7 +118,7 @@ class Zone:
self.setState = 2
self.endTimeSetState = time.time() + duration
else:
if(self.setState == 1):
if(self.setState == 1 or self.setState == 2):
pass
elif(state):
self.setState = 3