creazione layout e pagine

This commit is contained in:
Marco Locatelli
2021-03-22 14:20:17 +01:00
parent a32a5b8abb
commit 4f6fa5cf64
8 changed files with 354 additions and 1000 deletions
+2 -1
View File
@@ -41,4 +41,5 @@ Program end. Ctrl+C from user at time: 2021-03-19 12:48:01.838556
Program end. Ctrl+C from user at time: 2021-03-19 12:49:41.004201
Program end. Ctrl+C from user at time: 2021-03-19 12:53:27.063207
Program end. Ctrl+C from user at time: 2021-03-19 15:00:27.908197
Program end. Ctrl+C from user at time: 2021-03-19 15:24:20.079220
Program end. Ctrl+C from user at time: 2021-03-19 15:24:20.079220
Program end. Ctrl+C from user at time: 2021-03-22 12:33:04.141973
+13 -2
View File
@@ -51,7 +51,7 @@ def main():
@flaskApp.route("/logger")
#funzione main: passa al template html i primi dati che dovranno popolarlo. legge direttamente da redis. edit: passa anche indirizzo ip del server
#funzione logger, route a pagina /logger
def logger():
channelsData = {
'title' : 'logger',
@@ -71,7 +71,7 @@ def logger():
@flaskApp.route("/setup")
#funzione main: passa al template html i primi dati che dovranno popolarlo. legge direttamente da redis. edit: passa anche indirizzo ip del server
#funzione setup, route a pagina /setup
def setup():
channelsData = {
'title' : 'setup',
@@ -89,6 +89,17 @@ def setup():
#assegno il template html di riferimento
return render_template('setup.html', **channelsData)
@flaskApp.route("/about")
#funzione setup, route a pagina /setup
def about():
channelsData = {
'title' : 'about',
'timeSrv' : redSrv0.get('RTDATA:CH:SRVTIME').decode('utf-8')
}
#assegno il template html di riferimento
return render_template('about.html', **channelsData)
# definisco una NUOVA route a cui rispondere su chiamta in metodo GET x restituire dati aggiornati
@flaskApp.route("/api/v1/channels/all", methods=['GET'])
def api_channels_all():
-226
View File
@@ -1,226 +0,0 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
<meta name="description" content="FlyThis" />
<meta name="author" content="Marco Loca" />
<title>{{ title }}</title>
<link rel="shortcut icon" href="../static/img/steam.ico">
<link rel="stylesheet" href="../static/css/styles.css"/>
<link rel="stylesheet" href="../static/css/fonts.css">
<script src="../static/js/jquery-3.6.0.min.js"></script>
</head>
<body class="sb-nav-fixed">
<script>
var intTime=250;
// fix visualizzazioni
fixDisplay();
// avvio timer
var timeout = setTimeout(dataRefresh, intTime);
function fixDisplay(){
$("#divNewFile").toggle();
//console.log("div hidden");
}
function dataRefresh() {
// scarico i dati aggioranti
$.ajax({url: "/api/v1/channels/all", success: function(result){
// compilo i dati scaricati
$("#Chan0").html(result.Ch0);
$("#Chan1").html(result.Ch1);
$("#Chan2").html(result.Ch2);
$("#Chan3").html(result.Ch3);
$("#Chan4").html(result.Ch4);
$("#Chan5").html(result.Ch5);
$("#Chan6").html(result.Ch6);
$("#Chan7").html(result.Ch7);
$("#ServerTime").html(result.timeSrv);
$("#LoggerTime").html(result.timeLog);
//console.log(result);
}});
timeout = setTimeout(dataRefresh, intTime);
}
function startLog(){
$.ajax({
type: 'PUT'
,url: "/api/v1/log/start"
,data: ""
,success: function(){
alert('Log Started');
}
})
intTime= 250;
};
function stopLog(){
$.ajax({
type: 'PUT'
,url: "/api/v1/log/stop"
,data: ""
,success: function(){
alert('Log Stopped');
}
})
intTime = 2500;
};
// Funzione startNewRec: assegna nuovo nome con data e ora al file .csv di record
function startNewRec(){
var d = new Date();
var name= d.toISOString().replace('T','_').replace('-','_').replace('-','_').replace(':','_').replace(':','_').replace('.','_').replace('Z','')+'.csv';
//console.log(name);
$('#NewSessionName').val(name);
}
</script>
<nav class="sb-topnav navbar navbar-expand navbar-dark bg-dark">
<img src="../static/img/steam.ico" height="52" width="52">
<h3>Steamware</h3>
</nav>
<!-- Sidebar con link di navigazione-->
<div id="layoutSidenav">
<div id="layoutSidenav_nav">
<nav class="sb-sidenav accordion sb-sidenav-dark" id="sidenavAccordion">
<div class="sb-sidenav-menu">
<div class="nav">
<center>
<div class="sb-sidenav-menu-heading">AnaLogger</div><br>
</center>
<a type="link" class="btn btn-dark" href="/">
Logger
</a>
<a type="link" class="btn btn-dark" href="/">
Settings
</a>
<a type="link" class="btn btn-dark" href="/">
About
</a>
</div>
</div>
</nav>
</div>
<!--contenuto della pagina main-->
<div id="layoutSidenav_content">
<main>
<div class="container-fluid py-2">
<div class="row">
<div class="col-xl-6">
<div class="card mb-4">
<div class="card-header">
<i class="fas fa-chart-area mr-1"></i>
Server time
</div>
<p id="timeSrv"><span id="ServerTime"></span></p>
</div>
</div>
<div class="col-xl-6">
<div class="card mb-4">
<div class="card-header">
<i class="fas fa-chart-bar mr-1"></i>
Last log time
</div>
<p id="timeLog"><span id="LoggerTime"></span></p>
</div>
</div>
</div>
<div class="card mb-4">
<div class="card-header">
<i class="fas fa-table mr-1"></i>
Channels Reading
</div>
<div class="card-body">
<div class="row">
<div class="col-3">
Canale 1: <span id="Chan0"></span>
</div>
<div class="col-3">
Canale 2: <span id="Chan1"></span>
</div>
<div class="col-3">
Canale 3: <span id="Chan2"></span>
</div>
<div class="col-3">
Canale 4: <span id="Chan3"></span>
</div>
</div>
<div class="row">
<div class="col-3">
Canale 5: <span id="Chan4"></span>
</div>
<div class="col-3">
Canale 6: <span id="Chan5"></span>
</div>
<div class="col-3">
Canale 7: <span id="Chan6"></span>
</div>
<div class="col-3">
Canale 8: <span id="Chan7"></span>
</div>
</div>
</div>
</div>
<!--pulsanti start log e stop log-->
<center>
<button type="button" class="btn btn-success" onclick="startLog()">Start Log</button>
<button type="button" class="btn btn-danger" onclick="stopLog()">Stop Log</button>
</center>
<br>
<div class="card mb-4">
<div class="card-header">
<div class="row">
<div class="col-6">
<i class="fas fa-table mr-1"></i>
Record Log
</div>
<div class="col-6 text-right">
<button type="button" class="btn btn-primary" onclick="startNewRec()">Create record File</button>
</div>
</div>
</div>
<div class="card-body">
<div class="row" id="divNewFile">
<form class="col-12" method="POST" action="/api/v1/sessions">
<div class="input-group mb-3">
<span class="input-group-text">Nuova sessione</span>
<input type="text" class="form-control" id="NewSessionName" name="NewSessionName"></input>
<div class="input-group-append">
<input type="submit" value="Invio" class="btn btn-success"></input>
</div>
</div>
</form>
</div>
<div class="row">
<div class="col-2">check</div>
<div class="col-2">Inizio</div>
<div class="col-2">Durata</div>
<div class="col-2">Nome</div>
<div class="col-4">Copy</div>
</div>
<div class="row">
<div class="col-2">check</div>
<div class="col-2">Inizio</div>
<div class="col-2">Durata</div>
<div class="col-2">Nome</div>
<div class="col-4">Copy</div>
</div>
</div>
</div>
</div>
</main>
<!--fine contenuto main, inizio footer-->
<footer class="py-4 bg-light mt-auto">
<div class="container-fluid">
<div class="d-flex align-items-center justify-content-between small">
<div class="text-muted">Copyright &copy; Steamware srl 2021</div>
</div>
</div>
</footer>
</div>
</div>
</body>
</html>
+110
View File
@@ -0,0 +1,110 @@
{% extends "layout.html" %}
{% block content %}
<main>
<div class="container-fluid py-2">
<div class="row">
<div class="col-xl-6">
<div class="card mb-4">
<div class="card-header">
<i class="fas fa-chart-area mr-1"></i>
Server time
</div>
<p id="timeSrv"><span id="ServerTime"></span></p>
</div>
</div>
<div class="col-xl-6">
<div class="card mb-4">
<div class="card-header">
<i class="fas fa-chart-bar mr-1"></i>
Last log time
</div>
<p id="timeLog"><span id="LoggerTime"></span></p>
</div>
</div>
</div>
<div class="card mb-4">
<div class="card-header">
<i class="fas fa-table mr-1"></i>
Channels Reading
</div>
<div class="card-body">
<div class="row">
<div class="col-3">
Canale 1: <span id="Chan0"></span>
</div>
<div class="col-3">
Canale 2: <span id="Chan1"></span>
</div>
<div class="col-3">
Canale 3: <span id="Chan2"></span>
</div>
<div class="col-3">
Canale 4: <span id="Chan3"></span>
</div>
</div>
<div class="row">
<div class="col-3">
Canale 5: <span id="Chan4"></span>
</div>
<div class="col-3">
Canale 6: <span id="Chan5"></span>
</div>
<div class="col-3">
Canale 7: <span id="Chan6"></span>
</div>
<div class="col-3">
Canale 8: <span id="Chan7"></span>
</div>
</div>
</div>
</div>
<!--pulsanti start log e stop log-->
<center>
<button type="button" class="btn btn-success" onclick="startLog()">Start Log</button>
<button type="button" class="btn btn-danger" onclick="stopLog()">Stop Log</button>
</center>
<br>
<div class="card mb-4">
<div class="card-header">
<div class="row">
<div class="col-6">
<i class="fas fa-table mr-1"></i>
Record Log
</div>
<div class="col-6 text-right">
<button type="button" class="btn btn-primary" onclick="startNewRec()">Create record File</button>
</div>
</div>
</div>
<div class="card-body">
<div class="row" id="divNewFile">
<form class="col-12" method="POST" action="/api/v1/sessions">
<div class="input-group mb-3">
<span class="input-group-text">Nuova sessione</span>
<input type="text" class="form-control" id="NewSessionName" name="NewSessionName"></input>
<div class="input-group-append">
<input type="submit" value="Invio" class="btn btn-success"></input>
</div>
</div>
</form>
</div>
<div class="row">
<div class="col-2">check</div>
<div class="col-2">Inizio</div>
<div class="col-2">Durata</div>
<div class="col-2">Nome</div>
<div class="col-4">Copy</div>
</div>
<div class="row">
<div class="col-2">check</div>
<div class="col-2">Inizio</div>
<div class="col-2">Durata</div>
<div class="col-2">Nome</div>
<div class="col-4">Copy</div>
</div>
</div>
</div>
</div>
</main>
{% endblock %}
+15 -222
View File
@@ -1,226 +1,19 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
<meta name="description" content="FlyThis" />
<meta name="author" content="Marco Loca" />
<title>{{ title }}</title>
<link rel="shortcut icon" href="../static/img/steam.ico">
<link rel="stylesheet" href="../static/css/styles.css"/>
<link rel="stylesheet" href="../static/css/fonts.css">
<script src="../static/js/jquery-3.6.0.min.js"></script>
</head>
<body class="sb-nav-fixed">
<script>
{% extends "layout.html" %}
var intTime=250;
// fix visualizzazioni
fixDisplay();
// avvio timer
var timeout = setTimeout(dataRefresh, intTime);
function fixDisplay(){
$("#divNewFile").toggle();
//console.log("div hidden");
}
function dataRefresh() {
// scarico i dati aggioranti
$.ajax({url: "/api/v1/channels/all", success: function(result){
// compilo i dati scaricati
$("#Chan0").html(result.Ch0);
$("#Chan1").html(result.Ch1);
$("#Chan2").html(result.Ch2);
$("#Chan3").html(result.Ch3);
$("#Chan4").html(result.Ch4);
$("#Chan5").html(result.Ch5);
$("#Chan6").html(result.Ch6);
$("#Chan7").html(result.Ch7);
$("#ServerTime").html(result.timeSrv);
$("#LoggerTime").html(result.timeLog);
//console.log(result);
}});
timeout = setTimeout(dataRefresh, intTime);
}
function startLog(){
$.ajax({
type: 'PUT'
,url: "/api/v1/log/start"
,data: ""
,success: function(){
alert('Log Started');
}
})
intTime= 250;
};
function stopLog(){
$.ajax({
type: 'PUT'
,url: "/api/v1/log/stop"
,data: ""
,success: function(){
alert('Log Stopped');
}
})
intTime = 2500;
};
// Funzione startNewRec: assegna nuovo nome con data e ora al file .csv di record
function startNewRec(){
var d = new Date();
var name= d.toISOString().replace('T','_').replace('-','_').replace('-','_').replace(':','_').replace(':','_').replace('.','_').replace('Z','')+'.csv';
//console.log(name);
$('#NewSessionName').val(name);
}
</script>
<nav class="sb-topnav navbar navbar-expand navbar-dark bg-dark">
<img src="../static/img/steam.ico" height="52" width="52">
<h3>Steamware</h3>
</nav>
<!-- Sidebar con link di navigazione-->
<div id="layoutSidenav">
<div id="layoutSidenav_nav">
<nav class="sb-sidenav accordion sb-sidenav-dark" id="sidenavAccordion">
<div class="sb-sidenav-menu">
<div class="nav">
<center>
<div class="sb-sidenav-menu-heading">AnaLogger</div><br>
</center>
<a type="link" class="btn btn-dark" href="/">
Logger
</a>
<a type="link" class="btn btn-dark" href="/">
Settings
</a>
<a type="link" class="btn btn-dark" href="/">
About
</a>
</div>
</div>
</nav>
{% block content %}
<main>
<div class="container-fluid py-2">
<div class="row">
<div class="col-6 col-md-4">
<a href="logger" class="btn btn-block btn-success text-uppercase">Logger</a>
</div>
<!--contenuto della pagina main-->
<div id="layoutSidenav_content">
<main>
<div class="container-fluid py-2">
<div class="row">
<div class="col-xl-6">
<div class="card mb-4">
<div class="card-header">
<i class="fas fa-chart-area mr-1"></i>
Server time
</div>
<p id="timeSrv"><span id="ServerTime"></span></p>
</div>
</div>
<div class="col-xl-6">
<div class="card mb-4">
<div class="card-header">
<i class="fas fa-chart-bar mr-1"></i>
Last log time
</div>
<p id="timeLog"><span id="LoggerTime"></span></p>
</div>
</div>
</div>
<div class="card mb-4">
<div class="card-header">
<i class="fas fa-table mr-1"></i>
Channels Reading
</div>
<div class="card-body">
<div class="row">
<div class="col-3">
Canale 1: <span id="Chan0"></span>
</div>
<div class="col-3">
Canale 2: <span id="Chan1"></span>
</div>
<div class="col-3">
Canale 3: <span id="Chan2"></span>
</div>
<div class="col-3">
Canale 4: <span id="Chan3"></span>
</div>
</div>
<div class="row">
<div class="col-3">
Canale 5: <span id="Chan4"></span>
</div>
<div class="col-3">
Canale 6: <span id="Chan5"></span>
</div>
<div class="col-3">
Canale 7: <span id="Chan6"></span>
</div>
<div class="col-3">
Canale 8: <span id="Chan7"></span>
</div>
</div>
</div>
</div>
<!--pulsanti start log e stop log-->
<center>
<button type="button" class="btn btn-success" onclick="startLog()">Start Log</button>
<button type="button" class="btn btn-danger" onclick="stopLog()">Stop Log</button>
</center>
<br>
<div class="card mb-4">
<div class="card-header">
<div class="row">
<div class="col-6">
<i class="fas fa-table mr-1"></i>
Record Log
</div>
<div class="col-6 text-right">
<button type="button" class="btn btn-primary" onclick="startNewRec()">Create record File</button>
</div>
</div>
</div>
<div class="card-body">
<div class="row" id="divNewFile">
<form class="col-12" method="POST" action="/api/v1/sessions">
<div class="input-group mb-3">
<span class="input-group-text">Nuova sessione</span>
<input type="text" class="form-control" id="NewSessionName" name="NewSessionName"></input>
<div class="input-group-append">
<input type="submit" value="Invio" class="btn btn-success"></input>
</div>
</div>
</form>
</div>
<div class="row">
<div class="col-2">check</div>
<div class="col-2">Inizio</div>
<div class="col-2">Durata</div>
<div class="col-2">Nome</div>
<div class="col-4">Copy</div>
</div>
<div class="row">
<div class="col-2">check</div>
<div class="col-2">Inizio</div>
<div class="col-2">Durata</div>
<div class="col-2">Nome</div>
<div class="col-4">Copy</div>
</div>
</div>
</div>
</div>
</main>
<!--fine contenuto main, inizio footer-->
<footer class="py-4 bg-light mt-auto">
<div class="container-fluid">
<div class="d-flex align-items-center justify-content-between small">
<div class="text-muted">Copyright &copy; Steamware srl 2021</div>
</div>
</div>
</footer>
<div class="col-6 col-md-4">
<a href="setup" class="btn btn-block btn-success text-uppercase">Setup</a>
</div>
<div class="col-6 col-md-4">
<a href="about" class="btn btn-block btn-success text-uppercase">About</a>
</div>
</div>
</body>
</html>
</div>
</main>
{% endblock %}
+6 -109
View File
@@ -91,13 +91,13 @@
<center>
<div class="sb-sidenav-menu-heading">AnaLogger</div><br>
</center>
<a type="link" class="btn btn-dark" href="/">
<a type="link" class="btn btn-dark" href="/logger">
Logger
</a>
<a type="link" class="btn btn-dark" href="/">
<a type="link" class="btn btn-dark" href="/setup">
Settings
</a>
<a type="link" class="btn btn-dark" href="/">
<a type="link" class="btn btn-dark" href="/about">
About
</a>
</div>
@@ -106,112 +106,9 @@
</div>
<!--contenuto della pagina main-->
<div id="layoutSidenav_content">
<main>
<div class="container-fluid py-2">
<div class="row">
<div class="col-xl-6">
<div class="card mb-4">
<div class="card-header">
<i class="fas fa-chart-area mr-1"></i>
Server time
</div>
<p id="timeSrv"><span id="ServerTime"></span></p>
</div>
</div>
<div class="col-xl-6">
<div class="card mb-4">
<div class="card-header">
<i class="fas fa-chart-bar mr-1"></i>
Last log time
</div>
<p id="timeLog"><span id="LoggerTime"></span></p>
</div>
</div>
</div>
<div class="card mb-4">
<div class="card-header">
<i class="fas fa-table mr-1"></i>
Channels Reading
</div>
<div class="card-body">
<div class="row">
<div class="col-3">
Canale 1: <span id="Chan0"></span>
</div>
<div class="col-3">
Canale 2: <span id="Chan1"></span>
</div>
<div class="col-3">
Canale 3: <span id="Chan2"></span>
</div>
<div class="col-3">
Canale 4: <span id="Chan3"></span>
</div>
</div>
<div class="row">
<div class="col-3">
Canale 5: <span id="Chan4"></span>
</div>
<div class="col-3">
Canale 6: <span id="Chan5"></span>
</div>
<div class="col-3">
Canale 7: <span id="Chan6"></span>
</div>
<div class="col-3">
Canale 8: <span id="Chan7"></span>
</div>
</div>
</div>
</div>
<!--pulsanti start log e stop log-->
<center>
<button type="button" class="btn btn-success" onclick="startLog()">Start Log</button>
<button type="button" class="btn btn-danger" onclick="stopLog()">Stop Log</button>
</center>
<br>
<div class="card mb-4">
<div class="card-header">
<div class="row">
<div class="col-6">
<i class="fas fa-table mr-1"></i>
Record Log
</div>
<div class="col-6 text-right">
<button type="button" class="btn btn-primary" onclick="startNewRec()">Create record File</button>
</div>
</div>
</div>
<div class="card-body">
<div class="row" id="divNewFile">
<form class="col-12" method="POST" action="/api/v1/sessions">
<div class="input-group mb-3">
<span class="input-group-text">Nuova sessione</span>
<input type="text" class="form-control" id="NewSessionName" name="NewSessionName"></input>
<div class="input-group-append">
<input type="submit" value="Invio" class="btn btn-success"></input>
</div>
</div>
</form>
</div>
<div class="row">
<div class="col-2">check</div>
<div class="col-2">Inizio</div>
<div class="col-2">Durata</div>
<div class="col-2">Nome</div>
<div class="col-4">Copy</div>
</div>
<div class="row">
<div class="col-2">check</div>
<div class="col-2">Inizio</div>
<div class="col-2">Durata</div>
<div class="col-2">Nome</div>
<div class="col-4">Copy</div>
</div>
</div>
</div>
</div>
</main>
{% block content %}
{% endblock %}
<!--fine contenuto main, inizio footer-->
<footer class="py-4 bg-light mt-auto">
<div class="container-fluid">
+104 -220
View File
@@ -1,226 +1,110 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
<meta name="description" content="FlyThis" />
<meta name="author" content="Marco Loca" />
<title>{{ title }}</title>
<link rel="shortcut icon" href="../static/img/steam.ico">
<link rel="stylesheet" href="../static/css/styles.css"/>
<link rel="stylesheet" href="../static/css/fonts.css">
<script src="../static/js/jquery-3.6.0.min.js"></script>
</head>
<body class="sb-nav-fixed">
<script>
{% extends "layout.html" %}
var intTime=250;
// fix visualizzazioni
fixDisplay();
// avvio timer
var timeout = setTimeout(dataRefresh, intTime);
function fixDisplay(){
$("#divNewFile").toggle();
//console.log("div hidden");
}
function dataRefresh() {
// scarico i dati aggioranti
$.ajax({url: "/api/v1/channels/all", success: function(result){
// compilo i dati scaricati
$("#Chan0").html(result.Ch0);
$("#Chan1").html(result.Ch1);
$("#Chan2").html(result.Ch2);
$("#Chan3").html(result.Ch3);
$("#Chan4").html(result.Ch4);
$("#Chan5").html(result.Ch5);
$("#Chan6").html(result.Ch6);
$("#Chan7").html(result.Ch7);
$("#ServerTime").html(result.timeSrv);
$("#LoggerTime").html(result.timeLog);
//console.log(result);
}});
timeout = setTimeout(dataRefresh, intTime);
}
function startLog(){
$.ajax({
type: 'PUT'
,url: "/api/v1/log/start"
,data: ""
,success: function(){
alert('Log Started');
}
})
intTime= 250;
};
function stopLog(){
$.ajax({
type: 'PUT'
,url: "/api/v1/log/stop"
,data: ""
,success: function(){
alert('Log Stopped');
}
})
intTime = 2500;
};
// Funzione startNewRec: assegna nuovo nome con data e ora al file .csv di record
function startNewRec(){
var d = new Date();
var name= d.toISOString().replace('T','_').replace('-','_').replace('-','_').replace(':','_').replace(':','_').replace('.','_').replace('Z','')+'.csv';
//console.log(name);
$('#NewSessionName').val(name);
}
</script>
<nav class="sb-topnav navbar navbar-expand navbar-dark bg-dark">
<img src="../static/img/steam.ico" height="52" width="52">
<h3>Steamware</h3>
</nav>
<!-- Sidebar con link di navigazione-->
<div id="layoutSidenav">
<div id="layoutSidenav_nav">
<nav class="sb-sidenav accordion sb-sidenav-dark" id="sidenavAccordion">
<div class="sb-sidenav-menu">
<div class="nav">
<center>
<div class="sb-sidenav-menu-heading">AnaLogger</div><br>
</center>
<a type="link" class="btn btn-dark" href="/">
Logger
</a>
<a type="link" class="btn btn-dark" href="/">
Settings
</a>
<a type="link" class="btn btn-dark" href="/">
About
</a>
</div>
{% block content %}
<main>
<div class="container-fluid py-2">
<div class="row">
<div class="col-xl-6">
<div class="card mb-4">
<div class="card-header">
<i class="fas fa-chart-area mr-1"></i>
Server time
</div>
</nav>
<p id="timeSrv"><span id="ServerTime"></span></p>
</div>
</div>
<!--contenuto della pagina main-->
<div id="layoutSidenav_content">
<main>
<div class="container-fluid py-2">
<div class="row">
<div class="col-xl-6">
<div class="card mb-4">
<div class="card-header">
<i class="fas fa-chart-area mr-1"></i>
Server time
</div>
<p id="timeSrv"><span id="ServerTime"></span></p>
</div>
</div>
<div class="col-xl-6">
<div class="card mb-4">
<div class="card-header">
<i class="fas fa-chart-bar mr-1"></i>
Last log time
</div>
<p id="timeLog"><span id="LoggerTime"></span></p>
</div>
</div>
</div>
<div class="card mb-4">
<div class="card-header">
<i class="fas fa-table mr-1"></i>
Channels Reading
</div>
<div class="card-body">
<div class="row">
<div class="col-3">
Canale 1: <span id="Chan0"></span>
</div>
<div class="col-3">
Canale 2: <span id="Chan1"></span>
</div>
<div class="col-3">
Canale 3: <span id="Chan2"></span>
</div>
<div class="col-3">
Canale 4: <span id="Chan3"></span>
</div>
</div>
<div class="row">
<div class="col-3">
Canale 5: <span id="Chan4"></span>
</div>
<div class="col-3">
Canale 6: <span id="Chan5"></span>
</div>
<div class="col-3">
Canale 7: <span id="Chan6"></span>
</div>
<div class="col-3">
Canale 8: <span id="Chan7"></span>
</div>
</div>
</div>
</div>
<!--pulsanti start log e stop log-->
<center>
<button type="button" class="btn btn-success" onclick="startLog()">Start Log</button>
<button type="button" class="btn btn-danger" onclick="stopLog()">Stop Log</button>
</center>
<br>
<div class="card mb-4">
<div class="card-header">
<div class="row">
<div class="col-6">
<i class="fas fa-table mr-1"></i>
Record Log
</div>
<div class="col-6 text-right">
<button type="button" class="btn btn-primary" onclick="startNewRec()">Create record File</button>
</div>
</div>
</div>
<div class="card-body">
<div class="row" id="divNewFile">
<form class="col-12" method="POST" action="/api/v1/sessions">
<div class="input-group mb-3">
<span class="input-group-text">Nuova sessione</span>
<input type="text" class="form-control" id="NewSessionName" name="NewSessionName"></input>
<div class="input-group-append">
<input type="submit" value="Invio" class="btn btn-success"></input>
</div>
</div>
</form>
</div>
<div class="row">
<div class="col-2">check</div>
<div class="col-2">Inizio</div>
<div class="col-2">Durata</div>
<div class="col-2">Nome</div>
<div class="col-4">Copy</div>
</div>
<div class="row">
<div class="col-2">check</div>
<div class="col-2">Inizio</div>
<div class="col-2">Durata</div>
<div class="col-2">Nome</div>
<div class="col-4">Copy</div>
</div>
</div>
</div>
<div class="col-xl-6">
<div class="card mb-4">
<div class="card-header">
<i class="fas fa-chart-bar mr-1"></i>
Last log time
</div>
</main>
<!--fine contenuto main, inizio footer-->
<footer class="py-4 bg-light mt-auto">
<div class="container-fluid">
<div class="d-flex align-items-center justify-content-between small">
<div class="text-muted">Copyright &copy; Steamware srl 2021</div>
</div>
</div>
</footer>
<p id="timeLog"><span id="LoggerTime"></span></p>
</div>
</div>
</div>
</body>
</html>
<div class="card mb-4">
<div class="card-header">
<i class="fas fa-table mr-1"></i>
Channels Reading
</div>
<div class="card-body">
<div class="row">
<div class="col-3">
Canale 1: <span id="Chan0"></span>
</div>
<div class="col-3">
Canale 2: <span id="Chan1"></span>
</div>
<div class="col-3">
Canale 3: <span id="Chan2"></span>
</div>
<div class="col-3">
Canale 4: <span id="Chan3"></span>
</div>
</div>
<div class="row">
<div class="col-3">
Canale 5: <span id="Chan4"></span>
</div>
<div class="col-3">
Canale 6: <span id="Chan5"></span>
</div>
<div class="col-3">
Canale 7: <span id="Chan6"></span>
</div>
<div class="col-3">
Canale 8: <span id="Chan7"></span>
</div>
</div>
</div>
</div>
<!--pulsanti start log e stop log-->
<center>
<button type="button" class="btn btn-success" onclick="startLog()">Start Log</button>
<button type="button" class="btn btn-danger" onclick="stopLog()">Stop Log</button>
</center>
<br>
<div class="card mb-4">
<div class="card-header">
<div class="row">
<div class="col-6">
<i class="fas fa-table mr-1"></i>
Record Log
</div>
<div class="col-6 text-right">
<button type="button" class="btn btn-primary" onclick="startNewRec()">Create record File</button>
</div>
</div>
</div>
<div class="card-body">
<div class="row" id="divNewFile">
<form class="col-12" method="POST" action="/api/v1/sessions">
<div class="input-group mb-3">
<span class="input-group-text">Nuova sessione</span>
<input type="text" class="form-control" id="NewSessionName" name="NewSessionName"></input>
<div class="input-group-append">
<input type="submit" value="Invio" class="btn btn-success"></input>
</div>
</div>
</form>
</div>
<div class="row">
<div class="col-2">check</div>
<div class="col-2">Inizio</div>
<div class="col-2">Durata</div>
<div class="col-2">Nome</div>
<div class="col-4">Copy</div>
</div>
<div class="row">
<div class="col-2">check</div>
<div class="col-2">Inizio</div>
<div class="col-2">Durata</div>
<div class="col-2">Nome</div>
<div class="col-4">Copy</div>
</div>
</div>
</div>
</div>
</main>
{% endblock %}
+104 -220
View File
@@ -1,226 +1,110 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
<meta name="description" content="FlyThis" />
<meta name="author" content="Marco Loca" />
<title>{{ title }}</title>
<link rel="shortcut icon" href="../static/img/steam.ico">
<link rel="stylesheet" href="../static/css/styles.css"/>
<link rel="stylesheet" href="../static/css/fonts.css">
<script src="../static/js/jquery-3.6.0.min.js"></script>
</head>
<body class="sb-nav-fixed">
<script>
{% extends "layout.html" %}
var intTime=250;
// fix visualizzazioni
fixDisplay();
// avvio timer
var timeout = setTimeout(dataRefresh, intTime);
function fixDisplay(){
$("#divNewFile").toggle();
//console.log("div hidden");
}
function dataRefresh() {
// scarico i dati aggioranti
$.ajax({url: "/api/v1/channels/all", success: function(result){
// compilo i dati scaricati
$("#Chan0").html(result.Ch0);
$("#Chan1").html(result.Ch1);
$("#Chan2").html(result.Ch2);
$("#Chan3").html(result.Ch3);
$("#Chan4").html(result.Ch4);
$("#Chan5").html(result.Ch5);
$("#Chan6").html(result.Ch6);
$("#Chan7").html(result.Ch7);
$("#ServerTime").html(result.timeSrv);
$("#LoggerTime").html(result.timeLog);
//console.log(result);
}});
timeout = setTimeout(dataRefresh, intTime);
}
function startLog(){
$.ajax({
type: 'PUT'
,url: "/api/v1/log/start"
,data: ""
,success: function(){
alert('Log Started');
}
})
intTime= 250;
};
function stopLog(){
$.ajax({
type: 'PUT'
,url: "/api/v1/log/stop"
,data: ""
,success: function(){
alert('Log Stopped');
}
})
intTime = 2500;
};
// Funzione startNewRec: assegna nuovo nome con data e ora al file .csv di record
function startNewRec(){
var d = new Date();
var name= d.toISOString().replace('T','_').replace('-','_').replace('-','_').replace(':','_').replace(':','_').replace('.','_').replace('Z','')+'.csv';
//console.log(name);
$('#NewSessionName').val(name);
}
</script>
<nav class="sb-topnav navbar navbar-expand navbar-dark bg-dark">
<img src="../static/img/steam.ico" height="52" width="52">
<h3>Steamware</h3>
</nav>
<!-- Sidebar con link di navigazione-->
<div id="layoutSidenav">
<div id="layoutSidenav_nav">
<nav class="sb-sidenav accordion sb-sidenav-dark" id="sidenavAccordion">
<div class="sb-sidenav-menu">
<div class="nav">
<center>
<div class="sb-sidenav-menu-heading">AnaLogger</div><br>
</center>
<a type="link" class="btn btn-dark" href="/">
Logger
</a>
<a type="link" class="btn btn-dark" href="/">
Settings
</a>
<a type="link" class="btn btn-dark" href="/">
About
</a>
</div>
{% block content %}
<main>
<div class="container-fluid py-2">
<div class="row">
<div class="col-xl-6">
<div class="card mb-4">
<div class="card-header">
<i class="fas fa-chart-area mr-1"></i>
Server time
</div>
</nav>
<p id="timeSrv"><span id="ServerTime"></span></p>
</div>
</div>
<!--contenuto della pagina main-->
<div id="layoutSidenav_content">
<main>
<div class="container-fluid py-2">
<div class="row">
<div class="col-xl-6">
<div class="card mb-4">
<div class="card-header">
<i class="fas fa-chart-area mr-1"></i>
Server time
</div>
<p id="timeSrv"><span id="ServerTime"></span></p>
</div>
</div>
<div class="col-xl-6">
<div class="card mb-4">
<div class="card-header">
<i class="fas fa-chart-bar mr-1"></i>
Last log time
</div>
<p id="timeLog"><span id="LoggerTime"></span></p>
</div>
</div>
</div>
<div class="card mb-4">
<div class="card-header">
<i class="fas fa-table mr-1"></i>
Channels Reading
</div>
<div class="card-body">
<div class="row">
<div class="col-3">
Canale 1: <span id="Chan0"></span>
</div>
<div class="col-3">
Canale 2: <span id="Chan1"></span>
</div>
<div class="col-3">
Canale 3: <span id="Chan2"></span>
</div>
<div class="col-3">
Canale 4: <span id="Chan3"></span>
</div>
</div>
<div class="row">
<div class="col-3">
Canale 5: <span id="Chan4"></span>
</div>
<div class="col-3">
Canale 6: <span id="Chan5"></span>
</div>
<div class="col-3">
Canale 7: <span id="Chan6"></span>
</div>
<div class="col-3">
Canale 8: <span id="Chan7"></span>
</div>
</div>
</div>
</div>
<!--pulsanti start log e stop log-->
<center>
<button type="button" class="btn btn-success" onclick="startLog()">Start Log</button>
<button type="button" class="btn btn-danger" onclick="stopLog()">Stop Log</button>
</center>
<br>
<div class="card mb-4">
<div class="card-header">
<div class="row">
<div class="col-6">
<i class="fas fa-table mr-1"></i>
Record Log
</div>
<div class="col-6 text-right">
<button type="button" class="btn btn-primary" onclick="startNewRec()">Create record File</button>
</div>
</div>
</div>
<div class="card-body">
<div class="row" id="divNewFile">
<form class="col-12" method="POST" action="/api/v1/sessions">
<div class="input-group mb-3">
<span class="input-group-text">Nuova sessione</span>
<input type="text" class="form-control" id="NewSessionName" name="NewSessionName"></input>
<div class="input-group-append">
<input type="submit" value="Invio" class="btn btn-success"></input>
</div>
</div>
</form>
</div>
<div class="row">
<div class="col-2">check</div>
<div class="col-2">Inizio</div>
<div class="col-2">Durata</div>
<div class="col-2">Nome</div>
<div class="col-4">Copy</div>
</div>
<div class="row">
<div class="col-2">check</div>
<div class="col-2">Inizio</div>
<div class="col-2">Durata</div>
<div class="col-2">Nome</div>
<div class="col-4">Copy</div>
</div>
</div>
</div>
<div class="col-xl-6">
<div class="card mb-4">
<div class="card-header">
<i class="fas fa-chart-bar mr-1"></i>
Last log time
</div>
</main>
<!--fine contenuto main, inizio footer-->
<footer class="py-4 bg-light mt-auto">
<div class="container-fluid">
<div class="d-flex align-items-center justify-content-between small">
<div class="text-muted">Copyright &copy; Steamware srl 2021</div>
</div>
</div>
</footer>
<p id="timeLog"><span id="LoggerTime"></span></p>
</div>
</div>
</div>
</body>
</html>
<div class="card mb-4">
<div class="card-header">
<i class="fas fa-table mr-1"></i>
Channels Reading
</div>
<div class="card-body">
<div class="row">
<div class="col-3">
Canale 1: <span id="Chan0"></span>
</div>
<div class="col-3">
Canale 2: <span id="Chan1"></span>
</div>
<div class="col-3">
Canale 3: <span id="Chan2"></span>
</div>
<div class="col-3">
Canale 4: <span id="Chan3"></span>
</div>
</div>
<div class="row">
<div class="col-3">
Canale 5: <span id="Chan4"></span>
</div>
<div class="col-3">
Canale 6: <span id="Chan5"></span>
</div>
<div class="col-3">
Canale 7: <span id="Chan6"></span>
</div>
<div class="col-3">
Canale 8: <span id="Chan7"></span>
</div>
</div>
</div>
</div>
<!--pulsanti start log e stop log-->
<center>
<button type="button" class="btn btn-success" onclick="startLog()">Start Log</button>
<button type="button" class="btn btn-danger" onclick="stopLog()">Stop Log</button>
</center>
<br>
<div class="card mb-4">
<div class="card-header">
<div class="row">
<div class="col-6">
<i class="fas fa-table mr-1"></i>
Record Log
</div>
<div class="col-6 text-right">
<button type="button" class="btn btn-primary" onclick="startNewRec()">Create record File</button>
</div>
</div>
</div>
<div class="card-body">
<div class="row" id="divNewFile">
<form class="col-12" method="POST" action="/api/v1/sessions">
<div class="input-group mb-3">
<span class="input-group-text">Nuova sessione</span>
<input type="text" class="form-control" id="NewSessionName" name="NewSessionName"></input>
<div class="input-group-append">
<input type="submit" value="Invio" class="btn btn-success"></input>
</div>
</div>
</form>
</div>
<div class="row">
<div class="col-2">check</div>
<div class="col-2">Inizio</div>
<div class="col-2">Durata</div>
<div class="col-2">Nome</div>
<div class="col-4">Copy</div>
</div>
<div class="row">
<div class="col-2">check</div>
<div class="col-2">Inizio</div>
<div class="col-2">Durata</div>
<div class="col-2">Nome</div>
<div class="col-4">Copy</div>
</div>
</div>
</div>
</div>
</main>
{% endblock %}