From 08b77299fdd9d40b3181635ad86f0848628377cf Mon Sep 17 00:00:00 2001 From: Maximilian Heuwes Date: Tue, 24 Jun 2025 23:35:09 +0200 Subject: [PATCH] Winterophase 2025 --- daten/owo-stundenplan-bachelor.json | 54 ++++----- daten/owo-stundenplan-master.json | 166 +++++++++++++--------------- generate.py | 2 +- stundenplan.sty | 2 +- 4 files changed, 97 insertions(+), 127 deletions(-) diff --git a/daten/owo-stundenplan-bachelor.json b/daten/owo-stundenplan-bachelor.json index 369b9a0..25c9767 100644 --- a/daten/owo-stundenplan-bachelor.json +++ b/daten/owo-stundenplan-bachelor.json @@ -45,8 +45,8 @@ "en": "This event is open end." }, { - "de": "Zur Auswahl: Auslandsvortrag (S3|11 08), Lerngruppen-Speed-Dating (S2|02 C301), Git-Workshop (S2|02 C205)", - "en": "To choose from: Lecture abroad (S3|11 08), Learning group speed dating (S2|02 C301), Git workshop (S2|02 C205)" + "de": "Zur Auswahl: Auslandsvortrag (S3|11 08), Lerngruppen-Speed-Dating (S2|02 A020), Git-Workshop (S2|02 C205)", + "en": "To choose from: Lecture abroad (S3|11 08), Learning group speed dating (S2|02 A020), Git workshop (S2|02 C205)" } ], "days": [ @@ -98,8 +98,8 @@ "from": "16:30", "to": "19:30", "name": { - "de": "Spielepräabend", - "en": "Games pre evening" + "de": "Spielepräabend / Stadtführung", + "en": "Games pre evening / City tour" }, "room": "Folgt nach Vortrag", "notes": [2] @@ -192,8 +192,8 @@ "from": "09:30", "to": "12:00", "name": { - "de": "Mentorensystem,\nTUCaN, Moodle", - "en": "Mentoring system,\nTUCaN, Moodle" + "de": "Mentorensystem/eiiss,\nTUCaN, Moodle", + "en": "Mentoring system/eiiss,\nTUCaN, Moodle" }, "room": "S1|05 122 (Maschinenhaus)" }, @@ -210,7 +210,7 @@ { "category": "dezentral", "from": "14:30", - "to": "19:00", + "to": "17:30", "name": { "de": "Geländespiel", "en": "Campus game" @@ -219,7 +219,7 @@ }, { "category": "optional", - "from": "19:00", + "from": "17:30", "to": "20:00", "name": { "de": "Spieleabend", @@ -279,11 +279,10 @@ "from": "19:00", "to": "21:00", "name": { - "de": "Kneipentour / Mathetheater", - "en": "Bar tour / Math theatre" + "de": "Mathetheater", + "en": "Math theatre" }, - "room": "S2|02 C205 / S2|06 030", - "notes": [2] + "room": "S2|06 030" } ] }, @@ -293,7 +292,7 @@ { "category": "optional", "from": "08:30", - "to": "10:30", + "to": "09:45", "name": { "de": "Frühstück", "en": "Breakfast" @@ -302,18 +301,18 @@ }, { "category": "dezentral", - "from": "10:30", - "to": "11:30", + "from": "09:45", + "to": "11:15", "name": { - "de": "AStA, Beschwerdemanagement", - "en": "AStA, complaint management" + "de": "AStA, Beschwerdemanagement,\nAnti-Diskriminierung,\nGleichstellungsteam", + "en": "AStA, complaint management,\nAnti-Discrimination,\nGender Equality Team" }, "room": "S1|05 122 (Maschinenhaus)" }, { "category": "kleingruppe", - "from": "11:30", - "to": "14:30", + "from": "11:15", + "to": "14:00", "name": { "de": "Kleingruppen", "en": "Groups" @@ -322,25 +321,14 @@ }, { "category": "zentral", - "from": "14:40", - "to": "16:00", + "from": "14:00", + "to": "15:30", "name": { "de": "Abschluss", "en": "Closing" }, "room": "S1|05 122 (Maschinenhaus)" }, - { - "category": "optional", - "from": "16:00", - "to": "19:00", - "name": { - "de": "Campus-/Stadtführung\noder Spieleabend", - "en": "Campus and city tour\nor games evening" - }, - "room": "S2|02 C301", - "notes": [2] - }, { "category": "optional", "from": "20:00", @@ -349,7 +337,7 @@ "de": "FB20 Party", "en": "FB20 Party" }, - "room": "Goldene Krone", + "room": "t.b.d.", "notes": [2] } ] diff --git a/daten/owo-stundenplan-master.json b/daten/owo-stundenplan-master.json index c0f8c26..586987a 100644 --- a/daten/owo-stundenplan-master.json +++ b/daten/owo-stundenplan-master.json @@ -63,12 +63,12 @@ ], "days": [ { - "dayOfWeek": 2, + "dayOfWeek": 3, "slots": [ { "category": "optional", - "from": "09:00", - "to": "10:00", + "from": "09:30", + "to": "11:00", "name": { "de": "Frühstück", "en": "Breakfast" @@ -77,8 +77,8 @@ }, { "category": "department", - "from": "10:00", - "to": "10:30", + "from": "11:00", + "to": "11:45", "name": { "de": "Begrüßung", "en": "Welcome Meeting" @@ -87,18 +87,18 @@ }, { "category": "tud", - "from": "10:30", - "to": "12:00", + "from": "11:45", + "to": "13:00", "name": { - "de": "Fachstudienberatung und Studieren\nan der TU Darmstadt", - "en": "Student Advisory Talk and\nStudying at TU Darmstadt" + "de": "Fachstudienberatung", + "en": "Student Advisory Talk" }, "room": "S2|02 C205" }, { "category": "tud", - "from": "12:00", - "to": "13:30", + "from": "13:00", + "to": "14:30", "name": { "de": "ULB Tour", "en": "ULB Tour" @@ -107,68 +107,49 @@ }, { "category": "leisure", - "from": "12:00", - "to": "13:30", + "from": "13:00", + "to": "14:30", "name": { "de": "Mittagessen", "en": "Lunch" }, "room": "Mensa" }, - { - "category": "department", - "from": "13:30", - "to": "14:30", - "name": { - "de": "Studieren im Ausland", - "en": "Studying Abroad" - }, - "room": "S2|02 C110" - }, { "category": "department", "from": "14:30", - "to": "15:30", + "to": "16:00", "name": { - "de": "Kurzvorträge", - "en": "Lightning-Round talks" + "de": "Master/Doktor-Panel", + "en": "Master and Doctorate Panel" }, - "room": "S2|02 C110" + "room": "S2|02 C205" }, { "category": "leisure", - "from": "15:30", - "to": "16:30", + "from": "16:00", + "to": "17:00", "name": { "de": "Get-Together", "en": "Get-Together" }, - "room": "S2|02 C110" + "room": "S2|02 A020 (LZI)" }, { "category": "leisure", - "from": "16:30", + "from": "17:00", "to": "19:00", "name": { "de": "Brettspielabend", "en": "Gnom" }, - "room": "S2|02 C110" - }, - { - "category": "leisure", - "from": "16:30", - "to": "19:00", - "name": { - "de": "Stadttour", - "en": "City Tour" - }, - "room": "S2|02 C110" + "room": "S2|02 A020 (LZI)", + "notes": [1] } ] }, { - "dayOfWeek": 3, + "dayOfWeek": 4, "slots": [ { "category": "optional", @@ -189,12 +170,22 @@ "de": "IT Systeme", "en": "IT Systems" }, - "room": "S2|02 C110" + "room": "S2|02 C205" + }, + { + "category": "department", + "from": "12:00", + "to": "13:00", + "name": { + "de": "Kurzvorträge", + "en": "Lightning-Round talks" + }, + "room": "S2|02 C205" }, { "category": "leisure", - "from": "12:00", - "to": "13:30", + "from": "13:00", + "to": "14:00", "name": { "de": "Mittagessen", "en": "Lunch" @@ -203,23 +194,23 @@ }, { "category": "tud", - "from": "13:30", - "to": "14:00", + "from": "14:00", + "to": "14:30", "name": { "de": "Fachschaft", "en": "Student council" }, - "room": "S2|02 C110" + "room": "S2|02 C205" }, { "category": "germany", - "from": "14:00", + "from": "14:30", "to": "16:00", "name": { "de": "Intercultural Talk", "en": "Intercultural Talk" }, - "room": "S2|02 C110" + "room": "S2|02 C205" }, { "category": "leisure", @@ -229,7 +220,7 @@ "de": "Unirallye", "en": "Unirallye" }, - "room": "S2|02 C110" + "room": "S2|02 C205" }, { "category": "leisure", @@ -239,18 +230,18 @@ "de": "Kneipentour", "en": "Bartour" }, - "room": "S2|02 C110", + "room": "S2|02 C205", "notes": [1] } ] }, { - "dayOfWeek": 4, + "dayOfWeek": 5, "slots": [ { "category": "optional", - "from": "09:00", - "to": "10:00", + "from": "08:30", + "to": "10:30", "name": { "de": "Frühstück", "en": "Breakfast" @@ -259,63 +250,54 @@ }, { "category": "tud", - "from": "10:00", - "to": "11:45", + "from": "10:30", + "to": "12:00", "name": { - "de": "Anti-Diskriminierung, AStA,\nBeschwerdemanagement, Gleichstellungs-\nTeam, Unite!", - "en": "Anti Discrimination, AStA,\nImprovement Management, Gender Equality\nTeam, Unite!" + "de": "Beyond University\nAStA, Beschwerdemanagement,\nGleichstellungs-Team, Sprachencenter", + "en": "Beyond University\nAStA, Improvement Management,\nGender Equality Team, Language center" }, - "room": "S2|02 C110" + "room": "S2|02 C205" }, { "category": "department", - "from": "11:45", + "from": "12:00", "to": "13:00", "name": { - "de": "Wissenschaftlicher Vortrag\nvon Prof. Ulmann", - "en": "Scientific Talk\nby Prof. Ulmann" + "de": "Studieren im Ausland", + "en": "Studying Abroad" }, - "room": "S2|02 C110" + "room": "S2|02 C205" }, { "category": "department", "from": "13:00", - "to": "14:00", + "to": "13:30", "name": { - "de": "Master/Doktor-Panel", - "en": "Master and Doctorate Panel" - }, - "room": "S2|02 C110" - }, - { - "category": "bachelor", - "from": "13:00", - "to": "14:00", - "name": { - "de": "Fachstudienberatung Q&A Bachelor", - "en": "Student Advisory Q&A Bachelor" - }, - "room": "S2|02 C110" - }, - { - "category": "department", - "from": "14:00", - "to": "14:30", - "name": { - "de": "Abschlussvotrag", + "de": "Abschlussvortrag", "en": "Feedback and Closing" }, - "room": "S2|02 C110" + "room": "S2|02 C205" }, { "category": "leisure", - "from": "14:30", - "to": "17:30", + "from": "13:30", + "to": "17:00", "name": { - "de": "Abschlussgrillen", - "en": "Master-BBQ" + "de": "Abschlussgrillen / Stadttour", + "en": "Master-BBQ / City tour" }, "room": "S2|02 A020" + }, + { + "category": "optional", + "from": "20:00", + "to": "21:00", + "name": { + "de": "FB20 Party", + "en": "FB20 Party" + }, + "room": "t.b.d.", + "notes": [2] } ] } diff --git a/generate.py b/generate.py index e879e5c..9f7c73c 100644 --- a/generate.py +++ b/generate.py @@ -89,7 +89,7 @@ def main(argv): time = '' time += '\\begin{tag}{Zeit}\n' for h in range(time_min, time_max, 1): - time += '\t\zeit{{{:02d}:00}}{{{:02d}:00}}'.format(h, h+1) + time += '\t\\zeit{{{:02d}:00}}{{{:02d}:00}}'.format(h, h+1) time += '\\end{tag}\n' with open(template_path, 'r') as f: diff --git a/stundenplan.sty b/stundenplan.sty index 830e234..10d482a 100644 --- a/stundenplan.sty +++ b/stundenplan.sty @@ -56,7 +56,7 @@ return (\t + \o) * daywidth(\n); }; function ypos(\s) { - return -0.1 - (\s - 540) / \scaling * 1.15; + return -0.1 - (\s - 480) / \scaling * 1.15; }; }