diff --git a/logger/log/PyLog.txt b/logger/log/PyLog.txt index 28aa885..900f54c 100644 --- a/logger/log/PyLog.txt +++ b/logger/log/PyLog.txt @@ -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. diff --git a/server/FTServer.py b/server/FTServer.py index 06c777d..f738fcf 100644 --- a/server/FTServer.py +++ b/server/FTServer.py @@ -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(): diff --git a/server/templates/about.html b/server/templates/about.html index 5bce330..11c57f0 100644 --- a/server/templates/about.html +++ b/server/templates/about.html @@ -8,15 +8,12 @@
-

Steamware Srl

+

FT Logger

-
- FT Logger Software 2021 -
-
+ Steamware srl 2021 +
Analog and Digital reader and logger software -
diff --git a/server/templates/logger.html b/server/templates/logger.html index 5c1f069..7933a80 100644 --- a/server/templates/logger.html +++ b/server/templates/logger.html @@ -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);
@@ -206,7 +217,7 @@
- OUT +
@@ -221,7 +232,7 @@
- OUT +
@@ -237,47 +248,35 @@ -
-
- Folder salvataggio file. Attuale:  
-
-
-
-
- Insert new:   - - -
-
-
-
- Elenco registrazioni -
- Sessione attuale:   +
+
Cartella attuale:  
/data/
+
Sessione attuale:  
/
-
+
+ +
+
-
+
+
+
+ Seleziona cartella:   + + +
+

-
{% endblock %} \ No newline at end of file