diff --git a/aleksis/apps/alsijil/migrations/0004_group_notes.py b/aleksis/apps/alsijil/migrations/0004_group_notes.py index dfe800654e5ce97879d6587c2d908cc14be13c6a..dbbb2edc3770e0edc573d47afbf26c5cd439eb0b 100644 --- a/aleksis/apps/alsijil/migrations/0004_group_notes.py +++ b/aleksis/apps/alsijil/migrations/0004_group_notes.py @@ -6,13 +6,15 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('alsijil', '0003_extra_mark'), + ("alsijil", "0003_extra_mark"), ] operations = [ migrations.AddField( - model_name='lessondocumentation', - name='group_note', - field=models.CharField(blank=True, max_length=200, verbose_name='Group note'), + model_name="lessondocumentation", + name="group_note", + field=models.CharField( + blank=True, max_length=200, verbose_name="Group note" + ), ), ] diff --git a/aleksis/apps/alsijil/models.py b/aleksis/apps/alsijil/models.py index 04f868be69b32d3a35b80373fa900cae64b4b3a7..0f0e72bb864590684c8eab5e90eed5eb5f444546 100644 --- a/aleksis/apps/alsijil/models.py +++ b/aleksis/apps/alsijil/models.py @@ -98,7 +98,9 @@ class LessonDocumentation(ExtensibleModel): topic = models.CharField(verbose_name=_("Lesson topic"), max_length=200, blank=True) homework = models.CharField(verbose_name=_("Homework"), max_length=200, blank=True) - group_note = models.CharField(verbose_name=_("Group note"), max_length=200, blank=True) + group_note = models.CharField( + verbose_name=_("Group note"), max_length=200, blank=True + ) class Meta: verbose_name = _("Lesson documentation") diff --git a/aleksis/apps/alsijil/views.py b/aleksis/apps/alsijil/views.py index 8dbc88536d34e20b4311abce4a8e99548b7a4a41..dda455f5a3632171ff1dc35878db1fef0fcab15e 100644 --- a/aleksis/apps/alsijil/views.py +++ b/aleksis/apps/alsijil/views.py @@ -395,7 +395,11 @@ def full_register_group(request: HttpRequest, id_: int) -> HttpResponse: persons = persons.annotate( **{ extra_mark.count_label: Count( - "personal_notes", filter=Q(personal_notes__extra_marks=extra_mark,personal_notes__lesson_period__lesson__validity__school_term=current_school_term), + "personal_notes", + filter=Q( + personal_notes__extra_marks=extra_mark, + personal_notes__lesson_period__lesson__validity__school_term=current_school_term, + ), ) } )