diff --git a/logger/log/PyLog.txt b/logger/log/PyLog.txt index 4f60e02..e3eea5f 100644 --- a/logger/log/PyLog.txt +++ b/logger/log/PyLog.txt @@ -87,3 +87,4 @@ 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') +2021-04-14 11:56:16.891671 Caught error: Error 111 connecting to 127.0.0.1:6379. Connection refused. diff --git a/server/templates/logger.html b/server/templates/logger.html index 61bfe63..5c728d7 100644 --- a/server/templates/logger.html +++ b/server/templates/logger.html @@ -62,6 +62,18 @@ $("#btnStart").hide(); $("#btnStop").show(); } + if(result.GateOpen == "1") + { + $("#divWarnCanc").show(); + } + else + { + $("#divWarnCanc").hide(); + } + + //scarico unità di misura dei canali mostrati + $("#UniMisuA").html(result.UniMeasure[result.ChA]); + $("#UniMisuB").html(result.UniMeasure[result.ChB]); }}); // A ogni giro di data refresh fix di tabella cartelle e tabella file fixFolderTable(); @@ -257,17 +269,23 @@
+
+
+

CANCELLO APERTO

+
+
-
+
Channel A:
-
+
+
@@ -275,14 +293,15 @@
-
+
Channel B:
-
+
+
diff --git a/server/templates/settings.html b/server/templates/settings.html index 3a86b2c..15bd942 100644 --- a/server/templates/settings.html +++ b/server/templates/settings.html @@ -24,6 +24,7 @@ $("#MinIn").html(result.MinIn); $("#MaxIn").html(result.MaxIn); $("#CurrentFolder").html(result.CurrentWorkFolder); + $("#UniMisura").val(result.UniMisura); // inizio nascondendo div2 e div3 $("#Div2").hide(); $("#Div3").hide(); @@ -276,13 +277,19 @@
-
-
-
- +
+
+ Unità di misura:   + +
+
+
+
+
+ +
+
-
-