Skip to content
Snippets Groups Projects
Commit d56d7a62 authored by Nik | Klampfradler's avatar Nik | Klampfradler
Browse files

Merge branch 'fix/full-register-school-term-from-group' into 'master'

[Full register printout] Use school term of group

See merge request !97
parents c94a142a d9b52560
No related branches found
No related tags found
1 merge request!97[Full register printout] Use school term of group
Pipeline #4111 failed
...@@ -384,15 +384,9 @@ def full_register_group(request: HttpRequest, id_: int) -> HttpResponse: ...@@ -384,15 +384,9 @@ def full_register_group(request: HttpRequest, id_: int) -> HttpResponse:
group = get_object_or_404(Group, pk=id_) group = get_object_or_404(Group, pk=id_)
current_school_term = SchoolTerm.current
if not current_school_term:
return HttpResponseNotFound(_("There is no current school term."))
# Get all lesson periods for the selected group # Get all lesson periods for the selected group
lesson_periods = ( lesson_periods = (
LessonPeriod.objects.filter_group(group) LessonPeriod.objects.filter_group(group)
.filter(lesson__validity__school_term=current_school_term)
.distinct() .distinct()
.prefetch_related( .prefetch_related(
"documentations", "documentations",
...@@ -405,7 +399,7 @@ def full_register_group(request: HttpRequest, id_: int) -> HttpResponse: ...@@ -405,7 +399,7 @@ def full_register_group(request: HttpRequest, id_: int) -> HttpResponse:
) )
weeks = CalendarWeek.weeks_within( weeks = CalendarWeek.weeks_within(
current_school_term.date_start, current_school_term.date_end, group.school_term.date_start, group.school_term.date_end,
) )
periods_by_day = {} periods_by_day = {}
...@@ -494,21 +488,7 @@ def full_register_group(request: HttpRequest, id_: int) -> HttpResponse: ...@@ -494,21 +488,7 @@ def full_register_group(request: HttpRequest, id_: int) -> HttpResponse:
} }
) )
for excuse_type in ExcuseType.objects.all(): context["school_term"] = group.school_term
persons = persons.annotate(
**{
excuse_type.count_label: Count(
"personal_notes__absent",
filter=Q(
personal_notes__absent=True,
personal_notes__excuse_type=excuse_type,
personal_notes__lesson_period__lesson__validity__school_term=current_school_term,
),
)
}
)
context["school_term"] = current_school_term
context["persons"] = persons context["persons"] = persons
context["excuse_types"] = ExcuseType.objects.all() context["excuse_types"] = ExcuseType.objects.all()
context["extra_marks"] = ExtraMark.objects.all() context["extra_marks"] = ExtraMark.objects.all()
......
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