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

navigazione folder

Browse Source
This commit is contained in:
Marco Locatelli
2021-04-09 11:49:23 +02:00
parent 1a0991b521
commit e46cd7a284
4 changed files with 51 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
logger/log/PyLog.txt
+1
View File
@@ -85,3 +85,4 @@
2021-04-01 15:21:11.244154 Caught error: name 'now' is not defined
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.
server/FTServer.py
+16 -7
View File
@@ -174,7 +174,9 @@ def api_get_files():
def start_log():
currentFolder = getRedisVal('SETTINGS:FOLDER:CURRENT')
workingDirectory = (dataDir+currentFolder)
if os.path.isdir(workingDirectory) is True:
if workingDirectory == dataDir:
return "OK"
else:
#funzione start_log: scrive su redis LOG:STATUS -> 1
redSrv0.set('SETTINGS:LOG:STATUS', 1)
#data e time ora
@@ -185,16 +187,20 @@ def start_log():
nameDate = lastDate.strftime(format) + ".csv"
redSrv0.set('RTDATA:SESSION:NAME', nameDate)
return "OK"
else:
return "OK"
@flaskApp.route("/api/v1/log/stop", methods=['PUT'])
def stop_log():
#funzione stop_log: scrive su redis LOG:STATUS -> 0
redSrv0.set('SETTINGS:LOG:STATUS', 0)
redSrv0.set('RTDATA:SESSION:NAME', "-")
redSrv0.set('RTDATA:SESSION:NAME', "")
return "OK"
@flaskApp.route("/api/v1/data/navigate", methods=['PUT'])
def data_navigate():
#funzione torna in /data
redSrv0.set('SETTINGS:FOLDER:CURRENT',"")
return redirect("/logger")
@flaskApp.route("/api/v1/data/export", methods=['PUT'])
def data_export():
#funzione dataExport: copia
@@ -223,9 +229,12 @@ def data_delete():
#funzione dataDelete: cancella
currentFolder = getRedisVal('SETTINGS:FOLDER:CURRENT')
workingDirectory = (dataDir+currentFolder)
shutil.rmtree(workingDirectory)
redSrv0.set('SETTINGS:FOLDER:CURRENT', "not set")
return redirect("/logger")
if dataDir == workingDirectory:
return redirect("/logger")
else:
shutil.rmtree(workingDirectory)
redSrv0.set('SETTINGS:FOLDER:CURRENT', "")
return redirect("/logger")
@flaskApp.route("/api/v1/setup/passwordInput", methods=['POST'])
def insertPassword():
server/templates/about.html
+3 -6
View File
@@ -8,15 +8,12 @@
<div class="container-fluid py-2">
<div class="card my-2">
<div class="card-header">
<h4>Steamware Srl</h4>
<h4>FT Logger</h4>
</div>
<div class="card-body">
<div class="row">
FT Logger Software 2021
</div>
<div class="row">
Steamware srl 2021
<br>
Analog and Digital reader and logger software
</div>
</div>
</div>
</div>
server/templates/logger.html
+31 -32
View File
@@ -100,7 +100,7 @@
$("#btnStop").show();
// fix table
fixFileTable();
dataRefresh()
dataRefresh();
};
// Funzione stopLog: fa chiamata per settare a 0 il LOG:STATUS
@@ -114,6 +114,18 @@
$("#btnStop").hide();
// fix table
fixFileTable();
dataRefresh();
};
function goBack(){
$.ajax({
type: 'PUT'
,url: "/api/v1/data/navigate"
,data: ""
})
// fix table
fixFileTable();
dataRefresh();
};
//funzione exportData: chiamata per copiare e incollare il contenuto della cartella /data
@@ -125,6 +137,7 @@
})
// fix table
fixFileTable();
dataRefresh();
};
//funzione deleteData: chiamata per eliminare il contenuto della cartella /data
@@ -191,8 +204,6 @@
divContainer.innerHTML = "";
divContainer.appendChild(table);
}
// fix file
UpdateFileTable(fileTable);
</script>
<div class="container-fluid">
@@ -206,7 +217,7 @@
<div id="divChA"></div>
<div class="row">
<div class="col">
<strong>OUT <span id="OutputA"></span></strong>
<span class="h5" id="OutputA"></span>
</div>
</div>
</div>
@@ -221,7 +232,7 @@
<div id="divChB"></div>
<div class="row">
<div class="col">
<strong>OUT <span id="OutputB"></span></strong>
<span class="h5" id="OutputB"></span>
</div>
</div>
</div>
@@ -237,47 +248,35 @@
<button id="btnStop" type="button" class="btn btn-warning btn-block" onclick="stopLog()">Stop Log</button>
</div>
</div>
<div class="card my-2 col-12">
<div class="row card-header">
<strong>Folder salvataggio file. Attuale: &nbsp; </strong> <h5><span class="badge badge-warning" id="CurrentFolder"></span></h5>
</div>
<div class="row card-body">
<form class="col-12" method="POST" action="/api/v1/setup/workingtree">
<div class="row input-group my-2">
<span class="col-3 input-group-text">Insert new: &nbsp;</span>
<input type="text" class="col-7 form-control" id="NewFolder" name="NewFolder"></input>
<input type="submit" value="SET" class="btn btn-success btn-block col-2"></input>
</div>
</form>
</div>
</div>
<div class="card my-2">
<div class="card-header">
<b>Elenco registrazioni</b>
<div class="input-group-text my-2">
<span>Sessione attuale: &nbsp;</span> <span id="LastSessionName"></span>
<div class="row">
<div class="col-6"><strong>Cartella attuale: &nbsp;</strong> <h5>/data/<span id="CurrentFolder"></span></h5></div>
<div class="col-6"><strong>Sessione attuale: &nbsp;</strong> <h5>/<span id="LastSessionName"></span></h5></div>
</div>
<div class="row mt-2">
<div class="col-6">
<div class="col-4">
<button type="button" class="btn btn-info btn-block" onclick="goBack()">Torna a /data/</button>
</div>
<div class="col-4">
<button type="button" class="btn btn-primary btn-block" onclick="exportData()">Esporta Cartella</button>
</div>
<div class="col-6">
<div class="col-4">
<button type="button" class="btn btn-danger btn-block" onclick="deleteData()">Cancella Cartella</button>
</div>
</div>
<form method="POST" action="/api/v1/setup/workingtree">
<div class="input-group my-2">
<span class="input-group-text col-4">Seleziona cartella: &nbsp;</span>
<input type="text" class="form-control col-6" id="NewFolder" name="NewFolder"></input>
<input type="submit" value="INVIO" class="btn btn-success col-2"></input>
</div>
</form>
</div>
<div class="card-body">
<p class="text-center" id="showData"></p>
</div>
</div>
<!-- <div class="table-warning text-center my-60 row">
<div class="col-6">
<strong>Logger period: </strong> <span id="LogFrequency"></span> ms
</div>
<div class="col-6">
<strong>File Write period: </strong> <span id="WriteFrequency"></span> ms
</div>
</div> -->
</div>
</main>
{% endblock %}