Refactoring code a lot.
- Common inner class in DataAggregatorDeamon for all period lenghts. - Removed deletion of data from DataAggregator and DataSynchronizationClient and put it in a new DataDeletionDeamon - Moved time constants to a common TimeConstants class Former-commit-id: 523ce7ad73b6edb4a507adcfa33b04742b170f25
This commit is contained in:
parent
04f1af3268
commit
b421206ce3
10 changed files with 344 additions and 304 deletions
|
|
@ -19,32 +19,32 @@
|
|||
|
||||
<script>
|
||||
$(function(){
|
||||
chartData("min-power-chart",
|
||||
[
|
||||
{ y: (Date.now()-24*60*60*1000) },
|
||||
{{#minData}}
|
||||
{ y: {{.timestamp}}, {{.username}}: {{.data}} },
|
||||
{{/minData}}
|
||||
{ y: Date.now() }
|
||||
]
|
||||
);
|
||||
chartData("hour-power-chart",
|
||||
[
|
||||
{ y: (Date.now()-3*24*60*60*1000) },
|
||||
{{#hourData}}
|
||||
{ y: {{.timestamp}}, {{.username}}: {{.data}} },
|
||||
{{/hourData}}
|
||||
{ y: (Date.now()-24*60*60*1000) }
|
||||
]
|
||||
);
|
||||
chartData("day-power-chart",
|
||||
[{{#dayData}}
|
||||
{ y: {{.timestamp}}, {{.username}}: {{.data}} },
|
||||
{{/dayData}}
|
||||
{ y: (Date.now()-3*24*60*60*1000) }
|
||||
]
|
||||
);
|
||||
});
|
||||
chartData("min-power-chart",
|
||||
[
|
||||
{ y: (Date.now()-24*60*60*1000) },
|
||||
{{#minData}}
|
||||
{ y: {{.timestamp}}, {{.username}}: {{.data}} },
|
||||
{{/minData}}
|
||||
{ y: Date.now() }
|
||||
]
|
||||
);
|
||||
chartData("hour-power-chart",
|
||||
[
|
||||
{ y: (Date.now()-7*24*60*60*1000) },
|
||||
{{#hourData}}
|
||||
{ y: {{.timestamp}}, {{.username}}: {{.data}} },
|
||||
{{/hourData}}
|
||||
{ y: Date.now() }
|
||||
]
|
||||
);
|
||||
chartData("day-power-chart",
|
||||
[{{#dayData}}
|
||||
{ y: {{.timestamp}}, {{.username}}: {{.data}} },
|
||||
{{/dayData}}
|
||||
{ y: Date.now() }
|
||||
]
|
||||
);
|
||||
});
|
||||
var userArray = [ {{#username}} '{{.}}', {{/username}} ];
|
||||
function chartData(elementId, data){
|
||||
Morris.Line({
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue