From aefb0054a0b5dc37528339df136d037dc09a990d Mon Sep 17 00:00:00 2001 From: Ziver Koc Date: Fri, 22 Jan 2016 21:18:07 +0100 Subject: [PATCH] Sorted overviw raw data display Former-commit-id: 61bec940fbcded38471094b106c73597d2d26368 --- src/se/hal/page/EventOverviewHttpPage.java | 2 +- src/se/hal/page/SensorOverviewHttpPage.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/se/hal/page/EventOverviewHttpPage.java b/src/se/hal/page/EventOverviewHttpPage.java index cd156fd8..ae3233f1 100755 --- a/src/se/hal/page/EventOverviewHttpPage.java +++ b/src/se/hal/page/EventOverviewHttpPage.java @@ -52,7 +52,7 @@ public class EventOverviewHttpPage extends HalHttpPage { Event event = Event.getEvent(db, id); // 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()); List history = DBConnection.exec(stmt, new HistoryDataListSqlResult()); diff --git a/src/se/hal/page/SensorOverviewHttpPage.java b/src/se/hal/page/SensorOverviewHttpPage.java index 1ac73225..e64dfb7b 100755 --- a/src/se/hal/page/SensorOverviewHttpPage.java +++ b/src/se/hal/page/SensorOverviewHttpPage.java @@ -43,7 +43,7 @@ public class SensorOverviewHttpPage extends HalHttpPage { Sensor sensor = Sensor.getSensor(db, id); // 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(2, HISTORY_LIMIT); List history = DBConnection.exec(stmt, new HistoryDataListSqlResult());