implemented actions get_zone_list and get_pipeline
This commit is contained in:
schrom01
parent
8c861b3cbd
commit
2747b79f37
|
|
@ -6,19 +6,12 @@
|
|||
<link rel="stylesheet" href="{{ url_for('static', filename='Styles/switch.css') }}">
|
||||
<meta charset="UTF-8">
|
||||
<meta http-equiv="refresh" content="5" >
|
||||
|
||||
<script>
|
||||
<script>
|
||||
function executeAction(command, index, value) {
|
||||
send_web_request('{{url_for("executeAction")}}/' + command + '/' + index + '/' + value, 'no', 'variable');
|
||||
send_web_request('{{url_for("executeAction")}}', 'no', 'command=' + command + '&index=' + index + '&value=' + value);
|
||||
}
|
||||
function executeActionByValueID(command, index, valueID, valueFactor){
|
||||
var value = document.getElementById(valueID).value * valueFactor;
|
||||
executeAction(command, index, value);
|
||||
}
|
||||
function switchZoneMode(autoMode, zone) {
|
||||
executeAction('switch_zone_mode' ,zone, (autoMode ? 'automatic' : 'manual'))
|
||||
}
|
||||
</script>
|
||||
</script>
|
||||
|
||||
</head>
|
||||
<body>
|
||||
<header>
|
||||
|
|
@ -43,6 +36,7 @@
|
|||
<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>
|
||||
|
|
|
|||
|
|
@ -33,13 +33,20 @@ class Webserver:
|
|||
return redirect(url_for('showDashboard'))
|
||||
|
||||
@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):
|
||||
sucess = False
|
||||
if(request.method == 'POST'):
|
||||
try:
|
||||
command = request.form['command']
|
||||
except:
|
||||
pass
|
||||
try:
|
||||
index_str = request.form['index']
|
||||
index = int(index_str)
|
||||
except:
|
||||
pass
|
||||
try:
|
||||
value_str = request.form['value']
|
||||
value = int(value_str)
|
||||
except:
|
||||
pass
|
||||
|
|
@ -80,10 +87,13 @@ class Webserver:
|
|||
case "delete_job_by_id":
|
||||
if (index):
|
||||
self.zoneManager.deleteIrrigationJobByID(index)
|
||||
|
||||
|
||||
case "get_zone_list":
|
||||
return self.zoneManager.zonesToJSON()
|
||||
case "get_pipeline":
|
||||
return self.zoneManager.pipelineToJSON()
|
||||
return render_template('action.html', translater=self.translater, zones=self.zoneManager.zones, sucess=sucess)
|
||||
|
||||
|
||||
@app.route('/dashboard')
|
||||
def showDashboard():
|
||||
return render_template('dashboard.html', translater=self.translater, zoneManager=self.zoneManager)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,8 @@
|
|||
|
||||
function executeActionByValueID(command, index, valueID, valueFactor){
|
||||
var value = document.getElementById(valueID).value * valueFactor;
|
||||
executeAction(command, index, value);
|
||||
}
|
||||
function switchZoneMode(autoMode, zone) {
|
||||
executeAction('switch_zone_mode' ,zone, (autoMode ? 'automatic' : 'manual'))
|
||||
}
|
||||
14
Zone.py
14
Zone.py
|
|
@ -1,4 +1,5 @@
|
|||
import time
|
||||
import json
|
||||
|
||||
|
||||
class Zone:
|
||||
|
|
@ -13,6 +14,19 @@ class Zone:
|
|||
self.endTimeSetState = endTimeSetState
|
||||
self.planedDuration = planedDuration
|
||||
|
||||
def toJSON(self):
|
||||
return {
|
||||
"number": self.number,
|
||||
"name": self.name,
|
||||
"actualHumidity": self.actualHumidity,
|
||||
"desiredHumidity": self.desiredHumidity,
|
||||
"autoMode": self.autoMode,
|
||||
"state": self.state,
|
||||
"setState": self.setState,
|
||||
"endTimeSetState" : self.endTimeSetState,
|
||||
"planedDuration": self.planedDuration,
|
||||
}
|
||||
|
||||
def setZoneManager(self, zoneManager):
|
||||
self.zoneManager = zoneManager
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
import json
|
||||
import threading
|
||||
from random import Random
|
||||
from time import time
|
||||
|
||||
|
||||
from FileIO import FileIO
|
||||
|
||||
|
|
@ -15,6 +16,20 @@ class ZoneManager:
|
|||
self.pipeLine = []
|
||||
self.piplineMutexLock = threading.Lock()
|
||||
|
||||
def zonesToJSON(self):
|
||||
zoneList = []
|
||||
for zone in self.zones:
|
||||
zoneList.append(zone.toJSON())
|
||||
return zoneList
|
||||
|
||||
def pipelineToJSON(self):
|
||||
jobList = []
|
||||
with self.piplineMutexLock:
|
||||
for irrigationJob in self.pipeLine:
|
||||
jobList.append(irrigationJob.toJSON())
|
||||
return jobList
|
||||
|
||||
|
||||
def getZone(self, number):
|
||||
for zone in self.zones:
|
||||
if(zone.number == number):
|
||||
|
|
@ -100,5 +115,12 @@ class IrrigationJob:
|
|||
self.duration = duration
|
||||
self.zone.switchState(state=True, duration=duration, instant=False)
|
||||
|
||||
def toJSON(self):
|
||||
return {
|
||||
"id": self.id,
|
||||
"zone": self.zone.toJSON(),
|
||||
"duration": self.duration,
|
||||
}
|
||||
|
||||
def process(self):
|
||||
self.zone.switchState(state=True, duration=self.duration, instant=True)
|
||||
Loading…
Reference in New Issue