ziver/hal
1
1
Fork 0
Code Pull requests Releases Activity

Initial implementaion of json support for charts

Browse source
This commit is contained in:
Ziver Koc 2016-06-01 16:27:28 +02:00
parent 80a7989481
commit b229671abf
3 changed files with 138 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

22
resource/web/pc_overview.tmpl
View file

@ -21,34 +21,34 @@
$(function(){
chartData("min-power-chart",
[
{ y: (Date.now()-24*60*60*1000) },
{ time: (Date.now()-24*60*60*1000) },
{{#minData}}
{ y: {{.timestamp}}, "{{.id}}": {{.data}} },
{ time: {{.timestamp}}, "{{.id}}": {{.data}} },
{{/minData}}
{ y: Date.now() }
{ time: Date.now() }
]
);
chartData("hour-power-chart",
[
{ y: (Date.now()-7*24*60*60*1000) },
{ time: (Date.now()-7*24*60*60*1000) },
{{#hourData}}
{ y: {{.timestamp}}, "{{.id}}": {{.data}} },
{ time: {{.timestamp}}, "{{.id}}": {{.data}} },
{{/hourData}}
{ y: Date.now() }
{ time: Date.now() }
]
);
chartData("day-power-chart",
[{{#dayData}}
{ y: {{.timestamp}}, "{{.id}}": {{.data}} },
{ time: {{.timestamp}}, "{{.id}}": {{.data}} },
{{/dayData}}
{ y: Date.now() }
{ time: Date.now() }
]
);
chartData("week-power-chart",
[{{#weekData}}
{ y: {{.timestamp}}, "{{.id}}": {{.data}} },
{ time: {{.timestamp}}, "{{.id}}": {{.data}} },
{{/weekData}}
{ y: Date.now() }
{ time: Date.now() }
]
);
});
@ -57,7 +57,7 @@
Morris.Line({
element: elementId,
data: data,
xkey: 'y',
xkey: 'time',
ykeys: [ {{#sensors}} "{{.getId()}}", {{/sensors}} ],
labels: [ {{#sensors}} "{{.getUser().getUsername()}}: {{.getName()}}", {{/sensors}} ],
continuousLine: false,