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

Added graph to sensor detail page. Also added missed morris.css file . issue 7

Browse source 
Former-commit-id: 3b2403a46aa58f3937efc345bc6a022e4deb2da5
This commit is contained in:
Ziver Koc 2016-01-22 19:34:55 +01:00
parent 25693209b5
commit 9961c423a3
9 changed files with 37 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/se/hal/HalServer.java
View file

@ -73,9 +73,6 @@ public class HalServer {
// init http server
HalAlertManager.getInstance().addAlert(new HalAlert(AlertLevel.ERROR, "one view alert", AlertTTL.ONE_VIEW));
HalAlertManager.getInstance().addAlert(new HalAlert(AlertLevel.INFO, "dissmised allert", AlertTTL.DISMISSED));
HalHttpPage.getRootNav().addSubNav(new HalNavigation("sensors", "Sensors"));
HalHttpPage.getRootNav().addSubNav(new HalNavigation("events", "Events"));
pages = new HalHttpPage[]{

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

@ -6,6 +6,7 @@ import se.hal.intf.HalHttpPage;
import se.hal.struct.Event;
import se.hal.struct.Sensor;
import se.hal.struct.SwitchEventData;
import se.hal.util.AggregateDataListSqlResult;
import zutil.db.DBConnection;
import se.hal.util.HistoryDataListSqlResult;
import se.hal.util.HistoryDataListSqlResult.*;
@ -50,6 +51,7 @@ public class SensorOverviewHttpPage extends HalHttpPage {
Templator tmpl = new Templator(FileUtil.find(DETAIL_TEMPLATE));
tmpl.set("sensor", sensor);
tmpl.set("history", history);
tmpl.set("aggregation", AggregateDataListSqlResult.getHourAggregateData(db, sensor));
return tmpl;
}
else {

2
web-resource/css/hal.css
View file

@ -90,7 +90,7 @@ body {
*/
.placeholders {
margin-bottom: 200px;
margin-bottom: 150px;
text-align: center;
}
.placeholders h4 {

0
web-resource/js/morris.js Normal file → Executable file
View file

0
web-resource/js/morris.min.js vendored Normal file → Executable file
View file

12
web-resource/js/raphael-min.js vendored
View file

File diff suppressed because one or more lines are too long

4
web-resource/main_index.tmpl
View file

@ -11,6 +11,7 @@
<!-- Bootstrap core CSS -->
<link href="css/bootstrap.min.css" rel="stylesheet">
<link href="css/bootstrap-switch.min.css" rel="stylesheet">
<link href="css/morris.css" rel="stylesheet">
<link href="css/hal.css" rel="stylesheet">
<script src="js/jquery-1.11.3.min.js"></script>
@ -18,6 +19,9 @@
<script src="js/bootstrap-switch.min.js"></script>
<script src="js/hal.js"></script>
<script src="js/raphael.min.js"></script>
<script src="js/morris.min.js"></script>
</head>
<body>

4
web-resource/pc_overview.tmpl
View file

@ -13,10 +13,6 @@
<div id="day-power-chart" style="height:450px;"></div>
</div>
<script src="js/raphael-min.js"></script>
<script src="js/morris.min.js"></script>
<script>
$(function(){
chartData("min-power-chart",

30
web-resource/sensor_detail.tmpl
View file

@ -1,5 +1,35 @@
<h1 class="page-header">Details for <a href="#">{{sensor.getName()}}</a></h1>
<script>
$(function(){
Morris.Line({
element: "chart",
data: [
{ x: (Date.now()-7*24*60*60*1000) },
{{#aggregation}}
{ x: {{.timestamp}}, data: {{.data}} },
{{/aggregation}}
{ x: Date.now() }
],
xkey: 'x',
ykeys: ['data'],
labels: ['Data'],
continuousLine: false,
resize: true
});
});
</script>
<div class="col-md-12">
<div class="panel panel-default drop-shadow">
<div class="panel-heading">Chart</div>
<div class="panel-body">
<div id="chart" style="height:350px;"></div>
</div>
</div>
</div>
<div class="col-md-5">
<div class="panel panel-default drop-shadow">
<div class="panel-heading">Configuration</div>