Skip to content
Snippets Groups Projects
Verified Commit e11a43dd authored by Jonathan Weth's avatar Jonathan Weth :keyboard:
Browse files

Change some code parts to new weekday index

parent ed8c49e3
Branches
Tags
1 merge request!31Biscuit merge. Closes #53.
...@@ -100,7 +100,7 @@ class LessonDataQuerySet(models.QuerySet): ...@@ -100,7 +100,7 @@ class LessonDataQuerySet(models.QuerySet):
**{ **{
self._period_path + "lesson__date_start__lte": now.date(), self._period_path + "lesson__date_start__lte": now.date(),
self._period_path + "lesson__date_end__gte": now.date(), self._period_path + "lesson__date_end__gte": now.date(),
self._period_path + "period__weekday": now.isoweekday(), self._period_path + "period__weekday": now.weekday(),
self._period_path + "period__time_start__lte": now.time(), self._period_path + "period__time_start__lte": now.time(),
self._period_path + "period__time_end__gte": now.time(), self._period_path + "period__time_end__gte": now.time(),
} }
...@@ -242,7 +242,7 @@ class TimePeriod(models.Model): ...@@ -242,7 +242,7 @@ class TimePeriod(models.Model):
wanted_week = CalendarWeek(year=year, week=week_number) wanted_week = CalendarWeek(year=year, week=week_number)
return wanted_week[self.weekday - 1] return wanted_week[self.weekday]
class Meta: class Meta:
unique_together = [["weekday", "period"]] unique_together = [["weekday", "period"]]
......
...@@ -5,7 +5,7 @@ from calendarweek import CalendarWeek ...@@ -5,7 +5,7 @@ from calendarweek import CalendarWeek
def week_weekday_from_date(when: date) -> Tuple[CalendarWeek, int]: def week_weekday_from_date(when: date) -> Tuple[CalendarWeek, int]:
return (CalendarWeek.from_date(when), when.isoweekday()) return (CalendarWeek.from_date(when), when.weekday())
def week_weekday_to_date(week: CalendarWeek, weekday: int) -> date: def week_weekday_to_date(week: CalendarWeek, weekday: int) -> date:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment