--- a/www/includes/global.inc.php Tue May 19 22:48:59 2020 +0200
+++ b/www/includes/global.inc.php Wed May 20 21:49:09 2020 +0200
@@ -193,7 +193,7 @@
</div>
<!-- Menu -->
- <div id="jqxMenu">
+ <div id="jqxMenu" style='float: left;'>
<ul>
<li style='width: 80px;'>
<a href="index.php">Home</a>
@@ -202,63 +202,22 @@
<ul style='width: 200px;'>
<li><img style='float: left; margin-right: 5px;' src='images/computer.png' />Systemen
<ul style='width: 200px;'>
-<?php
-$connect = mysqli_connect(DBASE_HOST,DBASE_USER,DBASE_PASS,DBASE_NAME);
-$result = mysqli_query($connect, "SELECT uuid,node,online,net_address FROM mon_nodes ORDER BY node");
-while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) {
- if ($row['online'] == 1)
- $img = "network-idle.png";
- else
- $img = "network-error.png";
- echo ' <li><img style="float: left; margin-right: 5px;" src="images/'.$img.'" /><a href="mon_node.php?uuid='.$row['uuid'].'">'.$row['node'].'</a></li>'.PHP_EOL;
-}
-mysqli_free_result($result);
-?>
+ <div id="m_nodes"></div>
</ul>
</li>
<li><img style='float: left; margin-right: 5px;' src='images/fridge.png' />Klimaatkasten
<ul style='width: 200px;'>
-<?php
-$result = mysqli_query($connect, "SELECT uuid,node,alias,online,mode FROM mon_fermenters ORDER BY node,alias");
-while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) {
- if ($row['online'] == 1)
- $img = "network-idle.png";
- else
- $img = "network-error.png";
- echo ' <li><img style="float: left; margin-right: 5px;" src="images/'.$img.'" /><a href="mon_fermenter.php?uuid='.$row['uuid'].'">'.$row['node'].'/'.$row['alias'].'</a></li>'.PHP_EOL;
-}
-mysqli_free_result($result);
-?>
+ <div id="m_fermenters"></div>
</ul>
</li>
<li><img style='float: left; margin-right: 5px;' src='images/beerbottle.png' />CO2 meters
<ul style='width: 250px;'>
-<?php
-$result = mysqli_query($connect, "SELECT uuid,node,alias,online,mode FROM mon_co2meters ORDER BY node,alias");
-while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) {
- if ($row['online'] == 1)
- $img = "network-idle.png";
- else
- $img = "network-error.png";
- echo ' <li><img style="float: left; margin-right: 5px;" src="images/'.$img.'" /><a href="mon_co2meter.php?uuid='.$row['uuid'].'">'.$row['node'].'/'.$row['alias'].'</a></li>'.PHP_EOL;
-}
-mysqli_free_result($result);
-?>
+ <div id="m_co2meters"></div>
</ul>
</li>
<li><img style='float: left; margin-right: 5px;' src='images/fermenter.png' />iSpindels
<ul style='width: 250px;'>
-<?php
-$result = mysqli_query($connect, "SELECT uuid,node,alias,online FROM mon_ispindels ORDER BY node,alias");
-while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) {
- if ($row['online'] == 1)
- $img = "network-idle.png";
- else
- $img = "network-error.png";
- echo ' <li><img style="float: left; margin-right: 5px;" src="images/'.$img.'" /><a href="mon_ispindel.php?uuid='.$row['uuid'].'">'.$row['alias'].'</a></li>'.PHP_EOL;
-}
-mysqli_free_result($result);
-?>
+ <div id="m_ispindels"></div>
</ul>
</li>
</ul>
@@ -323,11 +282,62 @@
<li><img style='float: left; margin-right: 5px;' src='images/help-about.png' /><a href="gen_about.php">Informatie</a></li>
</ul>
</li>
- <li style='width: 300px;'><div id="wsstatus">ws: nc</div></li>
</ul>
</div> <!-- End menu -->
+ <div id="jqxStatus">
+ <div id="wsstatus" style="padding: 5px;"></div>
+ </div>
<?php
+ $connect = mysqli_connect(DBASE_HOST,DBASE_USER,DBASE_PASS,DBASE_NAME);
+ $result = mysqli_query($connect, "SELECT uuid,node,online FROM mon_nodes ORDER BY node");
+ $menu_nodes = '';
+ while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) {
+ if ($row['online'] == 1)
+ $img = "network-idle.png";
+ else
+ $img = "network-error.png";
+ $menu_nodes .= '<li><img style="float: left; margin-right: 5px;" src="images/'.$img.'" /><a href="mon_node.php?uuid='.$row['uuid'].'">'.$row['node'].'</a></li>';
+ }
+ mysqli_free_result($result);
+ $menu_fermenters = '';
+ $result = mysqli_query($connect, "SELECT uuid,node,alias,online FROM mon_fermenters ORDER BY node,alias");
+ while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) {
+ if ($row['online'] == 1)
+ $img = "network-idle.png";
+ else
+ $img = "network-error.png";
+ $menu_fermenters .= '<li><img style="float: left; margin-right: 5px;" src="images/'.$img.'" /><a href="mon_fermenter.php?uuid='.$row['uuid'].'">'.$row['node'].'/'.$row['alias'].'</a></li>';
+ }
+ mysqli_free_result($result);
+ $menu_co2meters = '';
+ $result = mysqli_query($connect, "SELECT uuid,node,alias,online FROM mon_co2meters ORDER BY node,alias");
+ while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) {
+ if ($row['online'] == 1)
+ $img = "network-idle.png";
+ else
+ $img = "network-error.png";
+ $menu_co2meters .= '<li><img style="float: left; margin-right: 5px;" src="images/'.$img.'" /><a href="mon_co2meter.php?uuid='.$row['uuid'].'">'.$row['node'].'/'.$row['alias'].'</a></li>';
+ }
+ mysqli_free_result($result);
+ $menu_ispindels = '';
+ $result = mysqli_query($connect, "SELECT uuid,node,alias,online FROM mon_ispindels ORDER BY node,alias");
+ while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) {
+ if ($row['online'] == 1)
+ $img = "network-idle.png";
+ else
+ $img = "network-error.png";
+ $menu_ispindels .= '<li><img style="float: left; margin-right: 5px;" src="images/'.$img.'" /><a href="mon_ispindel.php?uuid='.$row['uuid'].'">'.$row['alias'].'</a></li>';
+ }
+ mysqli_free_result($result);
+?>
+ <script>
+ $('#m_nodes').html('<?php echo $menu_nodes; ?>');
+ $('#m_fermenters').html('<?php echo $menu_fermenters; ?>');
+ $('#m_co2meters').html('<?php echo $menu_co2meters; ?>');
+ $('#m_ispindels').html('<?php echo $menu_ispindels; ?>');
+ </script>
+<?php
}
