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

Annotate persons in full_register with filtered personal notes. Advances #45, #46.

parent cfab40e6
No related branches found
No related tags found
No related merge requests found
...@@ -16,7 +16,7 @@ from biscuit.core.decorators import admin_required ...@@ -16,7 +16,7 @@ from biscuit.core.decorators import admin_required
from biscuit.core.util import messages from biscuit.core.util import messages
from .forms import RegisterAbsenceFormLessonDocumentationForm, PersonalNoteFormSet, RegisterAbsenceForm, SelectForm from .forms import RegisterAbsenceFormLessonDocumentationForm, PersonalNoteFormSet, RegisterAbsenceForm, SelectForm
from .models import LessonDocumentation from .models import LessonDocumentation, PersonalNoteFilter
@login_required @login_required
...@@ -197,6 +197,16 @@ def full_register_group(request: HttpRequest, id_: int) -> HttpResponse: ...@@ -197,6 +197,16 @@ def full_register_group(request: HttpRequest, id_: int) -> HttpResponse:
tardiness=Sum('personal_notes__late') tardiness=Sum('personal_notes__late')
) )
# FIXME Move to manager
personal_note_filters = PersonalNoteFilter.objects.all()
for personal_note_filter in personal_note_filters:
persons = persons.annotate(
Count(
personal_notes__remarks__iregex=personal_note_filter.regex,
output_field='personal_notes_with_%s' % personal_notes_filter.identifier
)
)
context['persons'] = persons context['persons'] = persons
context['group'] = group context['group'] = group
context['weeks'] = weeks context['weeks'] = weeks
......
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