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

fix finali + datarefresh corretto

Browse Source
This commit is contained in:
Marco Locatelli
2021-04-12 14:49:19 +02:00
parent b4e378b957
commit 28a782d615
7 changed files with 91 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sampler/FTSampler.py
+1 -1
View File
@@ -2,8 +2,8 @@
import time
import datetime
import ADS1256
import RPi.GPIO as GPIO
import ADS1256
import redis
#configurazione per lavorare su server redis locale
server/FTServer.py
+2 -2
View File
@@ -158,7 +158,7 @@ def api_get_folders():
idx=0
# for item in sorted(data):
for item in folderList:
current = {"Cartelle": item}
current = {"Elenco Cartelle": item}
lista.append(current)
idx=idx+1
return jsonify(folderTable = lista)
@@ -179,7 +179,7 @@ def api_get_files():
t_obj = time.strptime(time.ctime(os.path.getctime(workingDirectory+"/"+item)))
# Transforming the time object to a timestamp
T_stamp = time.strftime("%Y-%m-%d %H:%M:%S", t_obj)
current = {"Nome file": item, "Size (bytes)": os.path.getsize(workingDirectory+"/"+item), "Data modifica":T_stamp}
current = {"Nome": item, "Size (bytes)": os.path.getsize(workingDirectory+"/"+item), "Data creazione":T_stamp}
lista.append(current)
idx=idx+1
return jsonify(fileTable = lista)
server/templates/about.html
+13 -1
View File
@@ -3,7 +3,19 @@
{% block content %}
<main>
<script>
var intTime=2000;
var intTime=200;
var timeout = setTimeout(dataRefresh, intTime);
function dataRefresh() {
// scarico i dati aggioranti
$.ajax({url: "/api/v1/channels/all", success: function(result){
$("#ServerTime").html(result.timeSrv);
}});
timeout = setTimeout(dataRefresh, intTime);
};
</script>
<div class="container-fluid">
<div class="card my-2">
server/templates/home.html
+13 -1
View File
@@ -3,7 +3,19 @@
{% block content %}
<main>
<script>
var intTime=2000;
var intTime=200;
var timeout = setTimeout(dataRefresh, intTime);
function dataRefresh() {
// scarico i dati aggioranti
$.ajax({url: "/api/v1/channels/all", success: function(result){
$("#ServerTime").html(result.timeSrv);
}});
timeout = setTimeout(dataRefresh, intTime);
};
</script>
<div class="container-fluid text-center">
<div class="row">
server/templates/layout.html
+1 -1
View File
@@ -53,7 +53,7 @@
<div class="container-fluid">
<div class="d-flex align-items-center justify-content-between small">
<div><span id="ServerTime"></span></div>
<div>&copy; Steamware srl 2021
<div>&copy; Steamware 2021
</div>
</div>
</div>
server/templates/logger.html
+20 -23
View File
@@ -19,13 +19,11 @@
$.ajax({url: "/api/v1/channels/all", success: function(result){
// compilo i dati scaricati
$("#SelChannelA").html(result.ChA);
// $("#ChannelA").html(result.Channels[result.ChA]);
$("#OutputA").html(result.Outs[result.ChA]);
setGaugeA(result.Outs[result.ChA],result.Outmin[result.ChA],result.Outmax[result.ChA]);
$("#SelChannelB").html(result.ChB);
$("#ChannelB").html(result.Channels[result.ChB]);
$("#OutputB").html(result.Outs[result.ChB]);
setGaugeB(result.Outs[result.ChB],result.Outmin[result.ChB],result.Outmax[result.ChB]);
@@ -36,6 +34,7 @@
$("#ServerTime").html(result.timeSrv);
$("#LastSessionName").html(result.LastSessionName);
$("#CurrentFolder").html(result.CurrentWorkFolder);
// Se ho una current folder assegnata, la mostro e mostro contenuto. Altrimenti mostro elenco cartelle.
if(result.CurrentWorkFolder == "")
{
$("#Div7").hide();
@@ -52,7 +51,21 @@
$("#Div10").show();
$("#Div11").show();
}
// Se LOG:STATUS è 0, mostro solo Start Log. se è 1, mostro solo Stop Log
if(result.Status == "0")
{
$("#btnStart").show();
$("#btnStop").hide();
}
else if(result.Status == "1")
{
$("#btnStart").hide();
$("#btnStop").show();
}
}});
// A ogni giro di data refresh fix di tabella cartelle e tabella file
fixFolderTable();
fixFileTable();
timeout = setTimeout(dataRefresh, intTime);
};
@@ -102,11 +115,7 @@
,url: "/api/v1/log/start"
,data: ""
})
$("#btnStart").hide();
$("#btnStop").show();
// fix table
fixFileTable();
fixFolderTable();
dataRefresh();
};
@@ -117,11 +126,7 @@
,url: "/api/v1/log/stop"
,data: ""
})
$("#btnStart").show();
$("#btnStop").hide();
// fix table
fixFileTable();
fixFolderTable();
dataRefresh();
};
@@ -132,8 +137,6 @@
,data: ""
})
// fix table
fixFileTable();
fixFolderTable();
dataRefresh();
};
@@ -145,8 +148,6 @@
,data: ""
})
// fix table
fixFileTable();
fixFolderTable();
dataRefresh();
};
@@ -159,13 +160,9 @@
,url: "/api/v1/data/delete"
,data: ""
})
fixFolderTable();
fixFileTable();
dataRefresh();
}
else{
fixFolderTable();
fixFileTable();
dataRefresh();
}
};
@@ -303,15 +300,15 @@
<div class="card my-2">
<div class="card-header">
<div class="row" id="Div8"> <!--Div8 ovvero cartella attuale e sessione attuale-->
<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 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"> <!--Div9 ovvero selezione cartella-->
<p id="showFolders"></p>
<form method="POST" action="/api/v1/setup/workingtree">
<div class="input-group my-2">
<span class="input-group-text col-2">Cartella: &nbsp;</span>
<input type="text" class="form-control col-8" id="NewFolder" name="NewFolder"></input>
<span class="input-group-text col-5">Seleziona o Crea Cartella: &nbsp;</span>
<input type="text" class="form-control col-5" id="NewFolder" name="NewFolder"></input>
<input type="submit" value="INVIO" class="btn btn-success col-2"></input>
</div>
</form>
@@ -319,7 +316,7 @@
<div id="Div10"> <!--Div10 ovvero 3 pulsanti logger-->
<div class="row mt-2">
<div class="col-4">
<button type="button" class="btn btn-info btn-block" onclick="goBack()">Torna a /data/</button>
<button type="button" class="btn btn-info btn-block" onclick="goBack()">Torna Indietro</button>
</div>
<div class="col-4">
<button type="button" class="btn btn-primary btn-block" onclick="exportData()">Esporta Cartella</button>
server/templates/settings.html
+41 -35
View File
@@ -225,36 +225,36 @@
</div>
</div>
</div>
<div class="card-body h5 text-center">
<div class="card-body h6 text-center">
<div class="card-body row text-center">
<div class="col-2"></div>
<div class="col-8">
<div class="row">
<div class="col-4">MIN</div>
<div class="col-4">Attuale</div>
<div class="col-4">MAX</div>
<div class="col-3">MIN</div>
<div class="col-6">Attuale</div>
<div class="col-3">MAX</div>
</div>
</div>
<div class="col-2"></div>
</div>
<div class="card-body row text-center">
<div class="col-1"></div>
<div class="col-10">
<div class="row">
<div class="col-5 px-0"><button type="button" class="btn btn-secondary btn-block" onclick="saveMin()">Save Min</button></div>
<div class="col-2"></div>
<div class="col-5 px-0"><button type="button" class="btn btn-info btn-block" onclick="saveMax()">Save Max</button></div>
</div>
</div>
<div class="col-1"></div>
</div>
<div class="card-body row text-center">
<div class="col-2">IN</div>
<div class="col-8">
<div class="row">
<div class="col-4"><span class="badge badge-secondary text-center" id="MinIn">000</span></div>
<div class="col-4"><span class="badge badge-warning text-center" id="CurrIn">000</span></div>
<div class="col-4"><span class="badge badge-info text-center" id="MaxIn">000</span></div>
</div>
</div>
<div class="col-2"></div>
</div>
<div class="card-body row text-center">
<div class="col-2"></div>
<div class="col-8">
<div class="row">
<div class="col-4"><button type="button" class="btn btn-secondary btn-block" onclick="saveMin()">Save Min</button></div>
<div class="col-4"></div>
<div class="col-4"><button type="button" class="btn btn-info btn-block" onclick="saveMax()">Save Max</button></div>
<div class="row text-center">
<div class="col-3 px-0"><span class="text-center" id="MinIn">000</span></div>
<div class="col-6 px-0"><span class="text-center" id="CurrIn">000</span></div>
<div class="col-3 px-0"><span class="text-center" id="MaxIn">000</span></div>
</div>
</div>
<div class="col-2"></div>
@@ -264,11 +264,11 @@
<div class="col-2 text-center">OUT</div>
<div class="col-8">
<div class="row">
<div class="col-4">
<div class="col-3 px-0">
<input type="number" class="form-control text-center" id="MinOut" name="MinOut"></input>
</div>
<div class="col-4"><span class="badge badge-warning" id="CurrOut">{{ Out0 }}</span></div>
<div class="col-4">
<div class="col-6"><span class="text-center" id="CurrOut">{{ Out0 }}</span></div>
<div class="col-3 px-0">
<input type="number" class="form-control text-center" id="MaxOut" name="MaxOut"></input>
</div>
</div>
@@ -279,9 +279,7 @@
<div class="row text-center">
<div class="col-2"></div>
<div class="col-8">
<div class="row">
<input type="submit" value="SET OUTPUT SCALE" class="btn btn-success btn-block mt-2"></input>
</div>
<input type="submit" value="SET OUTPUT SCALE" class="btn btn-success btn-block mt-2"></input>
</div>
<div class="col-2"></div>
</div>
@@ -295,15 +293,21 @@
</div>
<div class="card-body row">
<form class="col-12" method="POST" action="/api/v1/frequency">
<div class="input-group my-2">
<span class="col-8 input-group-text">Periodo di campionamento (ms): &nbsp;</span>
<input type="number" class="col-4 form-control" id="LogFreq" name="LogFreq"></input>
<div class="input-group row my-2 px-0">
<span class="col-6 input-group-text">Sample Period (ms): &nbsp;</span>
<input type="number" class="col-6 form-control" id="LogFreq" name="LogFreq"></input>
</div>
<div class="input-group my-2">
<span class="col-8 input-group-text">Periodo di scrittura (ms): &nbsp;</span>
<input type="number" class="col-4 form-control" id="WriteFreq" name="WriteFreq"></input>
<div class="input-group row my-2 px-0">
<span class="col-6 input-group-text">Write Period (ms): &nbsp;</span>
<input type="number" class="col-6 form-control" id="WriteFreq" name="WriteFreq"></input>
<br>
<input type="submit" value="SET" class="btn btn-success btn-block mt-2"></input>
</div>
<div class="row text-center">
<div class="col-2"></div>
<div class="col-8">
<input type="submit" value="SET" class="btn btn-success btn-block mt-2"></input>
</div>
<div class="col-2"></div>
</div>
</form>
</div>
@@ -311,13 +315,15 @@
<div class="card my-2 col-12">
<div class="row card-header">
<i class="fas fa-table mr-1"></i>
<strong>Reset impostazioni predefinite</strong>
<strong>Reset default settings</strong>
</div>
<div class="card-body mb-4">
<form method="POST" action="/api/v1/setup/resetSettings">
<div class="row">
<div class="row text-center">
<div class="col-2"></div>
<input type="submit" class="col-8 btn btn-danger btn-block my-2" value="RESET SETTINGS"></input>
<div class="col-8">
<input type="submit" value="RESET SETTINGS" class="btn btn-danger btn-block mt-2"></input>
</div>
<div class="col-2"></div>
</div>
</form>