From 662407a13655adb85379cee4bc8f172321fc46fc Mon Sep 17 00:00:00 2001
From: paulmart-n <hi@paulmartin.cloud>
Date: Mon, 7 Oct 2024 12:51:49 +0200
Subject: [PATCH] Update styles, Semesterlist

---
 requesthelpers.py          | 36 ++++++++++++++++++++++++++++++++----
 routing.py                 | 13 ++++---------
 static/cal.css             |  4 +++-
 static/cal.css.map         |  2 +-
 static/cal.scss            |  4 +++-
 static/style.css           |  1 +
 static/style.css.map       |  2 +-
 static/style.scss          |  1 +
 tests_examples/test_app.py | 14 +++++++-------
 9 files changed, 53 insertions(+), 24 deletions(-)

diff --git a/requesthelpers.py b/requesthelpers.py
index 715e79c..005d4d7 100644
--- a/requesthelpers.py
+++ b/requesthelpers.py
@@ -1,5 +1,8 @@
-from init import Semesterlist, User
-
+from sympy.printing.tree import print_node
+from flask_login import current_user as currentUser
+import fetchDUALIS
+from init import Semesterlist, User, db
+from datetime import datetime
 
 def getCookie(cookies):
     """
@@ -13,10 +16,12 @@ def getCookie(cookies):
     return cookie
 
 
-def getSemesterList(uid):
+async def getSemesterList(uid, token, cookie):
     """
     Liefert die IDs der Semester für den User
     :param uid:
+    :param token:
+    :param cookie:
     :return Semester-ID-Liste:
     """
     dbSemesterList = Semesterlist.query.filter_by(uid=uid).all()
@@ -24,7 +29,30 @@ def getSemesterList(uid):
     for semester in dbSemesterList:
         semesterList += [[semester.semestername, semester.semesterid]]
     semesterList.sort(key=lambda x: x[-1], reverse=True)
-    return semesterList
+    shortList = (int(x[0][-2:]) for x in semesterList)
+    for shortYear in shortList:
+        if (shortYear > datetime.now().year-2000) or (len(semesterList) == 6):
+            return semesterList
+    return semesterDualisToDB(semesterList, token, cookie)
+
+
+async def semesterDualisToDB (semesterlist, token, cookie):
+    """
+    Gleicht die Semester-Einträge der mitgegebenen Liste mit den Semester-Einträgen von Dualis ab und schreibt
+    Differenzen in die Datenbank.
+    :param semesterlist:
+    :param token:
+    :param cookie:
+    :return Semester-ID-Liste:
+    """
+    semesterDualis = await fetchDUALIS.getSem(token, cookie)
+    for i in semesterDualis:
+        if i not in semesterlist:
+            semsterItem = Semesterlist(semestername=i[0], semesterid=i[1], uid=currentUser.id,
+                                       itemid=currentUser.id * int(i[1][-7:]) // 1000000)
+            db.session.add(semsterItem)
+    db.session.commit()
+    return semesterDualis
 
 
 def loadUser(uid):
diff --git a/routing.py b/routing.py
index 67db1c8..dd76d41 100644
--- a/routing.py
+++ b/routing.py
@@ -72,7 +72,7 @@ def initRoutes(app: Flask):
         timeout = fetchDUALIS.timeOut(dualisUser, cookie, "displayNoten")
         if timeout:
             return timeout
-        semester = getSemesterList(currentUser.id)
+        semester = await getSemesterList(currentUser.id, token, cookie)
         noten = await fetchDUALIS.getResults(token, cookie, chosenSemester)
         return render_template("noten.html", noten=noten, semester=semester, sel=chosenSemester, s="n",
                                praxis="hidden")
@@ -136,7 +136,7 @@ def initRoutes(app: Flask):
     @loginRequired
     async def restoreVL():
         events = HiddenVL.query.filter_by(uid=currentUser.id).all()
-        return render_template("restore-events.html", events=events, praxis="hidden")
+        return render_template("restore-events.html", s="s", events=events, praxis="hidden")
 
     @app.route("/plan/calendar/<int:uid>", methods=["GET"])
     async def deliverCalendar(uid: int):
@@ -197,14 +197,9 @@ def initRoutes(app: Flask):
         cookie = request.cookies.get("cnsc")
         semesterList = Semesterlist.query.filter_by(uid=currentUser.id).all()
         if not semesterList:
-            semester = await fetchDUALIS.getSem(token, cookie)
-            for i in semester:
-                semsterItem = Semesterlist(semestername=i[0], semesterid=i[1], uid=currentUser.id,
-                                           itemid=currentUser.id * int(i[1][-7:]) // 1000000)
-                db.session.add(semsterItem)
-            db.session.commit()
+            semester = await semesterDualisToDB([], token, cookie)
         else:
-            semester = getSemesterList(currentUser.id)
+            semester = await getSemesterList(currentUser.id, token, cookie)
         return render_template("semester.html", semester=semester, s="s",
                                theorie="hidden", praxis="hidden")
 
diff --git a/static/cal.css b/static/cal.css
index f8065ee..b0856ce 100644
--- a/static/cal.css
+++ b/static/cal.css
@@ -105,7 +105,8 @@ option {
 
 .timeline {
   display: grid;
-  grid-template-rows: repeat(12, 58px);
+  grid-template-rows: repeat(12, 60px);
+  padding-top: 50px;
 }
 
 .days {
@@ -200,6 +201,7 @@ nav ul {
   left: 0;
   height: 100%;
   overflow-y: auto;
+  overflow-x: hidden;
   font-size: 150%;
 }
 
diff --git a/static/cal.css.map b/static/cal.css.map
index 3b8cdab..46c8bd0 100644
--- a/static/cal.css.map
+++ b/static/cal.css.map
@@ -1 +1 @@
-{"version":3,"sourceRoot":"","sources":["cal.scss"],"names":[],"mappings":"AAAA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA;EACA;EACA;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;;;AAMF;EACE;EACA;EACA;EACA;;;AAGF;AAAA;AAAA;EAGE;EACA;EACA;;;AAGF;EACE;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;;;AAGF;AAAA;EAEE;;;AAKF;EACE;EACA;EACA;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA;EACA;;;AAGF;EACE;EACA;EACA;;;AAKF;EACI;EACA;;;AAIJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;EACA;EACA;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;;;AAGJ;EACI;EACA;;;AAGJ;EACI;;;AAIJ;EACI;EACA;EACA;EACA;;;AAGJ;EACI;EACA;;;AAGJ;EACI;EACA;EACA;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;;;AAGJ;EACI;EACA;;;AAGJ;EACE;;;AAQF;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAKA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAKA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAKA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA","file":"cal.css"}
\ No newline at end of file
+{"version":3,"sourceRoot":"","sources":["cal.scss"],"names":[],"mappings":"AAAA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA;EACA;EACA;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA;EACA;;;AAGF;EACE;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;;;AAMF;EACE;EACA;EACA;EACA;;;AAGF;AAAA;AAAA;EAGE;EACA;EACA;;;AAGF;EACE;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;;;AAGF;AAAA;EAEE;;;AAKF;EACE;EACA;EACA;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA;EACA;;;AAGF;EACE;EACA;EACA;;;AAKF;EACI;EACA;;;AAIJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;EACA;EACA;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;;;AAGJ;EACI;EACA;;;AAGJ;EACI;;;AAIJ;EACI;EACA;EACA;EACA;;;AAGJ;EACI;EACA;;;AAGJ;EACI;EACA;EACA;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;;;AAGJ;EACI;EACA;;;AAGJ;EACE;;;AAQF;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAKA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAKA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAKA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA;;;AAEA;EACA","file":"cal.css"}
\ No newline at end of file
diff --git a/static/cal.scss b/static/cal.scss
index 5ec013c..e501968 100644
--- a/static/cal.scss
+++ b/static/cal.scss
@@ -105,7 +105,8 @@ option {
 
 .timeline {
   display: grid;
-  grid-template-rows: repeat(12, 58px);
+  grid-template-rows: repeat(12, 60px);
+  padding-top: 50px;
 }
 
 .days {
@@ -207,6 +208,7 @@ nav ul {
     left: 0;
     height: 100%;
     overflow-y: auto;
+    overflow-x: hidden;
     font-size: 150%;
 }
 
diff --git a/static/style.css b/static/style.css
index 5868d91..564c869 100644
--- a/static/style.css
+++ b/static/style.css
@@ -22,6 +22,7 @@ nav ul {
   left: 0;
   height: 100%;
   overflow-y: auto;
+  overflow-x: hidden;
 }
 
 nav li {
diff --git a/static/style.css.map b/static/style.css.map
index ddc44b7..dc0492b 100644
--- a/static/style.css.map
+++ b/static/style.css.map
@@ -1 +1 @@
-{"version":3,"sourceRoot":"","sources":["style.scss"],"names":[],"mappings":"AAAA;EACI;EACA;;;AAGJ;EACI;EACA;EACA;EACA;EACA;;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;EACA;EACA;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;;;AAGJ;EACI;;;AAGJ;EACI;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;EACA;;;AAGJ;EACI;EACA;;;AAGJ;EACI;EACA;EACA;;;AAGJ;EACI;EACA;;;AAGJ;EACI;EACA;EACA;EACA;EACA;;;AAGJ;EACI;EACA;;;AAIJ;EACI;EACA;;;AAGJ;AACA;EACI;EACA;EACA;;;AAGJ;EACI;EACA;EACA;EACA;EACA;;;AAGJ;EACI;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;EACH;;;AAGD;EACI;;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACI;EACA;;;AAGJ;EACE;;;AAGF;EACI;EACA;;;AAGJ;EACI;;;AAGJ;EACI;EACA","file":"style.css"}
\ No newline at end of file
+{"version":3,"sourceRoot":"","sources":["style.scss"],"names":[],"mappings":"AAAA;EACI;EACA;;;AAGJ;EACI;EACA;EACA;EACA;EACA;;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;EACA;EACA;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;;;AAGJ;EACI;;;AAGJ;EACI;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;EACA;;;AAGJ;EACI;EACA;;;AAGJ;EACI;EACA;EACA;;;AAGJ;EACI;EACA;;;AAGJ;EACI;EACA;EACA;EACA;EACA;;;AAGJ;EACI;EACA;;;AAIJ;EACI;EACA;;;AAGJ;AACA;EACI;EACA;EACA;;;AAGJ;EACI;EACA;EACA;EACA;EACA;;;AAGJ;EACI;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;EACH;;;AAGD;EACI;;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACI;EACA;;;AAGJ;EACE;;;AAGF;EACI;EACA;;;AAGJ;EACI;;;AAGJ;EACI;EACA","file":"style.css"}
\ No newline at end of file
diff --git a/static/style.scss b/static/style.scss
index c466185..bc52641 100644
--- a/static/style.scss
+++ b/static/style.scss
@@ -22,6 +22,7 @@ nav ul {
     left: 0;
     height: 100%;
     overflow-y: auto;
+    overflow-x: hidden;
 }
 
 nav li {
diff --git a/tests_examples/test_app.py b/tests_examples/test_app.py
index 52076f1..278fddc 100644
--- a/tests_examples/test_app.py
+++ b/tests_examples/test_app.py
@@ -157,11 +157,11 @@ async def test_url_anweisung_whitebox(app):
     :param app:
     """
     with app.app_context():
-        raplaPage = await fetchRAPLA.getNewRapla("http://www.rapla.dhbw-karlsruhe.de/rapla?page=calendar&user=vollmer"
-                                             "&file=tinf22b3", True)
+        raplaPage = await fetchRAPLA.getNewRapla("http://www.rapla.dhbw-karlsruhe.de/rapla?page=calendar&user="
+                                                 "vollmer&file=tinf22b3", True)  #HTML
         assert "TINF22B3" in raplaPage
-        raplaFile = await fetchRAPLA.getNewRapla("http://www.rapla.dhbw-karlsruhe.de/rapla?page=ical&user=vollmer"
-                                             "&file=tinf22b3", True)
+        raplaFile = await fetchRAPLA.getNewRapla("http://rapla.dhbw-karlsruhe.de/rapla?page=ical&user=vollmer"
+                                                 "&file=tinf22b3", True)        #ICAL
         assert "TINF22B3" in raplaFile
 
 
@@ -174,9 +174,9 @@ async def test_url_entscheidung_whitebox(app):
     with app.app_context():
         await test_url_anweisung_whitebox(app)
         raplaFile = await fetchRAPLA.getNewRapla("https://rapla.dhbw-karlsruhe.de/rapla?key=5h7oySnUbC4A59dSScuZ"
-                                                 "lPHhaNFS3OaaP-0UTlOEPu-NcWfZ-gMhnSpHZmYCPcIe", True)
+                                                 "lPHhaNFS3OaaP-0UTlOEPu-NcWfZ-gMhnSpHZmYCPcIe", True)  #ICAL
         assert "TMB22" in raplaFile
         raplaPage = await fetchRAPLA.getNewRapla("http://www.rapla.dhbw-karlsruhe.de/rapla?key=ah9tAVphi"
-                                             "caj4FqCtMVJchAs9fh0Dt89jA8Td4kEi21V0i2mlUEpycpIVw5jSY5T",
-                                             True)
+                                                 "caj4FqCtMVJchAs9fh0Dt89jA8Td4kEi21V0i2mlUEpycpIVw5jSY5T",
+                                                 True)                                                  #HTML
         assert "TMT22B1" in raplaPage