diff --git a/build.xml b/build.xml index 1de26190..2a3293f1 100644 --- a/build.xml +++ b/build.xml @@ -77,14 +77,6 @@ - - - - - - - - diff --git a/web-resource/index.html b/web-resource/index.html index a4393e0b..75d5d3f4 100644 --- a/web-resource/index.html +++ b/web-resource/index.html @@ -21,21 +21,28 @@ $(function(){ chartData("min-power-chart", [ - {{#minData}} + { y: (Date.now()-24*60*60*1000) }, + {{#minData}} { y: {{.timestamp}}, {{.username}}: {{.data}} }, {{/minData}} - { y: Date.now() }, + { y: Date.now() } ] ); chartData("hour-power-chart", - [{{#hourData}} + [ + { y: (Date.now()-3*24*60*60*1000) }, + {{#hourData}} { y: {{.timestamp}}, {{.username}}: {{.data}} }, - {{/hourData}}] + {{/hourData}} + { y: (Date.now()-24*60*60*1000) } + ] ); chartData("day-power-chart", [{{#dayData}} { y: {{.timestamp}}, {{.username}}: {{.data}} }, - {{/dayData}}] + {{/dayData}} + { y: (Date.now()-3*24*60*60*1000) } + ] ); }); var userArray = [ {{#username}} '{{.}}', {{/username}} ]; @@ -47,7 +54,7 @@ ykeys: userArray, labels: userArray, continuousLine: false, - pointSize: 0, + pointSize: 1, postUnits: 'kWh', resize: true }); @@ -85,15 +92,15 @@

Overview

-

Last 24 hours

+

Last 24 hours (kWh/5min)

-

Previous two days

+

Previous two days (kWh/h)

-

Long term

+

Long term (kWh/day)