diff -r 36387e45a194 -r 366f270a2446 www/index.php
--- a/www/index.php Fri Aug 10 13:46:23 2018 +0200
+++ b/www/index.php Fri Aug 10 16:52:57 2018 +0200
@@ -25,7 +25,7 @@
/*
* Different right panel pages
*/
- var aNode = '
Node scherm
';
+ var refreshIntervalId = 0;
var aFermenter = 'Fermenter scherm
';
$("#splitter").jqxSplitter({ theme: "", width: 1278, height: 618, panels: [{ size: 250}] });
$("#jqxTree").jqxTree({ theme: "", height: "100%", width: "100%" });
@@ -35,7 +35,6 @@
var nodeByID = $("#jqxTree").find("#Nodes")[0];
$.getJSON("getnodes.php", function(data) {
for( i = 0; i < data.length; i++ ) {
- console.log( "JSON Data: " + data[i].uuid + " " + data[ i ].node );
$("#jqxTree").jqxTree("addTo", { id: 'node-' + data[i].uuid, label: data[i].node, icon: 'images/folder.png' }, nodeByID);
}
});
@@ -54,6 +53,14 @@
$("#jqxTree").on("select", function (event) {
/*
+ * Cancel a running refresh loop.
+ */
+ if (refreshIntervalId > 0) {
+ console.log( "RefreshIIntervald: " + refreshIntervalId + " stopped" );
+ clearInterval(refreshIntervalId);
+ refreshIntervalId = 0;
+ }
+ /*
* Process the selected id from the left panel tree and show the correct page in the right panel.
*/
var estr = event.args.element.id;
@@ -101,7 +108,9 @@
html += "Uuid | " + record.uuid + " |
";
html += "Systeem | " + record.node + " |
";
html += "Online | " + record.online + " |
";
- html += "Type | " + record.group_id + " |
";
+ html += "Type | " + record.group_id + " |
";
+ html += "Eerst gezien | " + record.firstseen + " |
";
+ html += "Laatst gezien | " + record.lastseen + " |
";
html += "Hardware maker | " + record.hardwaremake+ " |
";
html += "Hardware model | " + record.harwaremodel+ " |
";
html += "OS | " + record.os + " versie: " + record.os_version + " |
";
@@ -115,15 +124,18 @@
html += "";
$("#ContentPanel").html(html);
}
- /* Data formatteren etc. Zie https://www.jqwidgets.com/jquery-widgets-demo/demos/jqxdataadapter/index.htm#demos/jqxdataadapter/bindingtojson.htm */
- });
- dataAdapter.dataBind();
+ });
+ // Get the data immediatly and then at regular intervals to refresh.
+ dataAdapter.dataBind();
+ refreshIntervalId = setInterval(function(){
+ dataAdapter.dataBind();
+ }, 30000);
} else if (estr.indexOf("fermenter-", 0) == 0) {
var uuid = estr.substr(10);
$("#ContentPanel").html("" + uuid + "
");
} else if (event.args.element.id == "Nodes") {
- $("#ContentPanel").html(aNode);
+ $("#ContentPanel").html("" + event.args.element.id + "");
}
@@ -152,7 +164,7 @@
- Klimatkasten
+ Klimaatkasten