diff options
Diffstat (limited to 'ebus/webapp/static')
| -rw-r--r-- | ebus/webapp/static/index.html | 28 | ||||
| -rw-r--r-- | ebus/webapp/static/main.css | 5 |
2 files changed, 25 insertions, 8 deletions
diff --git a/ebus/webapp/static/index.html b/ebus/webapp/static/index.html index 754fd62..1decced 100644 --- a/ebus/webapp/static/index.html +++ b/ebus/webapp/static/index.html @@ -5,17 +5,33 @@ <script src="/static/jquery.flot.js"></script> <script> $(document).ready(function(){ - var from = Math.round(new Date().getTime()/1000) - 86400; + var from = Math.round(new Date().getTime()/1000) - 3*24*60*60; //86400; var to = Math.round(new Date().getTime()/1000); - $.getJSON("/sensor/heizkreisregler9.solarDaten.tempKollektor/"+from+"/"+to, - function(data) { - $.plot($("#ebusgraph"), [data], { xaxis: { mode: "time"}}); - }); + var dataset = [] + var replot = function() { + $.plot($("#ebusgraph"), dataset, { xaxis: { mode: "time"}}); + }; + var plotSensor = function(sensorname) { + $.getJSON("/sensor_cached/"+escape(sensorname)+"/"+from, //+"/"+to, + function(response) { + if (response['data']) { + data = response['data']; + dataset.push({'data':data,'label':sensorname}); + replot(); + } else { + alert("Fehler: " + response["error"]); + } + }); + } + plotSensor("heizkreisregler9.solarDaten.tempKollektor"); + plotSensor("heizkreisregler9.solarDaten.tempWarmwasserSolar"); + plotSensor("heizkreisregler10.betriebsdatenRegler1.kesselTemperatur"); + plotSensor("feuerungsautomat1.betriebsdatenRegler1.aussenTemperatur"); + // TODO http://people.iola.dk/olau/flot/examples/annotating.html }); </script> </head> <body> - <h1>TEST</h1> <div id="ebusgraph"></div> </body> </html> diff --git a/ebus/webapp/static/main.css b/ebus/webapp/static/main.css index f832fdd..2b28643 100644 --- a/ebus/webapp/static/main.css +++ b/ebus/webapp/static/main.css @@ -1,9 +1,10 @@ body { margin:0px; font-family:sans; + padding: 10px; } #ebusgraph { - width:800px; - height:400px; + width:100%; + height:500px; } |