Fri, 10 Aug 2018 21:22:09 +0200
Fixes boolean values and only display valid fields in node view.
www/getfermenter.php | file | annotate | diff | comparison | revisions | |
www/getfermenters.php | file | annotate | diff | comparison | revisions | |
www/getnode.php | file | annotate | diff | comparison | revisions | |
www/getnodes.php | file | annotate | diff | comparison | revisions | |
www/index.php | file | annotate | diff | comparison | revisions |
--- a/www/getfermenter.php Fri Aug 10 16:52:57 2018 +0200 +++ b/www/getfermenter.php Fri Aug 10 21:22:09 2018 +0200 @@ -11,6 +11,10 @@ $mysqli = new mysqli(DBASE_HOST,DBASE_USER,DBASE_PASS,DBASE_NAME); $query = "SELECT * FROM fermenters WHERE uuid=".$uuid.""; $result = $mysqli->query($query); -//Copy result into a associative array $resultArray = $result->fetch_array(MYSQLI_ASSOC); +if ($resultArray['online'] == 'Y') { + $resultArray['online'] = true; +} else { + $resultArray['online'] = false; +} echo json_encode($resultArray);
--- a/www/getfermenters.php Fri Aug 10 16:52:57 2018 +0200 +++ b/www/getfermenters.php Fri Aug 10 21:22:09 2018 +0200 @@ -1,9 +1,12 @@ <?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"); -//Copy result into a associative array -$resultArray = $result->fetch_all(MYSQLI_ASSOC); +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/getnode.php Fri Aug 10 16:52:57 2018 +0200 +++ b/www/getnode.php Fri Aug 10 21:22:09 2018 +0200 @@ -13,4 +13,9 @@ $result = $mysqli->query($query); //Copy result into a associative array $resultArray = $result->fetch_array(MYSQLI_ASSOC); +if ($resultArray['online'] == 'Y') { + $resultArray['online'] = true; +} else { + $resultArray['online'] = false; +} echo json_encode($resultArray);
--- a/www/getnodes.php Fri Aug 10 16:52:57 2018 +0200 +++ b/www/getnodes.php Fri Aug 10 21:22:09 2018 +0200 @@ -1,9 +1,12 @@ <?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"); -//Copy result into a associative array -$resultArray = $result->fetch_all(MYSQLI_ASSOC); +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/index.php Fri Aug 10 16:52:57 2018 +0200 +++ b/www/index.php Fri Aug 10 21:22:09 2018 +0200 @@ -35,7 +35,7 @@ var nodeByID = $("#jqxTree").find("#Nodes")[0]; $.getJSON("getnodes.php", function(data) { for( i = 0; i < data.length; i++ ) { - $("#jqxTree").jqxTree("addTo", { id: 'node-' + data[i].uuid, label: data[i].node, icon: 'images/folder.png' }, nodeByID); + $("#jqxTree").jqxTree("addTo", { id: 'node-' + data[i].uuid, label: data[i].node, icon: 'images/folder.png' }, nodeByID); } }); /* @@ -44,7 +44,6 @@ var fermenterByID = $("#jqxTree").find("#Fermenters")[0]; $.getJSON("getfermenters.php", function(data) { for( i = 0; i < data.length; i++ ) { - console.log( "JSON Data: " + data[i].uuid + " " + data[i].node ); $("#jqxTree").jqxTree("addTo", { id: 'fermenter-' + data[i].uuid, label: data[i].node + "/" + data[i].alias, icon: 'images/folder.png' }, fermenterByID); } }); @@ -77,7 +76,7 @@ { name: 'record', type: 'int' }, { name: 'uuid', type: 'string' }, { name: 'node', type: 'string' }, - { name: 'online', type: 'string' }, + { name: 'online', type: 'bool' }, { name: 'group_id', type: 'string' }, { name: 'hardwaremake', type: 'string' }, { name: 'hardwaremodel', type: 'string' }, @@ -115,11 +114,19 @@ html += "<tr><td>Hardware model</td><td>" + record.harwaremodel+ "</td></tr>"; html += "<tr><td>OS</td><td>" + record.os + " versie: " + record.os_version + "</td></tr>"; html += "<tr><td>Firmware</td><td>" + record.firmware + "</td></tr>"; - html += "<tr><td>Temperatuur</td><td>" + record.temperature + "°C</td></tr>"; - html += "<tr><td>Vochtigheid</td><td>" + record.humidity + "%</td></tr>"; - html += "<tr><td>Luchtdruk</td><td>" + record.barometer + "</td></tr>"; - html += "<tr><td>GPS</td><td>"+ record.gps_latitude + " " + record.gps_longitude + " " + record.gps_altitude + "</td></tr>"; - html += "<tr><td>Netwerk</td><td>"+ record.net_ifname + " " + record.net_address + "</td></tr>"; + if (record.online) { + html += "<tr><td>Temperatuur</td><td>" + record.temperature + "°C</td></tr>"; + if (record.humidity > 0) { + html += "<tr><td>Vochtigheid</td><td>" + record.humidity + "%</td></tr>"; + } + if (record.barometer > 0) { + html += "<tr><td>Luchtdruk</td><td>" + record.barometer + "</td></tr>"; + } + if ((record.gps_latitude != 0) && (record.gps_longitude != 0)) { + html += "<tr><td>GPS</td><td>"+ record.gps_latitude + " " + record.gps_longitude + " " + record.gps_altitude + "</td></tr>"; + } + html += "<tr><td>Netwerk</td><td>"+ record.net_ifname + " " + record.net_address + "</td></tr>"; + } html += "</<table>"; html += "</div>"; $("#ContentPanel").html(html);