From 8eae37e77e65e2c7663ccb247e914e105e903389 Mon Sep 17 00:00:00 2001 From: Robert Goldmann <deadlocker@gmx.de> Date: Fri, 25 Sep 2020 09:02:44 +0200 Subject: [PATCH] sort measurements by timestamp descending --- src/logic/Database.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/logic/Database.py b/src/logic/Database.py index 6561b2b..be95726 100644 --- a/src/logic/Database.py +++ b/src/logic/Database.py @@ -111,7 +111,7 @@ class Database: fetch_type=FetchType.NONE) def get_all_measurements(self) -> List[Dict[str, str]]: - return self.__query(f'SELECT * FROM {self.TABLE_MEASUREMENT} ORDER BY sensor_id, date(timestamp)', + return self.__query(f'SELECT * FROM {self.TABLE_MEASUREMENT} ORDER BY sensor_id ASC, datetime(timestamp) DESC', fetch_type=FetchType.ALL) def get_measurement(self, measurementID: int) -> Dict[str, str] or None: @@ -121,7 +121,7 @@ class Database: def get_all_measurements_for_sensor(self, sensorID: int) -> List[Dict[str, str]]: return self.__query(f'SELECT * FROM {self.TABLE_MEASUREMENT} WHERE sensor_id = ? ' - f'ORDER BY sensor_id, date(timestamp)', + f'ORDER BY datetime(timestamp) DESC', sensorID, fetch_type=FetchType.ALL) -- GitLab