diff --git a/calendar/teachingdates/calendars/basecalendar.py b/calendar/teachingdates/calendars/basecalendar.py index 75182d4..9f08493 100644 --- a/calendar/teachingdates/calendars/basecalendar.py +++ b/calendar/teachingdates/calendars/basecalendar.py @@ -29,14 +29,6 @@ don't provide teaching period details, it generates dates for the current ISO-8601 year. """ - weeks = [] - lecture_offsets = [] - skipped_lectures = [] - period = None - period_name = None - paper = None - end_of_week = None - year = datetime.date.today().year def __init__(self, config): self.config = config @@ -69,46 +61,12 @@ self.mondays[-1].isocalendar()[1] # last ISO week ]}]) self.calendars["iso"] = self.generate_calendar("iso") + + self.lecture_offsets = [] + self.skipped_lectures = [] 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) - # print("calendars (__init__): ", self.calendars) - - # def __init__(self, - # year, - # period, - # paper, - # period_name="ISO", - # end_of_week=None, - # period_config=None, - # paper_config=None, - # config=None): - # self.year = year - # self.period = period - # self.period_name = period_name.replace(" ", "") - # self.paper = paper - # self.end_of_week = end_of_week - # self.config = config - - # # self.env.filters.update(filters) - - # # This is likely to end up with one week too many at the end, - # # but that doesn't matter as there will never be any teaching - # # during the last week of December! - # cal = calendar.Calendar().yeardatescalendar(self.year, width=12) - - # self.mondays = [week[0] for month in cal[0] for week in month] - # self.mondays = list(dict.fromkeys(self.mondays)) - # if period_config: - # self.update_weeks(period_config["weeks"]) - # else: - # last_week = datetime.date(self.year, 12, 28).isocalendar()[1] - # self.update_weeks([{"iso": [1, last_week]}]) - # if paper_config: - # self.update_lectures(paper_config["lectures"]) - def make_week(self, week_type, start, end=None): end = start if end is None else end return [ @@ -118,22 +76,6 @@ self.mondays[w].day) for w in range(start - 1, end)] - # def teaching_date(self, period, week, offset=0): - # pass - - # def update_weeks(self, week_list): - # for w in week_list: - # for t, r in w.items(): - # if t == "teach": - # self.weeks += self.make_week(TeachingWeek, r[0], r[1]) - # elif t == "break": - # self.weeks += self.make_week(BreakWeek, r[0], r[1]) - # elif t == "iso": - # self.weeks += self.make_week(IsoWeek, r[0], r[1]) - # else: - # print("{prog}: warning: ignored unknown week type " - # "'{type}'.".format(prog=PROG, type=t)) - def generate_period_weeks(self, week_list): weeks = [] for w in week_list: