Egalware/AnaLogger
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Creazione settings, Set frequency, Fix vari

Browse Source
This commit is contained in:
Marco Locatelli
2021-03-23 15:47:32 +01:00
parent 7a0b7086db
commit 9913b3d1a2
7 changed files with 108 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
logger/PyLog.txt
+4 -1
View File
@@ -49,4 +49,7 @@ Caught error: 'NoneType' object has no attribute 'decode' at time: 2021-03-23 12
Program end. Ctrl+C from user at time: 2021-03-23 12:48:33.227212
Program end. Ctrl+C from user at time: 2021-03-23 12:52:51.386359
Caught error: 'NoneType' object has no attribute 'decode' at time: 2021-03-23 12:53:15.167221
Program end. Ctrl+C from user at time: 2021-03-23 14:12:15.324783
Program end. Ctrl+C from user at time: 2021-03-23 14:12:15.324783
Program end. Ctrl+C from user at time: 2021-03-23 15:23:23.456196
Program end. Ctrl+C from user at time: 2021-03-23 15:31:55.154641
Program end. Ctrl+C from user at time: 2021-03-23 15:33:33.517326
server/FlythisServer.py
+15 -5
View File
@@ -37,6 +37,7 @@ def main():
'title' : 'Home',
'timeSrv' : redSrv0.get('RTDATA:CH:SRVTIME').decode('utf-8'),
'timeLog' : redSrv0.get('RTDATA:CH:RECTIME').decode('utf-8'),
'Freq' : redSrv0.get('RTDATA:LOG:FREQ').decode('utf-8'),
'Ch0' : redSrv0.get('RTDATA:CH:0').decode('utf-8'),
'Ch1' : redSrv0.get('RTDATA:CH:1').decode('utf-8'),
'Ch2' : redSrv0.get('RTDATA:CH:2').decode('utf-8'),
@@ -49,7 +50,6 @@ def main():
#assegno il template html di riferimento
return render_template('home.html', **channelsData)
@flaskApp.route("/logger")
#funzione logger, route a pagina /logger
def logger():
@@ -57,6 +57,7 @@ def logger():
'title' : 'Logger',
'timeSrv' : redSrv0.get('RTDATA:CH:SRVTIME').decode('utf-8'),
'timeLog' : redSrv0.get('RTDATA:CH:RECTIME').decode('utf-8'),
'Freq' : redSrv0.get('RTDATA:LOG:FREQ').decode('utf-8'),
'Ch0' : redSrv0.get('RTDATA:CH:0').decode('utf-8'),
'Ch1' : redSrv0.get('RTDATA:CH:1').decode('utf-8'),
'Ch2' : redSrv0.get('RTDATA:CH:2').decode('utf-8'),
@@ -69,7 +70,6 @@ def logger():
#assegno il template html di riferimento
return render_template('logger.html', **channelsData)
@flaskApp.route("/settings")
#funzione setup, route a pagina /setup
def setup():
@@ -77,6 +77,7 @@ def setup():
'title' : 'Settings',
'timeSrv' : redSrv0.get('RTDATA:CH:SRVTIME').decode('utf-8'),
'timeLog' : redSrv0.get('RTDATA:CH:RECTIME').decode('utf-8'),
'Freq' : redSrv0.get('RTDATA:LOG:FREQ').decode('utf-8'),
'Ch0' : redSrv0.get('RTDATA:CH:0').decode('utf-8'),
'Ch1' : redSrv0.get('RTDATA:CH:1').decode('utf-8'),
'Ch2' : redSrv0.get('RTDATA:CH:2').decode('utf-8'),
@@ -86,10 +87,10 @@ def setup():
'Ch6' : redSrv0.get('RTDATA:CH:6').decode('utf-8'),
'Ch7' : redSrv0.get('RTDATA:CH:7').decode('utf-8')
}
#assegno il template html di riferimento
return render_template('settings.html', **channelsData)
@flaskApp.route("/about")
#funzione setup, route a pagina /setup
def about():
@@ -108,6 +109,7 @@ def api_channels_all():
'title' : 'Home',
'timeSrv' : redSrv0.get('RTDATA:CH:SRVTIME').decode('utf-8'),
'timeLog' : redSrv0.get('RTDATA:CH:RECTIME').decode('utf-8'),
'Freq' : redSrv0.get('RTDATA:LOG:FREQ').decode('utf-8'),
'Ch0' : redSrv0.get('RTDATA:CH:0').decode('utf-8'),
'Ch1' : redSrv0.get('RTDATA:CH:1').decode('utf-8'),
'Ch2' : redSrv0.get('RTDATA:CH:2').decode('utf-8'),
@@ -138,8 +140,16 @@ def sessionCreate():
#funzione creazione sessione: scrive su redis SESSION:NAME prendendolo dall'input in pagina html con nome NewSessionName
sessionName = request.form['NewSessionName']
redSrv0.set('RTDATA:SESSION:NAME', sessionName)
# rimando in HOME
return redirect("/")
# rimando in logger
return redirect("/logger")
@flaskApp.route("/api/v1/frequency", methods=['POST'])
def setFrequency():
#funzione set frequenza scrive su redis LOG:FREQ prendendolo dall'input in pagina html con nome LogFreq
newFrequency = request.form['LogFreq']
redSrv0.set('RTDATA:LOG:FREQ', newFrequency)
# rimando in settings
return redirect("/logger")
#dichiaro host ipv4 (ottenuto sopra utilizzando il modulo socket)
if __name__ == "__main__":
server/templates/about.html
+2 -2
View File
@@ -16,11 +16,11 @@
<p>Analog and Digital reader and logger software</p>
</div>
<div class="row">
<p>Version 0.1.0</p>
<p>Version 0.1.1</p>
</div>
<div class="row">
<p>Last Patched:<br>
22 March 2021</p>
23 March 2021</p>
</div>
</div>
</div>
server/templates/home.html
+3 -4
View File
@@ -7,23 +7,22 @@
<br>
</div>
<div class="row">
<div class="col-6 col-md-4">
<div class="col-12">
<a href="logger" class="btn btn-block btn-primary text-uppercase">Logger</a>
</div>
</div>
<br>
<div class="row">
<div class="col-6 col-md-4">
<div class="col-12">
<a href="settings" class="btn btn-block btn-primary text-uppercase">Setup</a>
</div>
</div>
<br>
<div class="row">
<div class="col-6 col-md-4">
<div class="col-12">
<a href="about" class="btn btn-block btn-primary text-uppercase">About</a>
</div>
</div>
<br>
</div>
</main>
{% endblock %}
server/templates/layout.html
+4 -2
View File
@@ -38,6 +38,7 @@
$("#Chan5").html(result.Ch5);
$("#Chan6").html(result.Ch6);
$("#Chan7").html(result.Ch7);
$("#LogFrequency").html(result.Freq);
$("#ServerTime").html(result.timeSrv);
$("#LoggerTime").html(result.timeLog);
//console.log(result);
@@ -76,11 +77,11 @@
//console.log(name);
$('#NewSessionName').val(name);
}
</script>
<nav class="navbar navbar-expand-md bg-dark navbar-dark">
<!-- Brand -->
<a class="navbar-brand" href="/">LOGGER</a>
<a class="navbar-brand" href="/">ANALOGGER</a>
<!-- Toggler/collapsibe Button -->
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#collapsibleNavbar">
@@ -108,6 +109,7 @@
{% block content %}
{% endblock %}
</div>
<!--fine contenuto main, inizio footer-->
<footer class="py-1 bg-light bg-dark text-light fixed-bottom">
<div class="container-fluid">
server/templates/logger.html
+7 -6
View File
@@ -42,12 +42,13 @@
<div class="card mb-4">
<div class="card-header">
<i class="fas fa-table mr-1"></i>
Logger Time
Logger Time: <span id="LoggerTime"></span>
</div>
<div class="card-body">
<div class="row">
<span id="LoggerTime"></span>
</div>
</div>
<div class="card mb-4">
<div class="card-header">
<i class="fas fa-table mr-1"></i>
Log frequency (edit in <a href="/settings">Settings</a>): <span id="LogFrequency"></span> (ms)
</div>
</div>
<!--pulsanti start log e stop log-->
@@ -71,7 +72,7 @@
<div class="card-body">
<div class="row" id="divNewFile">
<form class="col-12" method="POST" action="/api/v1/sessions">
<div class="input-group mb-3">
<div class="input-group mb-3">
<span class="input-group-text">Nuova sessione</span>
<input type="text" class="form-control" id="NewSessionName" name="NewSessionName"></input>
<div class="input-group-append">
server/templates/settings.html
+73 -17
View File
@@ -6,28 +6,84 @@
<div class="card mb-4">
<div class="card-header">
<i class="fas fa-table mr-1"></i>
Analogger Settings
Logging Frequency
</div>
<div class="row" id="setFrequency">
<form class="col-12" method="POST" action="/api/v1/frequency">
<div class="input-group">
<span class="input-group-text">Frequenza</span>
<input type="text" class="form-control" id="LogFreq" name="LogFreq"></input>
<div class="input-group-append">
<input type="submit" value="SET" class="btn btn-success"></input>
</div>
</div>
</form>
</div>
</div>
<div class="card mb-4">
<div class="card-header">
<i class="fas fa-table mr-1"></i>
Channel 1 Settings
</div>
<br>
<div class="card-body">
<div class="row">
Setting 1
<div class="col-6">
<form method="POST" action="/api/v1/min1">
<div class="input-group mb-3">
<span class="input-group-text">MIN</span>
<button type="button" style="text-align: right;" class="btn btn-primary" onclick="">Get current</button>
<input type="text" class="form-control" id="MinCh1" name="MinCh1"></input>
<div class="input-group-append">
<input type="submit" value="SET" class="btn btn-success"></input>
</div>
</div>
</form>
</div>
<div class="col-6">
<form method="POST" action="/api/v1/max1">
<div class="input-group mb-3">
<span class="input-group-text">MAX</span>
<button type="button" style="text-align: right;" class="btn btn-primary" onclick="">Get current</button>
<input type="text" class="form-control" id="MaxCh1" name="MaxCh1"></input>
<div class="input-group-append">
<input type="submit" value="SET" class="btn btn-success"></input>
</div>
</div>
</form>
</div>
</div>
<br>
</div>
</div><div class="card mb-4">
<div class="card-header">
<i class="fas fa-table mr-1"></i>
Channel 2 Settings
</div>
<div class="card-body">
<div class="row">
Setting 2
</div>
<br>
<div class="row">
Setting 3
</div>
<br>
<div class="row">
Setting 4
</div>
<br>
<div class="row">
Setting 5
<div class="col-6">
<form method="POST" action="/api/v1/min2">
<div class="input-group mb-3">
<span class="input-group-text">MIN</span>
<button type="button" style="text-align: right;" class="btn btn-primary" onclick="">Get current</button>
<input type="text" class="form-control" id="MinCh2" name="MinCh2"></input>
<div class="input-group-append">
<input type="submit" value="SET" class="btn btn-success"></input>
</div>
</div>
</form>
</div>
<div class="col-6">
<form method="POST" action="/api/v1/max2">
<div class="input-group mb-3">
<span class="input-group-text">MAX</span>
<button type="button" style="text-align: right;" class="btn btn-primary" onclick="">Get current</button>
<input type="text" class="form-control" id="MaxCh2" name="MaxCh2"></input>
<div class="input-group-append">
<input type="submit" value="SET" class="btn btn-success"></input>
</div>
</div>
</form>
</div>
</div>
</div>
</div>