Rapla-Key-Import + Depreciate calendars/list.json

calendar_generation.py

@@ -40,8 +40,10 @@ async def getWeek(weekstart: datetime, file: str, showsat: bool):
     mon += " " + str(end_date.year)
     with open("calendars/" + file) as f:
         calendar = icalendar.Calendar.from_ical(f.read())
+
     events = recurring_ical_events.of(calendar).between(start_date, end_date)
     eventl = []
+
     for event in events:
         estart = event["DTSTART"].dt
         if str(estart.tzinfo) != "Europe/Berlin":
@@ -60,6 +62,10 @@ async def getWeek(weekstart: datetime, file: str, showsat: bool):
                     forml[i] = "0" + forml[i]
         formstart = forml[0]
         formend = forml[1]
+        try:
+            teacher = event["ATTENDEE"].params["CN"]
+        except KeyError:
+            teacher = ""
         eventdict = {
             "start": formstart,
             "end": formend,
@@ -67,7 +73,8 @@ async def getWeek(weekstart: datetime, file: str, showsat: bool):
             "name": event["SUMMARY"],
             "room": event["LOCATION"],
             "weekday": estart.weekday(),
-            "day": estart.day
+            "day": estart.day,
+            "teacher": teacher,
         }
         eventl += [eventdict]
     return eventl, await daylist(start_date, showsat), prevw, nextw, mon