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

gestione visibilità contenuti e fix finali

Browse Source
This commit is contained in:
Marco Locatelli
2021-04-12 11:15:15 +02:00
parent 013379131f
commit b4e378b957
8 changed files with 32 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
logger/log/PyLog.txt
+1
View File
@@ -86,3 +86,4 @@
2021-04-02 09:27:42.781175 Caught error: Connection closed by server.
2021-04-08 11:19:48.305652 Caught error: Error 111 connecting to 127.0.0.1:6379. Connection refused.
2021-04-09 09:35:39.271878 Caught error: Error 111 connecting to 127.0.0.1:6379. Connection refused.
2021-04-12 09:44:47.671178 Caught error: Error while reading from socket: (104, 'Connection reset by peer')
sampler/FTSampler.py
+7 -3
View File
@@ -31,7 +31,6 @@ redSrv0.set(redSampleFreq,startingSampleFreq)
#se non c'è un valore nei campi di redis, popolo il db
redSrv0.set('SETTINGS:LOG:STATUS',0)
redisTime = 'RTDATA:TIME:SRV'
if redSrv0.get('SETTINGS:PASSWORD:CURRENT') is None:
redSrv0.set('SETTINGS:PASSWORD:CURRENT',"-")
if redSrv0.get('SETTINGS:FOLDER:CURRENT') is None:
@@ -56,7 +55,9 @@ try:
#funzione salva time+data di log e otto valori su redis
def redisSave(CHvalue):
redLastLog = 'RTDATA:TIME:LOG'
lastLog = datetime.datetime.now()
dateFormat ="%d/%m/%Y %H:%M:%S"
rawLastLog = datetime.datetime.now()
lastLog = rawLastLog.strftime(dateFormat)
redSrv0.set(redLastLog,str(lastLog))
for chIndex in range(0,8,+1):
redAreaIn = 'RTDATA:CH:'+str(chIndex)
@@ -93,8 +94,11 @@ try:
#ciclo principale
while(1):
redisTime = 'RTDATA:TIME:SRV'
now = datetime.datetime.now()
redSrv0.set(redisTime,str(now))
dateFormat ="%d/%m/%Y %H:%M:%S"
lastLog = now.strftime(dateFormat)
redSrv0.set(redisTime,str(lastLog))
CHvalue = CH.ADS1256_GetAll()
redisSave(CHvalue)
# riporto ultima esecuzione ad adesso
server/FTServer.py
+1 -2
View File
@@ -118,7 +118,7 @@ def api_channels_current():
savedPwd = getRedisVal('SETTINGS:PASSWORD:CURRENT')
if savedPwd is None:
redSrv0.set('SETTINGS:PASSWORD:CURRENT',"")
# tutto false
# on load tutto false
showDiv1 = 0
showDiv2 = 0
showDiv3 = 0
@@ -129,7 +129,6 @@ def api_channels_current():
elif savedPwd == "viaZavaritt152":
showDiv2 = 1
showDiv3 = 1
#funzione api_channels_all: legge direttamente da redis, ritorna jsonify
result = {
'numCh' : numCh,
server/templates/about.html
+3 -3
View File
@@ -4,8 +4,8 @@
<main>
<script>
var intTime=2000;
</script>
<div class="container-fluid py-2">
</script>
<div class="container-fluid">
<div class="card my-2">
<div class="card-header">
<h4>FT Logger</h4>
@@ -13,7 +13,7 @@
<div class="card-body">
Steamware srl 2021
<br>
Analog and Digital reader and logger software
Analog/Digital logger software
</div>
</div>
</div>
server/templates/home.html
+2 -2
View File
@@ -5,10 +5,10 @@
<script>
var intTime=2000;
</script>
<div class="container-fluid py-2">
<div class="container-fluid text-center">
<div class="row">
<div class="col-12">
<a href="logger" class="btn btn-block btn-primary text-uppercase">Logger</a>
<a href="logger" class="btn btn-block btn-primary text-uppercase mt-4">Logger</a>
</div>
</div>
<br>
server/templates/layout.html
+4 -4
View File
@@ -9,7 +9,7 @@
<title>{{ title }}</title>
<link rel="shortcut icon" href="../static/img/steam.ico">
<link rel="stylesheet" href="../static/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="../static/DataTables/datatables.min.css"/>
<link rel="stylesheet" type="text/css" href="../static/DataTables/datatables.min.css">
<script src="../static/DataTables/datatables.min.js" type="text/javascript"></script>
<script src="../static/js/jquery-3.6.0.min.js"></script>
<script src="../static/js/bootstrap.bundle.min.js"></script>
@@ -18,7 +18,8 @@
<body class="sb-nav-fixed">
<nav class="navbar navbar-expand-md bg-dark navbar-dark">
<!-- Brand -->
<a class="navbar-brand" href="/">FT Logger</a>
<a class="navbar-brand" href="/">
<img src="../static/img/steam.ico" height="32" width="32"> FT Logger</a>
<!-- Toggler/collapsibe Button -->
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#collapsibleNavbar">
@@ -52,8 +53,7 @@
<div class="container-fluid">
<div class="d-flex align-items-center justify-content-between small">
<div><span id="ServerTime"></span></div>
<div>Copyright &copy; Steamware srl 2021
<img src="../static/img/steam.ico" height="24" width="24">
<div>&copy; Steamware srl 2021
</div>
</div>
</div>
server/templates/logger.html
+13 -16
View File
@@ -7,9 +7,9 @@
var intTime=200;
// fix visualizzazioni
fixFolderTable();
fixFileTable();
dataRefresh();
fixFolderTable();
fixFileTable();
dataRefresh();
// avvio timer
var timeout = setTimeout(dataRefresh, intTime);
@@ -38,19 +38,19 @@
$("#CurrentFolder").html(result.CurrentWorkFolder);
if(result.CurrentWorkFolder == "")
{
$("#Div6").hide();
$("#Div7").hide();
$("#Div8").hide();
$("#Div10").hide();
$("#Div12").hide();
$("#Div9").show();
$("#Div10").hide();
$("#Div11").hide();
}
else
{
$("#Div6").show();
$("#Div7").show();
$("#Div8").show();
$("#Div10").show();
$("#Div12").show();
$("#Div9").hide();
$("#Div10").show();
$("#Div11").show();
}
}});
@@ -292,8 +292,7 @@
</div>
</div>
</div>
<div id="Div6" class="table-secondary text-center py-2 m-2 row">
<!-- <div class="text-center my-2 row"> -->
<div id="Div7" class="table-secondary text-center py-2 m-2 row"> <!--Div7 ovvero pulsanti Start e Stop-->
<div class="col-6">
<button id="btnStart" type="button" class="btn btn-success btn-block" onclick="startLog()">Start Log</button>
</div>
@@ -307,7 +306,7 @@
<div class="col-6"><strong>Cartella attuale: &nbsp;</strong> <h5>/<span id="CurrentFolder"></span></h5></div>
<div class="col-6"><strong>Sessione attuale: &nbsp;</strong> <h5>/<span id="LastSessionName"></span></h5></div>
</div>
<div id="Div9">
<div id="Div9"> <!--Div9 ovvero selezione cartella-->
<p id="showFolders"></p>
<form method="POST" action="/api/v1/setup/workingtree">
<div class="input-group my-2">
@@ -331,10 +330,8 @@
</div>
</div>
</div>
<div class="card-body">
<div id="Div12"> <!--Div12 ovvero elenco files-->
<p class="text-center" id="showData"></p>
</div>
<div class="card-body" id="Div11"> <!--Div11 ovvero elenco files-->
<p class="text-center" id="showData"></p>
</div>
</div>
</div>
server/templates/settings.html
+1 -1
View File
@@ -141,7 +141,7 @@
<form class="col-12" method="POST" action="/api/v1/setup/passwordInput">
<div class="row input-group my-2">
<span class="input-group-text">Password: &nbsp;</span>
<input type="text" class=" form-control" id="PasswordForm" name="PasswordForm"></input>
<input type="password" class=" form-control" id="PasswordForm" name="PasswordForm"></input>
<input type="submit" value="LOGIN" class="btn btn-success"></input>
</div>
</form>