From 702cdf05ca9a3b3930992770f5303a5f206c2a2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20Gru=CC=88ndger?= Date: Thu, 10 Jan 2019 08:36:51 +0100 Subject: [PATCH] Speed up logbook view --- ogn/commands/logbook.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ogn/commands/logbook.py b/ogn/commands/logbook.py index 499a6c3..97336bd 100644 --- a/ogn/commands/logbook.py +++ b/ogn/commands/logbook.py @@ -7,10 +7,11 @@ from ogn.collect.logbook import update_logbook from ogn.collect.takeoff_landings import update_takeoff_landings from ogn.commands.dbutils import session from ogn.model import Airport, Logbook -from sqlalchemy import or_ +from sqlalchemy import or_, between from sqlalchemy.sql import func from tqdm import tqdm from ogn.commands.database import get_database_days +from ogn.utils import date_to_timestamps manager = Manager() @@ -54,7 +55,8 @@ def show(airport_name, date=None): or_args = [] if date is not None: date = datetime.strptime(date, "%Y-%m-%d") - or_args = [func.date(Logbook.reftime) == date] + (start, end) = date_to_timestamps(date) + or_args = [between(Logbook.reftime, start, end)] # get all logbook entries and add device and airport infos logbook_query = session.query(func.row_number().over(order_by=Logbook.reftime).label('row_number'),