diff --git a/biscuit/apps/alsijil/urls.py b/biscuit/apps/alsijil/urls.py index 14dad5414ed7c76f8beb58c472dd47d69dcb2f35..e8d4c6b254273d10a1152239d9de3bc9ba0bc260 100644 --- a/biscuit/apps/alsijil/urls.py +++ b/biscuit/apps/alsijil/urls.py @@ -11,5 +11,5 @@ urlpatterns = [ path('week/<int:year>/<int:week>', views.week_view, name='week_view_by_week'), path('print/group/<int:id_>', views.full_register_group, - name='full_register_group') + name='full_register_group') ] diff --git a/biscuit/apps/alsijil/views.py b/biscuit/apps/alsijil/views.py index ce4694ff6e7961efe5bd482e869411ef48685fb5..af7a60e62a9c776fad8341df304ec2ad00daadff 100644 --- a/biscuit/apps/alsijil/views.py +++ b/biscuit/apps/alsijil/views.py @@ -96,12 +96,12 @@ def week_view(request: HttpRequest, year: Optional[int] = None, week: Optional[i wanted_week = CalendarWeek() lesson_periods = LessonPeriod.objects.annotate( - has_documentation=Exists(LessonDocumentation.objects.filter( - ~Q(topic__exact=''), - lesson_period=OuterRef('pk'), - week=wanted_week.week - )) - ).in_week(wanted_week) + has_documentation=Exists(LessonDocumentation.objects.filter( + ~Q(topic__exact=''), + lesson_period=OuterRef('pk'), + week=wanted_week.week + )) + ).in_week(wanted_week) group = None # FIXME workaround for #38 if request.GET.get('group', None) or request.GET.get('teacher', None) or request.GET.get('room', None): @@ -183,15 +183,15 @@ def full_register_group(request: HttpRequest, id_: int) -> HttpResponse: periods_by_day.setdefault(day, []).append((lesson_period, documentations, notes, substitution)) persons = group.members.annotate( - absences=Count('personal_notes__absent', filter=Q( - personal_notes__absent=True - )), - unexcused=Count('personal_notes__absent', filter=Q( - personal_notes__absent=True, - personal_notes__excused=False - )), - tardiness=Sum('personal_notes__late') - ) + absences=Count('personal_notes__absent', filter=Q( + personal_notes__absent=True + )), + unexcused=Count('personal_notes__absent', filter=Q( + personal_notes__absent=True, + personal_notes__excused=False + )), + tardiness=Sum('personal_notes__late') + ) context['persons'] = persons context['group'] = group