diff --git a/calendar/teachingdates/calendars/basecalendar.py b/calendar/teachingdates/calendars/basecalendar.py index d58f124..98d1cb9 100644 --- a/calendar/teachingdates/calendars/basecalendar.py +++ b/calendar/teachingdates/calendars/basecalendar.py @@ -18,7 +18,6 @@ filters = { "isteaching": lambda w: isinstance(w, TeachingWeek), "isbreak": lambda w: isinstance(w, BreakWeek), - "eow": lambda d, o: d + datetime.timedelta(days=o), "pad": lambda s, n: str(s).rjust(n), "num2words": lambda s: num2words(str(s)).title().replace("-", "") } @@ -64,12 +63,12 @@ self.period_weeks[period] = self.generate_period_weeks( self.config.config[period]["weeks"]) self.calendars[period] = self.generate_calendar(period) - self.period_weeks["ISO"] = self.generate_period_weeks( + self.period_weeks["iso"] = self.generate_period_weeks( [{"iso": [ self.mondays[0].isocalendar()[1], # first ISO week self.mondays[-1].isocalendar()[1] # last ISO week ]}]) - self.calendars["ISO"] = self.generate_calendar("ISO") + self.calendars["iso"] = self.generate_calendar("iso") # print("mondays (__init__): ", self.mondays) # print("period_weeks (__init__): ", self.period_weeks) @@ -218,6 +217,22 @@ loader=jinja2.PackageLoader("teachingdates", "templates"), autoescape=False) env.filters.update(filters) + template = env.get_template( + "{style}.txt.j2".format(style=self.config.style)) + if self.config.style == "lecture": + return template.render( + weeks=self.lecture_dates(), + paper=self.config.paper, + period=self.config.period, + year=self.config.year, + eow_offset=datetime.timedelta(self.config.end_of_week)) + else: + return template.render( + weeks=self.calendars[self.config.period], + paper=self.config.paper, + period=self.config.period, + year=self.config.year, + eow_offset=datetime.timedelta(self.config.end_of_week)) def render_xml(self): env = jinja2.Environment(