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

bug fixes

Browse source 
Former-commit-id: c1bc39ba77ac319bbda1f55c59c68353c947ac98
This commit is contained in:
Daniel Collin 2015-12-11 23:19:17 +01:00
parent 2bc92ddc68
commit 2823057e76
3 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
build.xml
View file

@ -51,6 +51,12 @@
</classpath> </classpath>
</java> </java>
</target> </target>
<target name="clear-aggr-data-from-db" depends="">
<exec executable="sqlite3">
<arg line="hal.db 'DELETE FROM sensor_data_aggr'" />
</exec>
</target>
<!--clean all build paths--> <!--clean all build paths-->
<target name="clean"> <target name="clean">

4
src/se/koc/hal/page/PCOverviewHttpPage.java
View file

@ -79,13 +79,13 @@ public class PCOverviewHttpPage extends HalHttpPage {
ArrayList<PowerData> dayDataList = DBConnection.exec(stmt, new SQLPowerDataBuilder()); ArrayList<PowerData> dayDataList = DBConnection.exec(stmt, new SQLPowerDataBuilder());
Templator tmpl = new Templator(FileUtil.find("web-resource/index.html")); Templator tmpl = new Templator(FileUtil.find("web-resource/overview.tmpl"));
tmpl.set("minData", minDataList); tmpl.set("minData", minDataList);
tmpl.set("hourData", hourDataList); tmpl.set("hourData", hourDataList);
tmpl.set("dayData", dayDataList); tmpl.set("dayData", dayDataList);
tmpl.set("username", new String[]{"Ziver", "Daniel"}); tmpl.set("username", new String[]{"Ziver", "Daniel"});
return tmpl; return tmpl;
} }
public static class PowerData{ public static class PowerData{

4
web-resource/overview.tmpl
View file

@ -5,11 +5,11 @@
<div id="min-power-chart" style="height:450px;"></div> <div id="min-power-chart" style="height:450px;"></div>
</div> </div>
<div class="row placeholders"> <div class="row placeholders">
<H1>Previous two days (kWh/h)</H1> <H1>Last Week (kWh/h)</H1>
<div id="hour-power-chart" style="height:450px;"></div> <div id="hour-power-chart" style="height:450px;"></div>
</div> </div>
<div class="row placeholders"> <div class="row placeholders">
<H1>Long term (kWh/day)</H1> <H1>All History (kWh/day)</H1>
<div id="day-power-chart" style="height:450px;"></div> <div id="day-power-chart" style="height:450px;"></div>
</div> </div>