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

Switched from JSONObjectStream to Configurator

Browse source 
Former-commit-id: e27c6fd6acf414ad28b8c447f786d30a866060b9
This commit is contained in:
Ziver Koc 2016-01-14 20:03:36 +01:00
parent 45cf8de571
commit fa9223c653
3 changed files with 44 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

8
web-resource/pc_overview.tmpl
View file

@ -23,7 +23,7 @@
[
{ y: (Date.now()-24*60*60*1000) },
{{#minData}}
{ y: {{.timestamp}}, {{.username}}: {{.data}} },
{ y: {{.timestamp}}, "{{.username}}": {{.data}} },
{{/minData}}
{ y: Date.now() }
]
@ -32,20 +32,20 @@
[
{ y: (Date.now()-7*24*60*60*1000) },
{{#hourData}}
{ y: {{.timestamp}}, {{.username}}: {{.data}} },
{ y: {{.timestamp}}, "{{.username}}": {{.data}} },
{{/hourData}}
{ y: Date.now() }
]
);
chartData("day-power-chart",
[{{#dayData}}
{ y: {{.timestamp}}, {{.username}}: {{.data}} },
{ y: {{.timestamp}}, "{{.username}}": {{.data}} },
{{/dayData}}
{ y: Date.now() }
]
);
});
var userArray = [ {{#username}} '{{.}}', {{/username}} ];
var userArray = [ {{#username}} "{{.}}", {{/username}} ];
function chartData(elementId, data){
Morris.Line({
element: elementId,