diff --git a/build.xml b/build.xml index 2a3293f1..5c43b1c5 100644 --- a/build.xml +++ b/build.xml @@ -51,6 +51,12 @@ + + + + + + diff --git a/src/se/koc/hal/page/PCOverviewHttpPage.java b/src/se/koc/hal/page/PCOverviewHttpPage.java index 80e44e0c..862897b3 100755 --- a/src/se/koc/hal/page/PCOverviewHttpPage.java +++ b/src/se/koc/hal/page/PCOverviewHttpPage.java @@ -79,13 +79,13 @@ public class PCOverviewHttpPage extends HalHttpPage { ArrayList 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("hourData", hourDataList); tmpl.set("dayData", dayDataList); tmpl.set("username", new String[]{"Ziver", "Daniel"}); - return tmpl; + return tmpl; } public static class PowerData{ diff --git a/web-resource/overview.tmpl b/web-resource/overview.tmpl index 09f82443..b13f9096 100755 --- a/web-resource/overview.tmpl +++ b/web-resource/overview.tmpl @@ -5,11 +5,11 @@
-

Previous two days (kWh/h)

+

Last Week (kWh/h)

-

Long term (kWh/day)

+

All History (kWh/day)