From ed8c49e361e48ccb7c049e8e2a39cff52128fe30 Mon Sep 17 00:00:00 2001
From: Jonathan Weth <git@jonathanweth.de>
Date: Tue, 14 Jan 2020 18:06:54 +0100
Subject: [PATCH] Fix var names and add missing import
---
aleksis/apps/chronos/models.py | 22 +++++++++++-----------
aleksis/apps/chronos/util.py | 2 +-
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/aleksis/apps/chronos/models.py b/aleksis/apps/chronos/models.py
index c9759257..a8ee5758 100644
--- a/aleksis/apps/chronos/models.py
+++ b/aleksis/apps/chronos/models.py
@@ -98,11 +98,11 @@ class LessonDataQuerySet(models.QuerySet):
return self.filter(
**{
- self._perdiod_path + "lesson__date_start__lte": now.date(),
- self._perdiod_path + "lesson__date_end__gte": now.date(),
- self._perdiod_path + "period__weekday": now.isoweekday(),
- self._perdiod_path + "period__time_start__lte": now.time(),
- self._perdiod_path + "period__time_end__gte": now.time(),
+ self._period_path + "lesson__date_start__lte": now.date(),
+ self._period_path + "lesson__date_end__gte": now.date(),
+ self._period_path + "period__weekday": now.isoweekday(),
+ self._period_path + "period__time_start__lte": now.time(),
+ self._period_path + "period__time_end__gte": now.time(),
}
).annotate_week(week)
@@ -110,16 +110,16 @@ class LessonDataQuerySet(models.QuerySet):
""" Filter for all lessons a participant (student) attends. """
return self.filter(
- Q(**{self._perdiod_path + "lesson__groups__members": person})
- | Q(**{self._perdiod_path + "lesson__groups__parent_groups__members": person})
+ Q(**{self._period_path + "lesson__groups__members": person})
+ | Q(**{self._period_path + "lesson__groups__parent_groups__members": person})
)
def filter_group(self, group: Union[Group, int]):
""" Filter for all lessons a group (class) regularly attends. """
return self.filter(
- Q(**{self._perdiod_path + "lesson__groups": group})
- | Q(**{self._perdiod_path + "lesson__groups__parent_groups": group})
+ Q(**{self._period_path + "lesson__groups": group})
+ | Q(**{self._period_path + "lesson__groups__parent_groups": group})
)
def filter_teacher(self, teacher: Union[Person, int]):
@@ -127,7 +127,7 @@ class LessonDataQuerySet(models.QuerySet):
return self.filter(
Q(**{self._subst_path + "teachers": teacher, self._subst_path + "week": F("_week"),})
- | Q(**{self._perdiod_path + "lesson__teachers": teacher})
+ | Q(**{self._period_path + "lesson__teachers": teacher})
)
def filter_room(self, room: Union[Room, int]):
@@ -135,7 +135,7 @@ class LessonDataQuerySet(models.QuerySet):
return self.filter(
Q(**{self._subst_path + "room": room, self._subst_path + "week": F("_week"),})
- | Q(**{self._perdiod_path + "room": room})
+ | Q(**{self._period_path + "room": room})
)
def annotate_week(self, week: Union[CalendarWeek, int]):
diff --git a/aleksis/apps/chronos/util.py b/aleksis/apps/chronos/util.py
index 6e49d875..94dba4e2 100644
--- a/aleksis/apps/chronos/util.py
+++ b/aleksis/apps/chronos/util.py
@@ -1,5 +1,5 @@
from datetime import date
-from typing import Tuple, List
+from typing import Tuple, List, Union
from calendarweek import CalendarWeek
--
GitLab