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

Switched sensor detail chart to 24 hours

Browse source
This commit is contained in:
Ziver Koc 2016-05-26 16:51:26 +02:00
parent 15555ea7eb
commit eee2af5799
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resource/web/sensor_detail.tmpl
View file

@ -22,7 +22,7 @@
<div class="col-md-12"> <div class="col-md-12">
<div class="panel panel-default drop-shadow"> <div class="panel panel-default drop-shadow">
<div class="panel-heading">Chart</div> <div class="panel-heading">Last 24 hours</div>
<div class="panel-body"> <div class="panel-body">
<div id="chart" style="height:350px;"></div> <div id="chart" style="height:350px;"></div>
</div> </div>

3
src/se/hal/page/SensorOverviewHttpPage.java
View file

@ -51,7 +51,8 @@ public class SensorOverviewHttpPage extends HalHttpPage {
Templator tmpl = new Templator(FileUtil.find(DETAIL_TEMPLATE)); Templator tmpl = new Templator(FileUtil.find(DETAIL_TEMPLATE));
tmpl.set("sensor", sensor); tmpl.set("sensor", sensor);
tmpl.set("history", history); tmpl.set("history", history);
tmpl.set("aggregation", AggregateDataListSqlResult.getAggregateDataForPeriod(db, sensor, AggregationPeriodLength.HOUR, UTCTimeUtility.WEEK_IN_MS)); tmpl.set("aggregation",
AggregateDataListSqlResult.getAggregateDataForPeriod(db, sensor, AggregationPeriodLength.FIVE_MINUTES, UTCTimeUtility.DAY_IN_MS));
return tmpl; return tmpl;
} }
else { else {