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

Merge branch 'refs/heads/main' into turbo

Browse Source 
# Conflicts:
#	init.py
This commit is contained in:
Paul Martin
2024-04-10 13:53:51 +02:00
parent 8be441bab9 447800ad73
commit 8021fdfaf8
12 changed files with 565 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
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 *
@ -61,29 +62,33 @@ def welcome():
return render_template('dashboard.html', kurs=kurs, name=name, theorie=t, praxis=p)
@app.route("/theorie/noten")
@app.route("/theorie/noten", methods=["GET", "POST"])
@login_required
def displayNoten():
async def displayNoten():
"""
Zeigt die Noten aus Dualis an. Hierfür ist ein aktives Token nötig.
:return HTML:
"""
d = Dualis.query.filter_by(uid=current_user.id).first()
if not d.result_list:
if request.method == "POST":
d.semester = request.form.get("sem")
db.session.commit()
if not d.semester:
return redirect(url_for("getSemester", next=url_for(request.endpoint)))
t = d.token
sem = d.result_list
chosensemester = d.semester
c = request.cookies.get("cnsc")
timeout = fetchDUALIS.timeOut(d, c, "displayNoten")
if timeout:
return timeout
res = fetchDUALIS.getResults(t, c, sem)
return render_template("noten.html", noten=res, semester=fetchDUALIS.getSem(t, c), sel=sem, s="n", praxis="hidden")
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.
@ -99,14 +104,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.
@ -129,7 +134,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:
@ -147,7 +152,7 @@ def redKurs():
@app.route("/set-up/kurs")
@login_required
def getKurs():
async def getKurs():
"""
Automatische Kurs-Auswahl. \n
Aktives Dualis-Token benötigt.
@ -161,7 +166,7 @@ def getKurs():
return timeout
e = False
if not current_user.kurs:
kurs = fetchDUALIS.getKurs(d.token, cookie)
kurs = await fetchDUALIS.getKurs(d.token, cookie)
if kurs != 0:
if not fetchRAPLA.getIcal(kurs):
return render_template('kurs.html', detected=(kurs, e), s="s", theorie="hidden", praxis="hidden",
@ -182,15 +187,23 @@ def getKurs():
@app.route("/set-up/semester")
@login_required
def getSemester():
async def getSemester():
"""
Manuelle Semester-Auswahl.
:return HTML:
"""
t = Dualis.query.filter_by(uid=current_user.id).first().token
c = request.cookies.get("cnsc")
return render_template("semester.html", semester=fetchDUALIS.getSem(t, c), s="s", theorie="hidden", praxis="hidden")
semesterlist = Semesterlist.query.filter_by(uid=current_user.id).all()
if not semesterlist:
semester = await fetchDUALIS.getSem(t, c)
for i in semester:
semitem = Semesterlist(semestername=i[0], semesterid=i[1], uid=current_user.id, itemid=current_user.id*int(i[1][-7:])//1000000)
db.session.add(semitem)
db.session.commit()
else:
semester = getSemesterList(current_user.id)
return render_template("semester.html", semester=semester, s="s", theorie="hidden", praxis="hidden")
@app.route("/set-up/semester", methods=["POST"])
@ -204,7 +217,7 @@ def setSemester():
if not n:
n = url_for("welcome")
d = Dualis.query.filter_by(uid=current_user.id).first()
d.result_list = request.form.get("sem")
d.semester = request.form.get("sem")
db.session.commit()
return redirect(n)
@ -222,7 +235,7 @@ def chooseRaplas():
@app.route("/set-up/rapla", methods=["POST"])
@login_required
def getRapla():
async def getRapla():
"""
Verarbeitet die Eingabe von chooseRaplas().
:return HTML:
@ -232,10 +245,10 @@ 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)
file = await getNewRapla(url)
if type(file) is not int:
User.query.filter_by(id=current_user.id).first().kurs = file[5:-5]
db.session.commit()
@ -254,7 +267,7 @@ def login():
@app.route("/log-in", methods=["POST"])
def login_post():
async def login_post():
"""
Verarbeitet die Eingabe von login(). \n
Falls der User schon angelegt ist, wird das Passwort verglichen. \n
@ -270,18 +283,18 @@ def login_post():
success = make_response(redirect(url_for("getKurs")))
user = User.query.filter_by(email=email).first()
t = fetchDUALIS.checkUser(email, password)
t = await fetchDUALIS.checkUser(email, password)
if t[0] == -2:
return redirect(url_for("login", code=-2))
if user:
dualis = Dualis.query.filter_by(uid=user.id).first()
dualis.token = t[0]
newcookie = requesthelpers.getCookie(t[1].cookies)
newcookie = t[1]
dualis.token_created = time.time()
db.session.commit()
login_user(user)
if user.kurs:
if not dualis.result_list:
if not dualis.semester:
success = make_response(redirect(url_for("getSemester")))
elif not n:
success = make_response(redirect(url_for("welcome")))
@ -307,14 +320,14 @@ def login_post():
@app.route("/log-out")
@login_required
def logout():
async def logout():
"""
Loggt den User aus.
:return Empty Token:
"""
cookie = request.cookies.get("cnsc")
dualis = Dualis.query.filter_by(uid=current_user.id).first()
fetchDUALIS.logOut(dualis.token, cookie)
await fetchDUALIS.logOut(dualis.token, cookie)
dualis.token = None
db.session.commit()
logout_user()