diff --git a/aleksis/apps/alsijil/forms.py b/aleksis/apps/alsijil/forms.py index 88127e98c45d71fbe22ec9572fc04d89891489a7..1ed20e8ef9295c73da7bce6aef38be6583d976f5 100644 --- a/aleksis/apps/alsijil/forms.py +++ b/aleksis/apps/alsijil/forms.py @@ -17,7 +17,7 @@ from .models import ExcuseType, LessonDocumentation, PersonalNote, PersonalNoteF class LessonDocumentationForm(forms.ModelForm): class Meta: model = LessonDocumentation - fields = ["topic", "homework"] + fields = ["topic", "homework", "group_note"] def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) diff --git a/aleksis/apps/alsijil/migrations/0002_group_notes.py b/aleksis/apps/alsijil/migrations/0002_group_notes.py new file mode 100644 index 0000000000000000000000000000000000000000..1bd92e3b3b63824abf63b2b5b32b4dc9c5308946 --- /dev/null +++ b/aleksis/apps/alsijil/migrations/0002_group_notes.py @@ -0,0 +1,18 @@ +# Generated by Django 3.0.8 on 2020-07-10 16:16 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('alsijil', '0001_initial'), + ] + + operations = [ + migrations.AddField( + 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 d10243b0deabba12b49d4b3d28211be925f80f79..b8491bf6dcd3def3c8bb399fbc4e9721171db274 100644 --- a/aleksis/apps/alsijil/models.py +++ b/aleksis/apps/alsijil/models.py @@ -93,6 +93,7 @@ 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) class Meta: verbose_name = _("Lesson documentation") diff --git a/aleksis/apps/alsijil/templates/alsijil/class_register/lesson.html b/aleksis/apps/alsijil/templates/alsijil/class_register/lesson.html index 6545bf9c3a79d8ab1efaf8e7544c30451bc4b508..b2914f2bf5f841875d7d6a413af75d4d7a8d4866 100644 --- a/aleksis/apps/alsijil/templates/alsijil/class_register/lesson.html +++ b/aleksis/apps/alsijil/templates/alsijil/class_register/lesson.html @@ -86,6 +86,13 @@ </tr> {% endif %} + {% if prev_doc.group_note %} + <tr> + <th class="collection-item">{% trans "Group notes for previous lesson:" %}</th> + <td>{{ prev_doc.group_note }}</td> + </tr> + {% endif %} + {% if absences %} <tr> <th>{% trans "Absent persons:" %}</th> diff --git a/aleksis/apps/alsijil/templates/alsijil/print/full_register.html b/aleksis/apps/alsijil/templates/alsijil/print/full_register.html index 8cd9938b62e4bd39c0feead34b46fe4360987ec0..432f8e655a3026a3faa8518e472eeb9152a94d8f 100644 --- a/aleksis/apps/alsijil/templates/alsijil/print/full_register.html +++ b/aleksis/apps/alsijil/templates/alsijil/print/full_register.html @@ -396,6 +396,7 @@ </td> <td class="lesson-homework">{{ documentations.0.homework }}</td> <td class="lesson-notes"> + {{ documentations.0.group_note }} {% for note in notes %} {% if note.absent %} <span class="lesson-note-absent">