diff -r 366f270a2446 -r 59048cd5f00d www/index.php --- 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 += "Hardware model" + record.harwaremodel+ ""; html += "OS" + record.os + " versie: " + record.os_version + ""; html += "Firmware" + record.firmware + ""; - html += "Temperatuur" + record.temperature + "°C"; - html += "Vochtigheid" + record.humidity + "%"; - html += "Luchtdruk" + record.barometer + ""; - html += "GPS"+ record.gps_latitude + " " + record.gps_longitude + " " + record.gps_altitude + ""; - html += "Netwerk"+ record.net_ifname + " " + record.net_address + ""; + if (record.online) { + html += "Temperatuur" + record.temperature + "°C"; + if (record.humidity > 0) { + html += "Vochtigheid" + record.humidity + "%"; + } + if (record.barometer > 0) { + html += "Luchtdruk" + record.barometer + ""; + } + if ((record.gps_latitude != 0) && (record.gps_longitude != 0)) { + html += "GPS"+ record.gps_latitude + " " + record.gps_longitude + " " + record.gps_altitude + ""; + } + html += "Netwerk"+ record.net_ifname + " " + record.net_address + ""; + } html += ""; html += ""; $("#ContentPanel").html(html);