diff -r 8bbc5730aaa8 -r 2991acd35cdb www/js/mon_node.js --- a/www/js/mon_node.js Fri Oct 18 20:49:07 2019 +0200 +++ b/www/js/mon_node.js Sat Oct 19 12:17:29 2019 +0200 @@ -21,76 +21,76 @@ *****************************************************************************/ -$(document).ready(function () { +$(document).ready(function() { - var url = "getnode.php?uuid='" + my_uuid + "'", - source = { - datatype: "json", - datafields: [ - { name: 'record', type: 'int' }, - { name: 'uuid', type: 'string' }, - { name: 'node', type: 'string' }, - { name: 'online', type: 'bool' }, - { name: 'group_id', type: 'string' }, - { name: 'hardwaremake', type: 'string' }, - { name: 'hardwaremodel', type: 'string' }, - { name: 'os', type: 'string' }, - { name: 'os_version', type: 'string' }, - { name: 'firmware', type: 'string' }, - { name: 'firstseen', type: 'string' }, - { name: 'lastseen', type: 'string' }, - { name: 'temperature', type: 'float' }, - { name: 'humidity', type: 'float' }, - { name: 'barometer', type: 'float' }, - { name: 'gps_latitude', type: 'float' }, - { name: 'gps_longitude', type: 'float' }, - { name: 'gps_altitude', type: 'float' }, - { name: 'net_address', type: 'string' }, - { name: 'net_ifname', type: 'string' }, - { name: 'net_rssi', type: 'int' } - ], - id: 'record', - url: url - }, - dataAdapter = new $.jqx.dataAdapter(source, { - loadComplete: function (records) { - var record = dataAdapter.records[0], - html = "
"; - html += ""; - html += ""; - html += ""; - html += ""; - html += ""; - html += ""; - html += ""; - html += ""; - html += ""; - html += ""; - html += ""; - html += ""; - if (record.online) { - html += ""; - if (record.humidity > 0) { - html += ""; - } - if (record.barometer > 0) { - html += ""; - } - if ((record.gps_latitude != 0) && (record.gps_longitude != 0)) { - html += ""; - } - html += ""; - } - html += ""; - html += ""; - $("#ContentPanel").html(html); - } - }); + var url = 'getnode.php?uuid="' + my_uuid + '"', + source = { + datatype: 'json', + datafields: [ + { name: 'record', type: 'int' }, + { name: 'uuid', type: 'string' }, + { name: 'node', type: 'string' }, + { name: 'online', type: 'bool' }, + { name: 'group_id', type: 'string' }, + { name: 'hardwaremake', type: 'string' }, + { name: 'hardwaremodel', type: 'string' }, + { name: 'os', type: 'string' }, + { name: 'os_version', type: 'string' }, + { name: 'firmware', type: 'string' }, + { name: 'firstseen', type: 'string' }, + { name: 'lastseen', type: 'string' }, + { name: 'temperature', type: 'float' }, + { name: 'humidity', type: 'float' }, + { name: 'barometer', type: 'float' }, + { name: 'gps_latitude', type: 'float' }, + { name: 'gps_longitude', type: 'float' }, + { name: 'gps_altitude', type: 'float' }, + { name: 'net_address', type: 'string' }, + { name: 'net_ifname', type: 'string' }, + { name: 'net_rssi', type: 'int' } + ], + id: 'record', + url: url + }, + dataAdapter = new $.jqx.dataAdapter(source, { + loadComplete: function(records) { + var record = dataAdapter.records[0], + html = '
'; + html += '
Systeem overzicht
Uuid" + record.uuid + "
Systeem" + record.node + "
Online" + record.online + "
Type" + record.group_id + "
Eerst gezien" + record.firstseen + "
Laatst gezien" + record.lastseen + "
Hardware maker" + record.hardwaremake+ "
Hardware model" + record.hardwaremodel+ "
OS" + record.os + " versie: " + record.os_version + "
Firmware" + record.firmware + "
Temperatuur" + record.temperature.toFixed(1) + "°C
Vochtigheid" + record.humidity.toFixed(1) + "%
Luchtdruk" + record.barometer.toFixed(0) + "
GPS"+ record.gps_latitude + " " + record.gps_longitude + " " + record.gps_altitude + "
Netwerk"+ record.net_ifname + " " + record.net_address + "
'; + html += ''; + html += ''; + html += ''; + html += ''; + html += ''; + html += ''; + html += ''; + html += ''; + html += ''; + html += ''; + html += ''; + if (record.online) { + html += ''; + if (record.humidity > 0) { + html += ''; + } + if (record.barometer > 0) { + html += ''; + } + if ((record.gps_latitude != 0) && (record.gps_longitude != 0)) { + html += ''; + } + html += ''; + } + html += ''; + html += ''; + $('#ContentPanel').html(html); + } + }); - // Get the data immediatly and then at regular intervals to refresh. - dataAdapter.dataBind(); - setInterval(function(){ - dataAdapter.dataBind(); - }, 30000); + // Get the data immediatly and then at regular intervals to refresh. + dataAdapter.dataBind(); + setInterval(function() { + dataAdapter.dataBind(); + }, 30000); });
Systeem overzicht
Uuid' + record.uuid + '
Systeem' + record.node + '
Online' + record.online + '
Type' + record.group_id + '
Eerst gezien' + record.firstseen + '
Laatst gezien' + record.lastseen + '
Hardware maker' + record.hardwaremake + '
Hardware model' + record.hardwaremodel + '
OS' + record.os + ' versie: ' + record.os_version + '
Firmware' + record.firmware + '
Temperatuur' + record.temperature.toFixed(1) + '°C
Vochtigheid' + record.humidity.toFixed(1) + '%
Luchtdruk' + record.barometer.toFixed(0) + '
GPS' + record.gps_latitude + ' ' + record.gps_longitude + ' ' + record.gps_altitude + '
Netwerk' + record.net_ifname + ' ' + record.net_address + '