diff --git a/aleksis/apps/alsijil/model_extensions.py b/aleksis/apps/alsijil/model_extensions.py index e72e347b3fa8d868e070b7265057f94daabe17fe..862b4222e119c6758c31b190a4e88a2095aafa1b 100644 --- a/aleksis/apps/alsijil/model_extensions.py +++ b/aleksis/apps/alsijil/model_extensions.py @@ -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 diff --git a/aleksis/apps/alsijil/util/alsijil_helpers.py b/aleksis/apps/alsijil/util/alsijil_helpers.py index 31c97fbbeeaf58cf5820b9720c8283b9d9b02d27..f44a90944d8b1e8d6360012b7b818a2f77fd4359 100644 --- a/aleksis/apps/alsijil/util/alsijil_helpers.py +++ b/aleksis/apps/alsijil/util/alsijil_helpers.py @@ -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", diff --git a/aleksis/apps/alsijil/views.py b/aleksis/apps/alsijil/views.py index 53ca6aaa13bfdce0450431b4bc0f6664bdf23192..5c7e9a8e9c31efdc933155ee8f3251c78b17e668 100644 --- a/aleksis/apps/alsijil/views.py +++ b/aleksis/apps/alsijil/views.py @@ -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()