Merge branch '68-add-support-for-group-notes' into 'master'

Resolve "Add support for group notes"

Closes #68

See merge request !65

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)

aleksis/apps/alsijil/migrations/0002_group_notes.py

+# 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'),
+        ),
+    ]

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")

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>

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">