mo8it/AdvLabDB
1
0
Fork 0
mirror of https://codeberg.org/Mo8it/AdvLabDB.git synced 2024-11-08 21:21:06 +00:00
Code Releases Activity

Fixed changing active semester

Browse source
This commit is contained in:
Mo 2021-07-11 13:48:13 +02:00
parent e50ad68d97
commit c9143410d4
3 changed files with 23 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
DB.drawio
View file

File diff suppressed because one or more lines are too long

13
advlabdb/routes.py
View file

@ -1,4 +1,4 @@
from flask import redirect, render_template, request, url_for from flask import redirect, render_template, request, url_for, flash
from flask_security import auth_required, current_user from flask_security import auth_required, current_user
from advlabdb import app from advlabdb import app
@ -73,7 +73,12 @@ def index():
@app.route("/set_semester") @app.route("/set_semester")
@auth_required() @auth_required()
def set_semester(): def set_semester():
setUserActiveSemester(request.args.get("semester_id")) try:
ref = request.referrer semesterId = int(request.args.get("semester_id"))
red = ref if ref else url_for("index") except Exception as ex:
flash(str(ex), "error")
else:
setUserActiveSemester(semesterId)
red = request.referrer or url_for("index")
return redirect(red) return redirect(red)

21
advlabdb/utils.py
View file

@ -102,11 +102,16 @@ def partFromLabelInUserActiveSemester(partLabel):
def setUserActiveSemester(semesterId): def setUserActiveSemester(semesterId):
try: if current_user.active_semester_id != semesterId:
current_user.active_semester_id = Semester.query.get(int(semesterId)).id if Semester.query.get(semesterId):
except Exception as err: try:
flash(str(err)) current_user.active_semester_id = semesterId
return False db.session.commit()
db.session.commit() except Exception as ex:
flash(f"Active semester changed to {Semester.query.get(semesterId).label}!", "warning") flash(str(ex), "error")
return True
db.session.rollback()
else:
flash(f"Active semester changed to {Semester.query.get(semesterId).label}!", "warning")
else:
flash(f"No semester with ID {semesterId}!", "error")