Update Value - API in JSON

web/api/lastUpdate.php

@@ -11,7 +11,7 @@ require_once("../classes/SQL.php");
 
 	$result = $link->query($query);
         while($row = $result->fetch_assoc()) {
-        	echo $row["date"];
+        	echo '{"update":"'.$row["date"].'", "value":"'.$row["value"].'"}';
         }
 
 }

web/include/_head.php

@@ -46,7 +46,7 @@
             <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
                 <ul class="nav navbar-nav">
                     <li>
-                        <a href="index.php">Dashbaord</a>
+                        <a href="index.php">Dashboard</a>
                     </li>
                     <li>
                         <a href="admin/" target="_blank">Admin</a>

web/include/config.php

@@ -4,5 +4,13 @@ $TBL_PARAMETER = "tbl_parameter";
 $TBL_REGISTER = "tbl_register";
 $TBL_DATA = "tbl_data";
 $GRAPHPOINTS = -50;
+$THUMBSIZE = 4; // 1 min, 12 max
 
+// Wenn letzte Nachricht älter als X Stunden, wird das Gerät aus dem Dashboard entfernt
+$DEVICEOFFLINETIME =  10;
+
+
+
+// +++++++++++++++++ DONT DO ANY CHANGES AFTER THIS LINE ++++++++++++++++++
+$DEVICEOFFLINETIME = $DEVICEOFFLINETIME * 60;
 ?>
\ No newline at end of file

web/index.php

 <?php
 require_once("classes/SQL.php");
 include("include/_head.php");
+include("include/config.php");
 ?>
 
 <!-- Page Header -->
@@ -16,7 +17,7 @@ $sql = new SQL();
 $link = $sql->getLink();
 $graphs = array();
 
-$query = "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 IN (SELECT max(id) FROM tbl_register group by clientAddress) AND tbl_data.id IN (SELECT max(id) FROM tbl_data group by fid_parameter) GROUP BY name";
+$query = "SELECT clientAddress, name, max(tbl_data.timestamp) as date, fid_register 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 fid_register IN (SELECT max(id) FROM tbl_register group by clientAddress) AND tbl_data.timestamp > (NOW() - INTERVAL ".$DEVICEOFFLINETIME." MINUTE) group by fid_register";
 
 
 
@@ -28,21 +29,20 @@ while($row = $result->fetch_assoc()) {
         <div class="row">
             <div class="col-lg-12">
                 <h3 class="page-header">'.$row["name"].'
-                    <small>Secondary Text</small>
                 </h3>
             </div>
         </div>
         <div class="row">';
 
     
-    $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)";
+    $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) ORDER BY tbl_parameter.id";
     $result2 = $link->query($query2);
 
     while($row2 = $result2->fetch_assoc()) {
 
 
         echo '
-            <div class="col-md-4 portfolio-item">';
+            <div class="col-md-'.$THUMBSIZE.' portfolio-item">';
 
             if ($row2["type"] == "string"){
                 echo '
@@ -60,7 +60,7 @@ while($row = $result->fetch_assoc()) {
                 <h4>
                     <a href="details.php?param='.$row2["fid_parameter"].'">'.$row2["param"].'</a>
                 </h4>
-                <p><b>Value: </b>'.$row2["value"].' <br> <small><i>Last update: <span id="t'.$row2["fid_parameter"].'">'.$row2["date"].'</span></i></small></p>
+                <p><b>Value: </b> <span id="v'.$row2["fid_parameter"].'">'.$row2["value"].'</span> <br> <small><i>Last update: <span id="u'.$row2["fid_parameter"].'">'.$row2["date"].'</span></i></small></p>
             </div>';
     }
 
@@ -82,7 +82,9 @@ setInterval(function() {
                 param: "'.$param.'"
             },
             function(data, status){
-                $("#t'.$param.'").text(data);
+                var response = $.parseJSON(data);
+                $("#u'.$param.'").text(response.update);
+                $("#v'.$param.'").text(response.value);
             });';
     }
 echo '