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

Sorted overviw raw data display

Browse source 
Former-commit-id: 61bec940fbcded38471094b106c73597d2d26368
This commit is contained in:
Ziver Koc 2016-01-22 21:18:07 +01:00
parent 5a4107f60f
commit aefb0054a0
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -52,7 +52,7 @@ public class EventOverviewHttpPage extends HalHttpPage {
Event event = Event.getEvent(db, id); Event event = Event.getEvent(db, id);
// get history data // get history data
PreparedStatement stmt = db.getPreparedStatement("SELECT * FROM event_data_raw WHERE event_id == ?"); PreparedStatement stmt = db.getPreparedStatement("SELECT * FROM event_data_raw WHERE event_id == ? ORDER BY timestamp DESC");
stmt.setLong(1, event.getId()); stmt.setLong(1, event.getId());
List<HistoryData> history = DBConnection.exec(stmt, new HistoryDataListSqlResult()); List<HistoryData> history = DBConnection.exec(stmt, new HistoryDataListSqlResult());

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

@ -43,7 +43,7 @@ public class SensorOverviewHttpPage extends HalHttpPage {
Sensor sensor = Sensor.getSensor(db, id); Sensor sensor = Sensor.getSensor(db, id);
// get history data // get history data
PreparedStatement stmt = db.getPreparedStatement("SELECT * FROM sensor_data_raw WHERE sensor_id == ? LIMIT ?"); PreparedStatement stmt = db.getPreparedStatement("SELECT * FROM sensor_data_raw WHERE sensor_id == ? ORDER BY timestamp DESC LIMIT ?");
stmt.setLong(1, sensor.getId()); stmt.setLong(1, sensor.getId());
stmt.setLong(2, HISTORY_LIMIT); stmt.setLong(2, HISTORY_LIMIT);
List<HistoryData> history = DBConnection.exec(stmt, new HistoryDataListSqlResult()); List<HistoryData> history = DBConnection.exec(stmt, new HistoryDataListSqlResult());