diff --git a/web/api/lastUpdate.php b/web/api/lastUpdate.php new file mode 100644 index 0000000000000000000000000000000000000000..ba32654c6d3ba80d0e78a6f8eec5e2a2e8fdbcf5 --- /dev/null +++ b/web/api/lastUpdate.php @@ -0,0 +1,19 @@ +<?php + + +if (isset($_POST["param"])){ + +require_once("../classes/SQL.php"); + $sql = new SQL(); + $link = $sql->getLink(); + + $query = "SELECT tbl_data.id as id, tbl_parameter.param as param, tbl_data.value as value, DATE_FORMAT(tbl_data.timestamp, '%d.%m.%Y %H:%i:%s') as date FROM (tbl_register INNER JOIN tbl_parameter ON tbl_register.id = tbl_parameter.fid_register) INNER JOIN tbl_data ON tbl_parameter.id = tbl_data.fid_parameter WHERE tbl_data.fid_parameter = ".$_POST["param"]." ORDER BY tbl_data.id DESC LIMIT 1"; + + $result = $link->query($query); + while($row = $result->fetch_assoc()) { + echo $row["date"]; + } + +} + +?> \ No newline at end of file diff --git a/web/include/_foot.php b/web/include/_foot.php index 9c2c241a8d3e1bccf9e887cb78f0fda7fe5a187a..ea223bb11b637b3882cbd3224f90b9790c10a424 100644 --- a/web/include/_foot.php +++ b/web/include/_foot.php @@ -14,7 +14,7 @@ <!-- /.container --> <!-- jQuery --> - <script src="js/jquery.js"></script> + <!-- Bootstrap Core JavaScript --> <script src="js/bootstrap.min.js"></script> diff --git a/web/include/_head.php b/web/include/_head.php index b528d123f527ac93b903055bda5dc46eab8e546c..844794883dd53f20a33f5b21bf6bda4a38ef0bb2 100644 --- a/web/include/_head.php +++ b/web/include/_head.php @@ -27,6 +27,7 @@ </head> <body> +<script src="js/jquery.js"></script> <!-- Navigation --> <nav class="navbar navbar-inverse navbar-fixed-top" role="navigation"> diff --git a/web/index.php b/web/index.php index d7dba18744e8cd9d3e23d6ba87db14e576a029fc..6449633287eb14140d00f272dd283546014b7f42 100755 --- a/web/index.php +++ b/web/index.php @@ -35,7 +35,7 @@ while($row = $result->fetch_assoc()) { <div class="row">'; - $query2 = "SELECT * FROM (tbl_register INNER JOIN tbl_parameter ON tbl_register.id = tbl_parameter.fid_register) INNER JOIN tbl_data ON tbl_parameter.id = tbl_data.fid_parameter WHERE tbl_register.id = ".$row["fid_register"]." AND tbl_data.id IN (SELECT max(id) FROM tbl_data group by fid_parameter)"; + $query2 = "SELECT type, fid_parameter, param, value, DATE_FORMAT(tbl_data.timestamp, '%d.%m.%Y %H:%i:%s') as date FROM (tbl_register INNER JOIN tbl_parameter ON tbl_register.id = tbl_parameter.fid_register) INNER JOIN tbl_data ON tbl_parameter.id = tbl_data.fid_parameter WHERE tbl_register.id = ".$row["fid_register"]." AND tbl_data.id IN (SELECT max(id) FROM tbl_data group by fid_parameter)"; $result2 = $link->query($query2); while($row2 = $result2->fetch_assoc()) { @@ -57,10 +57,10 @@ while($row = $result->fetch_assoc()) { array_push($graphs, $row2["fid_parameter"]); } echo ' - <h3> + <h4> <a href="details.php?param='.$row2["fid_parameter"].'">'.$row2["param"].'</a> - </h3> - <p>'.$row2["value"].'</p> + </h4> + <p><b>Value: </b>'.$row2["value"].' <br> <small><i>Last update: <span id="t'.$row2["fid_parameter"].'">'.$row2["date"].'</span></i></small></p> </div>'; } @@ -77,9 +77,16 @@ setInterval(function() { foreach ($graphs as &$param){ echo "document.getElementById('p".$param."').src = 'graph.php?param=".$param."&rand=' + Math.random(); "; + echo '$.post("api/lastUpdate.php", + { + param: "'.$param.'" + }, + function(data, status){ + $("#t'.$param.'").text(data); + });'; } echo ' -}, 1000); +}, 25000); </script> '; ?>