stv0g/vzlogger
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

frontend: quick'n'dirty fix for bad bug at summer winter time change

Browse source
This commit is contained in:
f10 2010-06-09 19:13:58 +02:00
parent f8ee815e30
commit b9a90cb8d3
2 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
frontend/index.html
View file

@ -84,10 +84,10 @@
<b>Anzeigebereich:</b><br>
<select name="window">
<option value="1HOUR">1 Stunde</option>
<option value="1DAY" selected="selected" >1 Tag</option>
<option value="1DAY">1 Tag</option>
<option value="3DAY">3 Tage</option>
<option value="7DAY">7 Tage</option>
<option value="1MONTH">1 Monat</option>
<option value="1MONTH" selected="selected">1 Monat</option>
<option value="1YEAR">1 Jahr</option>
</select>
<br><br>
@ -96,7 +96,7 @@
<select name="grouping">
<option value="400">dynamisch</option>
<option value="minute">Minute</option>
<option value="hour" selected="selected" >Stunde</option>
<option value="hour" selected="selected">Stunde</option>
<option value="day">Tag</option>
<option value="month">Monat</option>
<option value="year">Jahr</option>
@ -172,7 +172,7 @@ var data;
var myWindowStart = 0;
// windowEnd parameter for json server
var myWindowEnd = (new Date()).getTime();
var myWindowEnd = getGroupedTimestamp((new Date()).getTime());
// windowGrouping for json server
var windowGrouping = 0;
@ -225,7 +225,7 @@ function autoReload() {
// call getData if autoReload checkbox is active
if(f.autoReload.checked == true) {
myWindowEnd = (new Date()).getTime();
myWindowEnd = getGroupedTimestamp((new Date()).getTime());
getData();
}
}

10
frontend/javascript/smartmeter.js
View file

@ -25,16 +25,17 @@ function getEmptyGroupArray() {
var empty_array = new Object();
var iterator = getGroupedTimestamp(myWindowStart);
//$('#debug').empty().append('start:'+myWindowStart+'end:'+myWindowEnd);
if(myWindowStart < myWindowEnd && iterator < myWindowEnd) {
var i=0;
while(iterator < myWindowEnd) {
i++;
empty_array[iterator] = 0;
var iteratorDate = new Date(iterator);
//$('#debug').append('#'+i+':'+iteratorDate+'<br>');
switch(f.grouping.value) {
case 'year':
iteratorDate.setYear(iteratorDate.getYear()+1);
@ -54,6 +55,8 @@ function getEmptyGroupArray() {
default:
return empty_array;
}
// very bad bug: infinity loop for summer winter change
if(i==750) return empty_array;
iterator = iteratorDate.getTime();
}
@ -122,6 +125,7 @@ function getGroupedTimestamp(timestamp) {
function raw2Energy(raw) {
var data_grouped_time = getEmptyGroupArray();
var data_grouped = new Array();