From 693d0a0b2e7f9c29bfc5862f17b3b3ec2de3d11a Mon Sep 17 00:00:00 2001 From: Mordrehel <55900629+Mordrehel@users.noreply.github.com> Date: Wed, 3 Nov 2021 20:49:35 -0500 Subject: [PATCH 1/2] Doesn't Show LOAs more than a year in the future Title --- yogsite/modules/admin/routes.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/yogsite/modules/admin/routes.py b/yogsite/modules/admin/routes.py index 352fd15..3bdc897 100644 --- a/yogsite/modules/admin/routes.py +++ b/yogsite/modules/admin/routes.py @@ -24,8 +24,11 @@ def page_loa(): form_set_loa = SetLOAForm(request.form, prefix="form_set_loa") loas = db.game_db.query(db.LOA).filter( - db.LOA.expiry_time > (datetime.utcnow() - timedelta(days=30)).date() - ).order_by(db.LOA.id.desc()) # Get LOAs sorted by start time + and_( + db.LOA.expiry_time < (datetime.utcnow() + timedelta(years=1)).date(), + db.LOA.expiry_time > (datetime.utcnow() - timedelta(days=30)).date() + ) + ).order_by(db.LOA.id.desc()) # Get LOAs sorted by start time if not g.current_user.has_perms("loa.others"): loas = loas.filter(db.LOA.ckey == g.current_user.ckey) From e32665e6d652372c4db97c174f651dcee4906f2b Mon Sep 17 00:00:00 2001 From: Mordrehel <55900629+Mordrehel@users.noreply.github.com> Date: Wed, 3 Nov 2021 21:31:02 -0500 Subject: [PATCH 2/2] Fucked up comparison --- yogsite/modules/admin/routes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yogsite/modules/admin/routes.py b/yogsite/modules/admin/routes.py index 3bdc897..e8f5e60 100644 --- a/yogsite/modules/admin/routes.py +++ b/yogsite/modules/admin/routes.py @@ -25,7 +25,7 @@ def page_loa(): loas = db.game_db.query(db.LOA).filter( and_( - db.LOA.expiry_time < (datetime.utcnow() + timedelta(years=1)).date(), + db.LOA.expiry_time > (datetime.utcnow() + timedelta(years=1)).date(), db.LOA.expiry_time > (datetime.utcnow() - timedelta(days=30)).date() ) ).order_by(db.LOA.id.desc()) # Get LOAs sorted by start time