Sat, 25 Aug 2018 11:40:31 +0200
Monitor nodes sorting and removed obsolete scripts.
www/Makefile | file | annotate | diff | comparison | revisions | |
www/getfermenters.php | file | annotate | diff | comparison | revisions | |
www/getnodes.php | file | annotate | diff | comparison | revisions | |
www/includes/global.inc.php | file | annotate | diff | comparison | revisions |
--- a/www/Makefile Fri Aug 24 23:00:15 2018 +0200 +++ b/www/Makefile Sat Aug 25 11:40:31 2018 +0200 @@ -3,8 +3,7 @@ include ../Makefile.global -SRC = getfermenter.php getfermenters.php \ - getnode.php getnodes.php config.php.dist index.php \ +SRC = getfermenter.php getnode.php config.php.dist index.php \ inv_fermentables.php inv_hops.php inv_mash_profiles.php \ inv_miscs.php inv_suppliers.php inv_water_profiles.php \ inv_water_sources.php inv_yeasts.php inv_equipments.php \
--- a/www/getfermenters.php Fri Aug 24 23:00:15 2018 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ -<?php -require_once('config.php'); -$mysqli = new mysqli(DBASE_HOST,DBASE_USER,DBASE_PASS,DBASE_NAME); -$result = $mysqli->query("SELECT uuid,node,alias,online,mode FROM fermenters"); -while($row = $result->fetch_array(MYSQLI_ASSOC)) { - if ($row['online'] == 'Y') - $row['online'] = true; - else - $row['online'] = false; - $resultArray[] = $row; -} -echo json_encode($resultArray);
--- a/www/getnodes.php Fri Aug 24 23:00:15 2018 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ -<?php -require_once('config.php'); -$mysqli = new mysqli(DBASE_HOST,DBASE_USER,DBASE_PASS,DBASE_NAME); -$result = $mysqli->query("SELECT uuid,node,online,net_address FROM nodes"); -while($row = $result->fetch_array(MYSQLI_ASSOC)) { - if ($row['online'] == 'Y') - $row['online'] = true; - else - $row['online'] = false; - $resultArray[] = $row; -} -echo json_encode($resultArray);
--- a/www/includes/global.inc.php Fri Aug 24 23:00:15 2018 +0200 +++ b/www/includes/global.inc.php Sat Aug 25 11:40:31 2018 +0200 @@ -92,7 +92,7 @@ <ul> <?php $mysqli = new mysqli(DBASE_HOST,DBASE_USER,DBASE_PASS,DBASE_NAME); -$result = $mysqli->query("SELECT uuid,node,online,net_address FROM nodes"); +$result = $mysqli->query("SELECT uuid,node,online,net_address FROM nodes ORDER BY node"); while($row = $result->fetch_array(MYSQLI_ASSOC)) { echo ' <li><a href="mon_node.php?uuid='.$row['uuid'].'">'.$row['node'].'</a></li>'.PHP_EOL; } @@ -103,7 +103,7 @@ <li>Klimaatkasten <ul> <?php -$result = $mysqli->query("SELECT uuid,node,alias,online,mode FROM fermenters"); +$result = $mysqli->query("SELECT uuid,node,alias,online,mode FROM fermenters ORDER BY node,alias"); while($row = $result->fetch_array(MYSQLI_ASSOC)) { echo ' <li><a href="mon_fermenter.php?uuid='.$row['uuid'].'">'.$row['node'].'/'.$row['alias'].'</a></li>'.PHP_EOL; }