From 95f0464dcb3c9c270dfa410e716992246a1ab52e Mon Sep 17 00:00:00 2001 From: Karai Csaba Date: Sat, 7 May 2016 14:21:04 +0200 Subject: [PATCH] Support for tables --- examples/dummy-web-server.pl | 3 ++- examples/web-server/Voltage.html | 3 +++ html/userpage.js | 33 +++++++++++++++++++++++++++++++- 3 files changed, 37 insertions(+), 2 deletions(-) diff --git a/examples/dummy-web-server.pl b/examples/dummy-web-server.pl index 56015ef..e492933 100755 --- a/examples/dummy-web-server.pl +++ b/examples/dummy-web-server.pl @@ -430,7 +430,8 @@ sub process_user_comm_voltage my $voltage = (((time - $startTime) % 60) - 30) / 30.0 + 4.0; $voltage = sprintf("%.2f V", $voltage); - my $r = '{"voltage": "' . $voltage . '"}'; + my $table = ', "table": [["Time", "Min", "AVG", "Max"], ["0s-10s", "1 V", "3 V", "5 V"], ["10s-20s", "1 V", "2 V", "3 V"]]'; + my $r = '{"voltage": "' . $voltage . '"' . $table . '}'; return content_response($r, $http->{url}); } diff --git a/examples/web-server/Voltage.html b/examples/web-server/Voltage.html index 08e1017..96e4820 100644 --- a/examples/web-server/Voltage.html +++ b/examples/web-server/Voltage.html @@ -6,5 +6,8 @@

+ + + diff --git a/html/userpage.js b/html/userpage.js index 3a76530..ca1cbfc 100644 --- a/html/userpage.js +++ b/html/userpage.js @@ -27,7 +27,8 @@ function notifyResponse( data ) var elem = document.getElementById(v); if( elem != null ) { - if(elem.tagName == "P" || elem.tagName == "DIV") + if(elem.tagName == "P" || elem.tagName == "DIV" || elem.tagName == "SPAN" || elem.tagName == "TR" || elem.tagName == "TH" || elem.tagName == "TD" || + elem.tagName == "TEXTAREA" ) { elem.innerHTML = data[v]; } @@ -40,6 +41,36 @@ function notifyResponse( data ) html = html.concat("
  • " + list[i] + "
  • "); } + elem.innerHTML = html; + } + if(elem.tagName == "TABLE") + { + var list = data[v]; + var html = ""; + + if( list.length > 0 ) + { + var ths = list[0]; + html = html.concat(""); + + for (var i=0; i" + ths[i] + ""); + } + + html = html.concat(""); + } + + for (var i=1; i"); + + for (var j=0; j" + tds[j] + ""); + } + + html = html.concat(""); + } + elem.innerHTML = html; } }