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

update html

Browse Source
This commit is contained in:
Marco Locatelli
2021-04-14 16:42:16 +02:00
parent e0fd3ce895
commit 74ce276050
3 changed files with 37 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
logger/log/PyLog.txt
+1
View File
@@ -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.
server/templates/logger.html
+23 -4
View File
@@ -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 @@
</script>
<div class="container-fluid">
<div class="row my-2">
<div class="col-12 alert alert-danger text-center" id="divWarnCanc">
<h3>CANCELLO APERTO</h3>
</div>
</div>
<div class="row my-2">
<div class="col-6">
<div class="card text-center">
<div class="card-header text-center">
<div class="card-header">
<strong>Channel A: <span id="SelChannelA"></span></strong>
</div>
<div class="card-body">
<div id="divChA"></div>
<div class="row">
<div class="col">
<div class="col-12">
<span class="h5" id="OutputA"></span>
<span class="h5" id="UniMisuA"></span>
</div>
</div>
</div>
@@ -275,14 +293,15 @@
</div>
<div class="col-6">
<div class="card text-center">
<div class="card-header text-center">
<div class="card-header">
<strong>Channel B: <span id="SelChannelB"></span></strong>
</div>
<div class="card-body">
<div id="divChB"></div>
<div class="row">
<div class="col">
<div class="col-12">
<span class="h5" id="OutputB"></span>
<span class="h5" id="UniMisuB"></span>
</div>
</div>
</div>
server/templates/settings.html
+13 -6
View File
@@ -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 @@
<div class="col-2">
</div>
</div>
<div class="row text-center">
<div class="col-2"></div>
<div class="col-8">
<input type="submit" value="SET OUTPUT SCALE" class="btn btn-success btn-block mt-2"></input>
<div class="row">
<div class="input-group my-2 px-0">
<span class="col-6 input-group-text">Unità di misura: &nbsp;</span>
<input type="text" class="col-6 form-control" id="UniMisura" name="UniMisura"></input>
</div>
</div>
<div class="row text-center">
<div class="col-2"></div>
<div class="col-8">
<input type="submit" value="SET OUTPUT SCALE" class="btn btn-success btn-block mt-2"></input>
</div>
<div class="col-2"></div>
</div>
<div class="col-2"></div>
</div>
</form>
</div>
</div>