From b9a90cb8d34b133b34a46a8d5aabed4c831f10a5 Mon Sep 17 00:00:00 2001
From: f10 <fz@f10-home.de>
Date: Wed, 9 Jun 2010 19:13:58 +0200
Subject: [PATCH] frontend: quick'n'dirty fix for bad bug at summer winter time
 change

---
 frontend/index.html               | 10 +++++-----
 frontend/javascript/smartmeter.js | 10 +++++++---
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/frontend/index.html b/frontend/index.html
index 13af28a..12b13f4 100644
--- a/frontend/index.html
+++ b/frontend/index.html
@@ -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();
 	}
 }
diff --git a/frontend/javascript/smartmeter.js b/frontend/javascript/smartmeter.js
index 5b21716..4cab8af 100644
--- a/frontend/javascript/smartmeter.js
+++ b/frontend/javascript/smartmeter.js
@@ -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();