From d71070008d21f11f5a2ac420667ab9e5be2794bc Mon Sep 17 00:00:00 2001 From: Mo8it Date: Tue, 12 Apr 2022 15:00:12 +0200 Subject: [PATCH] Add sorted semesters function --- advlabdb/utils.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/advlabdb/utils.py b/advlabdb/utils.py index 5db692c..d21ed23 100644 --- a/advlabdb/utils.py +++ b/advlabdb/utils.py @@ -17,10 +17,12 @@ def flashRandomPassword(password): flash(f"Random password: {password}", category="warning") +def sortedSemestersStartingWithNewest(): + return Semester.query.order_by(Semester.year.desc()).order_by(Semester.label.desc()) + + def userActiveSemester(flashWarning=False): - lastSemesterId = ( - Semester.query.order_by(Semester.year.desc()).order_by(Semester.label.desc()).first().id - ) # "WS" > "SS" + lastSemesterId = sortedSemestersStartingWithNewest().first().id # "WS" > "SS" if current_user.active_semester_id is None: current_user.active_semester_id = lastSemesterId db.session.commit()