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

[Events/extra lessons] Improve variable naming and fix typos

parent 7dd1c6b8
No related branches found
No related tags found
1 merge request!120Resolve "Support events and extra lessons in class register"
......@@ -215,7 +215,7 @@ def get_lesson_documentation(
return None
def get_lesson_documentation_simple(
def get_lesson_documentation_single(
self, week: Optional[CalendarWeek] = None
) -> Union[LessonDocumentation, None]:
"""Get lesson documentation object for this event/extra lesson."""
......@@ -224,8 +224,8 @@ def get_lesson_documentation_simple(
return None
Event.method(get_lesson_documentation_simple, "get_lesson_documentation")
ExtraLesson.method(get_lesson_documentation_simple, "get_lesson_documentation")
Event.method(get_lesson_documentation_single, "get_lesson_documentation")
ExtraLesson.method(get_lesson_documentation_single, "get_lesson_documentation")
@LessonPeriod.method
......@@ -235,13 +235,13 @@ def get_or_create_lesson_documentation(
"""Get or create lesson documentation object for this lesson."""
if not week:
week = self.week
lesson_documentation, created = LessonDocumentation.objects.get_or_create(
lesson_documentation, __ = LessonDocumentation.objects.get_or_create(
lesson_period=self, week=week.week, year=week.year
)
return lesson_documentation
def get_or_create_lesson_documentation_simple(
def get_or_create_lesson_documentation_single(
self, week: Optional[CalendarWeek] = None
) -> LessonDocumentation:
"""Get or create lesson documentation object for this event/extra lesson."""
......@@ -249,8 +249,8 @@ def get_or_create_lesson_documentation_simple(
return lesson_documentation
Event.method(get_or_create_lesson_documentation_simple, "get_or_create_lesson_documentation")
ExtraLesson.method(get_or_create_lesson_documentation_simple, "get_or_create_lesson_documentation")
Event.method(get_or_create_lesson_documentation_single, "get_or_create_lesson_documentation")
ExtraLesson.method(get_or_create_lesson_documentation_single, "get_or_create_lesson_documentation")
@LessonPeriod.method
......
......@@ -58,7 +58,7 @@ def get_timetable_instance_by_pk(
def annotate_documentations(
klass: Union[Event, LessonPeriod, ExtraLesson], wanted_week: CalendarWeek, pks: List[int]
) -> QuerySet:
"""Return a annotated queryset of all provided register objects."""
"""Return an annotated queryset of all provided register objects."""
if isinstance(klass, LessonPeriod):
prefetch = Prefetch(
"documentations",
......
......@@ -562,6 +562,7 @@ def full_register_group(request: HttpRequest, id_: int) -> HttpResponse:
documentations = (
LessonDocumentation.objects.select_related("lesson_period").not_empty().filter(groups_q)
)
# Get all lesson periods for the selected group
lesson_periods = LessonPeriod.objects.filter_group(group).distinct()
events = Event.objects.filter_group(group).distinct()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment