SoftwareEngineering/DualHub
4
1
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

optimize mensa async

Browse Source
This commit is contained in:
Paul Martin
2024-04-09 11:04:18 +02:00
parent 0d31d84d48
commit ccb088e36d
7 changed files with 66 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
routing.py
View File

@ -10,8 +10,9 @@ import time
import random
import fetchDUALIS
import fetchMENSA
import fetchRAPLA
import requesthelpers
from requesthelpers import *
from fetchRAPLA import *
from calendar_generation import getWeek
from init import *
@ -68,14 +69,14 @@ async def displayNoten():
timeout = fetchDUALIS.timeOut(d, c, "displayNoten")
if timeout:
return timeout
semester = requesthelpers.semesterlist(current_user.id)
semester = getSemesterList(current_user.id)
noten = await fetchDUALIS.getResults(t, c, chosensemester)
return render_template("noten.html", noten=noten, semester=semester, sel=chosensemester, s="n", praxis="hidden")
@app.route("/plan", methods=["GET"])
@login_required
def displayRapla():
async def displayRapla():
"""
Zeigt den Stundenplan für eingeloggte User an. \n
TODO: Persönliche Filter, Notizen, Essensvorlieben etc. berücksichtigen.
@ -91,14 +92,14 @@ def displayRapla():
samstag = request.args.get("samstag")
if not samstag:
samstag = False
events = getWeek(week, fetchRAPLA.getIcal(current_user.kurs), samstag)
events = await getWeek(week, fetchRAPLA.getIcal(current_user.kurs), samstag)
return render_template("plan-user.html", events=events[0], eventdays=events[1],
name=current_user.name, prev=str(events[2])[:10], next=str(events[3])[:10], mon=events[4],
s="p", praxis="hidden")
@app.route("/plan/<string:kurs>")
def displayPlan(kurs):
async def displayPlan(kurs):
"""
Zeigt den Stundenplan ohne Login an. \n
Präferenzen werden nicht berücksichtigt.
@ -121,7 +122,7 @@ def displayPlan(kurs):
samstag = request.args.get("samstag")
if not samstag:
samstag = False
events = getWeek(week, plan, samstag)
events = await getWeek(week, plan, samstag)
return render_template("plan-anon.html", events=events[0], eventdays=events[1], kurs=kurs,
prev=str(events[2])[:10], next=str(events[3])[:10], mon=events[4], praxis="hidden")
else:
@ -189,7 +190,7 @@ async def getSemester():
db.session.add(semitem)
db.session.commit()
else:
semester = requesthelpers.semesterlist(current_user.id)
semester = getSemesterList(current_user.id)
return render_template("semester.html", semester=semester, s="s", theorie="hidden", praxis="hidden")
@ -232,7 +233,7 @@ def getRapla():
if file == url == "None":
return redirect(url_for("chooseRaplas"))
if file != "None":
User.query.filter_by(id=current_user.id).first().kurs = file[5:-5]
loadUser(current_user.id).kurs = file[5:-5]
db.session.commit()
elif url != "None":
file = getNewRapla(url)