From f3bf9d716d6d4424072793b9d12cc91b8e5a5848 Mon Sep 17 00:00:00 2001
From: Daniel Collin <dcollin@users.noreply.github.com>
Date: Tue, 8 Dec 2015 09:15:14 +0100
Subject: [PATCH] fix build script since it did no longer build

Former-commit-id: 3a045493a26f7256c32c43a13cc59b0f680dfb80
---
 build.xml               |  8 --------
 web-resource/index.html | 25 ++++++++++++++++---------
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/build.xml b/build.xml
index 1de26190..2a3293f1 100644
--- a/build.xml
+++ b/build.xml
@@ -77,14 +77,6 @@
 	
 	<target name="build-dependencies">
 		<mkdir dir="${buildDir}" />
-		<javac srcdir="${libDir}/java-speech-api-master/src" destdir="${buildDir}" fork="yes">
-			<include name="**/*.java" />
-			<classpath refid="classpath.build" />
-		</javac>
-		<javac srcdir="${libDir}/sphinx4-5prealpha-src/sphinx4-core/src/main/java" destdir="${buildDir}" fork="yes" encoding="UTF-8">
-			<include name="**/*.java" />
-			<classpath refid="classpath.build" />
-		</javac>
 		<get src="http://repo.koc.se/zutil-java.git/blob/master/Zutil.jar" dest="${libDir}" verbose="true" usetimestamp="true"/>
 	</target>
 	
diff --git a/web-resource/index.html b/web-resource/index.html
index a4393e0b..75d5d3f4 100644
--- a/web-resource/index.html
+++ b/web-resource/index.html
@@ -21,21 +21,28 @@
 		$(function(){
 			chartData("min-power-chart", 
 					[
-					 {{#minData}}  
+					{ y: (Date.now()-24*60*60*1000) },
+					{{#minData}}  
 						{ y: {{.timestamp}}, {{.username}}: {{.data}} },
 					{{/minData}}
-					{ y: Date.now() },
+					{ y: Date.now() }
 					]
 			);
 			chartData("hour-power-chart", 
-					[{{#hourData}}  
+					[
+					{ y: (Date.now()-3*24*60*60*1000) },
+					{{#hourData}}  
 						{ y: {{.timestamp}}, {{.username}}: {{.data}} },  
-					{{/hourData}}]
+					{{/hourData}}
+					{ y: (Date.now()-24*60*60*1000) }
+					]
 			);
 			chartData("day-power-chart", 
 					[{{#dayData}}  
 						{ y: {{.timestamp}}, {{.username}}: {{.data}} },
-					{{/dayData}}]
+					{{/dayData}}
+					{ y: (Date.now()-3*24*60*60*1000) }
+					]
 			);
 		});
 		var userArray = [ {{#username}} '{{.}}', {{/username}} ];
@@ -47,7 +54,7 @@
 				  ykeys: userArray,
 				  labels: userArray,
 				  continuousLine: false,
-				  pointSize: 0,
+				  pointSize: 1,
 				  postUnits: 'kWh',
 				  resize: true
 				});
@@ -85,15 +92,15 @@
           <h1 class="page-header">Overview</h1>
 
           <div class="row placeholders">
-          	<H1>Last 24 hours</H1>
+          	<H1>Last 24 hours (kWh/5min)</H1>
             <div id="min-power-chart" style="height:450px;"></div>
           </div>
           <div class="row placeholders">
-          	<H1>Previous two days</H1>
+          	<H1>Previous two days (kWh/h)</H1>
             <div id="hour-power-chart" style="height:450px;"></div>
           </div>
           <div class="row placeholders">
-          	<H1>Long term</H1>
+          	<H1>Long term (kWh/day)</H1>
             <div id="day-power-chart" style="height:450px;"></div>
           </div>