diff --git a/calendar/teachingdates/calendars/basecalendar.py b/calendar/teachingdates/calendars/basecalendar.py index c978b6f..75182d4 100644 --- a/calendar/teachingdates/calendars/basecalendar.py +++ b/calendar/teachingdates/calendars/basecalendar.py @@ -69,6 +69,8 @@ self.mondays[-1].isocalendar()[1] # last ISO week ]}]) self.calendars["iso"] = self.generate_calendar("iso") + if self.config.paper: + self.update_lectures(self.config.get_paper_config(self.config.paper)) # print("mondays (__init__): ", self.mondays) # print("period_weeks (__init__): ", self.period_weeks) @@ -148,7 +150,7 @@ return weeks def update_lectures(self, lecture_list): - for l in lecture_list: + for l in lecture_list["lectures"]: for t, v in l.items(): if t == "offsets": self.lecture_offsets = v @@ -187,7 +189,7 @@ def lecture_dates(self): dates = {} lecture_num = 1 - teaching_weeks = [t for t in self.weeks if isinstance(t, TeachingWeek)] + teaching_weeks = [t for t in self.calendars[self.config.period].values() if isinstance(t, TeachingWeek)] for week_index, monday in enumerate(teaching_weeks): for offset_index, offset in enumerate(self.lecture_offsets): lec = week_index * 2 + offset_index + 1