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

Removed hard coded users in PCOverview

Browse source 
Former-commit-id: 2a6372ac048c09a2ad201c491d7ffc3dc37025e5
This commit is contained in:
Ziver Koc 2016-01-18 16:54:10 +01:00
parent 440cc1ec62
commit 1f7090200a
2 changed files with 20 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/se/hal/page/PCOverviewHttpPage.java
View file

@ -53,14 +53,16 @@ public class PCOverviewHttpPage extends HalHttpPage {
+ TimeUtility.FIVE_MINUTES_IN_MS + " as period_length"
+ " FROM sensor_data_aggr, user, sensor"
+ " WHERE sensor.id = sensor_data_aggr.sensor_id"
+ " AND sensor.id = " + sensor.getId()
+ " AND sensor.id = ?"
+ " AND user.id = sensor.user_id"
+ " AND user.id = " + user.getId()
+ " AND user.id = ?"
+ " AND timestamp_end-timestamp_start == ?"
+ " AND timestamp_start > ?"
+ " ORDER BY timestamp_start ASC");
stmt.setLong(1, TimeUtility.FIVE_MINUTES_IN_MS-1);
stmt.setLong(2, (System.currentTimeMillis() - TimeUtility.DAY_IN_MS) );
stmt.setLong(1, sensor.getId());
stmt.setLong(2, user.getId());
stmt.setLong(3, TimeUtility.FIVE_MINUTES_IN_MS-1);
stmt.setLong(4, (System.currentTimeMillis() - TimeUtility.DAY_IN_MS) );
ArrayList<PowerData> userPowerData = DBConnection.exec(stmt , new SQLPowerDataBuilder());
minDataList.addAll(userPowerData);
@ -73,14 +75,16 @@ public class PCOverviewHttpPage extends HalHttpPage {
+ TimeUtility.HOUR_IN_MS + " as period_length"
+ " FROM sensor_data_aggr, user, sensor"
+ " WHERE sensor.id = sensor_data_aggr.sensor_id"
+ " AND sensor.id = " + sensor.getId()
+ " AND sensor.id = ?"
+ " AND user.id = sensor.user_id"
+ " AND user.id = " + user.getId()
+ " AND user.id = ?"
+ " AND timestamp_end-timestamp_start == ?"
+ " AND timestamp_start > ?"
+ " ORDER BY timestamp_start ASC");
stmt.setLong(1, TimeUtility.HOUR_IN_MS-1);
stmt.setLong(2, (System.currentTimeMillis() - TimeUtility.WEEK_IN_MS) );
stmt.setLong(1, sensor.getId());
stmt.setLong(2, user.getId());
stmt.setLong(3, TimeUtility.HOUR_IN_MS-1);
stmt.setLong(4, (System.currentTimeMillis() - TimeUtility.WEEK_IN_MS) );
userPowerData = DBConnection.exec(stmt, new SQLPowerDataBuilder());
hourDataList.addAll(userPowerData);
@ -93,12 +97,14 @@ public class PCOverviewHttpPage extends HalHttpPage {
+ TimeUtility.DAY_IN_MS + " as period_length"
+ " FROM sensor_data_aggr, user, sensor"
+ " WHERE sensor.id = sensor_data_aggr.sensor_id"
+ " AND sensor.id = " + sensor.getId()
+ " AND sensor.id = ?"
+ " AND user.id = sensor.user_id"
+ " AND user.id = " + user.getId()
+ " AND user.id = ?"
+ " AND timestamp_end-timestamp_start == ?"
+ " ORDER BY timestamp_start ASC");
stmt.setLong(1, TimeUtility.DAY_IN_MS-1);
stmt.setLong(1, sensor.getId());
stmt.setLong(2, user.getId());
stmt.setLong(3, TimeUtility.DAY_IN_MS-1);
userPowerData = DBConnection.exec(stmt, new SQLPowerDataBuilder());
dayDataList.addAll(userPowerData);
}
@ -109,11 +115,12 @@ public class PCOverviewHttpPage extends HalHttpPage {
tmpl.set("minData", minDataList);
tmpl.set("hourData", hourDataList);
tmpl.set("dayData", dayDataList);
tmpl.set("username", new String[]{"Ziver", "Daniel"});
tmpl.set("username", User.getUsers(db));
return tmpl;
}
public static class PowerData{
public long timestamp;
public String data;

2
web-resource/pc_overview.tmpl
View file

@ -45,7 +45,7 @@
]
);
});
var userArray = [ {{#username}} "{{.}}", {{/username}} ];
var userArray = [ {{#username}} "{{.getUsername()}}", {{/username}} ];
function chartData(elementId, data){
Morris.Line({
element: elementId,