Compare revisions

Tom Teichler · Tom Teichler · Jonathan Weth · Jonathan Weth · Jonathan Weth · Jonathan Weth
--- a/.gitignore
+++ b/.gitignore
@@ -53,3 +53,6 @@ db.sqlite3

 # Sphinx
 docs/_build/
+
+# Test
+.tox/
--- a/aleksis/apps/alsijil/forms.py
+++ b/aleksis/apps/alsijil/forms.py
@@ -11,13 +11,13 @@ from material import Layout, Row
 from aleksis.apps.chronos.managers import TimetableType
 from aleksis.core.models import Group, Person

-from .models import ExcuseType, LessonDocumentation, PersonalNote, PersonalNoteFilter
+from .models import ExcuseType, ExtraMark, LessonDocumentation, PersonalNote


 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)
@@ -28,7 +28,7 @@ class LessonDocumentationForm(forms.ModelForm):
 class PersonalNoteForm(forms.ModelForm):
    class Meta:
        model = PersonalNote
-        fields = ["absent", "late", "excused", "excuse_type", "remarks"]
+        fields = ["absent", "late", "excused", "excuse_type", "extra_marks", "remarks"]

    person_name = forms.CharField(disabled=True)

@@ -109,12 +109,12 @@ class RegisterAbsenceForm(forms.Form):
    remarks = forms.CharField(label=_("Remarks"), max_length=30, required=False)


-class PersonalNoteFilterForm(forms.ModelForm):
-    layout = Layout(Row("identifier", "description"), Row("regex"))
+class ExtraMarkForm(forms.ModelForm):
+    layout = Layout("short_name", "name")

    class Meta:
-        model = PersonalNoteFilter
-        fields = ["identifier", "description", "regex"]
+        model = ExtraMark
+        fields = ["short_name", "name"]


 class ExcuseTypeForm(forms.ModelForm):

--- a/aleksis/apps/alsijil/locale/ar/LC_MESSAGES/django.po
+++ b/aleksis/apps/alsijil/locale/ar/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-01 13:20+0200\n"
+"POT-Creation-Date: 2020-07-26 16:10+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,49 +16,57 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
-"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"

-#: forms.py:41
+#: forms.py:25
+msgid "Homework for the next lesson"
+msgstr ""
+
+#: forms.py:50 templates/alsijil/print/full_register.html:181
 msgid "Group"
 msgstr ""

-#: forms.py:49 templates/alsijil/print/full_register.html:101
+#: forms.py:56 templates/alsijil/print/full_register.html:152
+#: templates/alsijil/print/full_register.html:183
 msgid "Teacher"
 msgstr ""

-#: forms.py:57
-msgid "Room"
+#: forms.py:73
+msgid "You can't select a group and a teacher both."
 msgstr ""

-#: forms.py:70
+#: forms.py:101
 msgid "Start date"
 msgstr ""

-#: forms.py:73
+#: forms.py:102
 msgid "End date"
 msgstr ""

-#: forms.py:75
+#: forms.py:103
 msgid "From period"
 msgstr ""

-#: forms.py:77 templates/alsijil/lesson.html:58
+#: forms.py:105 templates/alsijil/class_register/lesson.html:150
 msgid "Person"
 msgstr ""

-#: forms.py:79 templates/alsijil/lesson.html:59
-#: templates/alsijil/print/full_register.html:223
-#: templates/alsijil/week_view.html:96
+#: forms.py:107 templates/alsijil/class_register/lesson.html:151
+#: templates/alsijil/class_register/week_view.html:93
+#: templates/alsijil/print/full_register.html:75
+#: templates/alsijil/print/full_register.html:305
 msgid "Absent"
 msgstr ""

-#: forms.py:80 templates/alsijil/lesson.html:61
+#: forms.py:108 templates/alsijil/class_register/lesson.html:153
+#: templates/alsijil/print/full_register.html:84
+#: templates/alsijil/print/full_register.html:280
 msgid "Excused"
 msgstr ""

-#: forms.py:81 templates/alsijil/lesson.html:62
-#: templates/alsijil/print/full_register.html:225
+#: forms.py:109 templates/alsijil/class_register/lesson.html:155
+#: templates/alsijil/class_register/lesson.html:195
+#: templates/alsijil/print/full_register.html:307
 msgid "Remarks"
 msgstr ""

@@ -78,306 +86,491 @@ msgstr ""
 msgid "Register absence"
 msgstr ""

-#: menus.py:34
+#: menus.py:34 models.py:129 templates/alsijil/personal_note_filter/list.html:8
 msgid "Personal note filters"
 msgstr ""

-#: models.py:51 templates/alsijil/print/full_register.html:271
+#: menus.py:40 models.py:32 templates/alsijil/excuse_type/list.html:8
+#: templates/alsijil/excuse_type/list.html:9
+msgid "Excuse types"
+msgstr ""
+
+#: models.py:18
+msgid "Short name"
+msgstr ""
+
+#: models.py:20
+msgid "Name"
+msgstr ""
+
+#: models.py:31 models.py:59 templates/alsijil/class_register/lesson.html:154
+#: templates/alsijil/class_register/lesson.html:187
+msgid "Excuse type"
+msgstr ""
+
+#: models.py:70
+msgid "Personal note"
+msgstr ""
+
+#: models.py:71 templates/alsijil/class_register/lesson.html:143
+#: templates/alsijil/class_register/week_view.html:88
+msgid "Personal notes"
+msgstr ""
+
+#: models.py:94 templates/alsijil/print/full_register.html:357
 msgid "Lesson topic"
 msgstr ""

-#: models.py:52 templates/alsijil/print/full_register.html:272
+#: models.py:95 templates/alsijil/print/full_register.html:358
 msgid "Homework"
 msgstr ""

-#: models.py:68
+#: models.py:96
+msgid "Group note"
+msgstr ""
+
+#: models.py:99 templates/alsijil/class_register/lesson.html:119
+msgid "Lesson documentation"
+msgstr ""
+
+#: models.py:100
+msgid "Lesson documentations"
+msgstr ""
+
+#: models.py:114
 msgid "Identifier"
 msgstr ""

-#: models.py:71 templates/alsijil/print/full_register.html:178
+#: models.py:120 templates/alsijil/print/full_register.html:253
 msgid "Description"
 msgstr ""

-#: models.py:74
+#: models.py:124
 msgid "Match expression"
 msgstr ""

-#: tables.py:14
+#: models.py:128
+msgid "Personal note filter"
+msgstr ""
+
+#: tables.py:17 tables.py:31
 msgid "Edit"
 msgstr ""

-#: templates/alsijil/lesson.html:5
+#: tables.py:37
+msgid "Delete"
+msgstr ""
+
+#: templates/alsijil/absences/register.html:5
+#: templates/alsijil/absences/register.html:6
+msgid "Manage absence"
+msgstr ""
+
+#: templates/alsijil/class_register/lesson.html:6
 msgid "Lesson"
 msgstr ""

-#: templates/alsijil/lesson.html:34
-msgid "Lesson documentation"
+#: templates/alsijil/class_register/lesson.html:14
+#: templates/alsijil/class_register/lesson.html:71
+#, python-format
+msgid "%(period)s. period"
 msgstr ""

-#: templates/alsijil/lesson.html:43
-msgid "Change history"
+#: templates/alsijil/class_register/lesson.html:38
+msgid "Previous lesson"
 msgstr ""

-#: templates/alsijil/lesson.html:52 templates/alsijil/week_view.html:91
-msgid "Personal notes"
+#: templates/alsijil/class_register/lesson.html:46
+msgid "Next lesson"
+msgstr ""
+
+#: templates/alsijil/class_register/lesson.html:70
+msgid "Overview: Previous lesson"
+msgstr ""
+
+#: templates/alsijil/class_register/lesson.html:77
+msgid "Lesson topic of previous lesson:"
+msgstr ""
+
+#: templates/alsijil/class_register/lesson.html:84
+msgid "Homework for this lesson:"
+msgstr ""
+
+#: templates/alsijil/class_register/lesson.html:91
+msgid "Group notes for previous lesson:"
+msgstr ""
+
+#: templates/alsijil/class_register/lesson.html:98
+msgid "Absent persons:"
+msgstr ""
+
+#: templates/alsijil/class_register/lesson.html:105
+msgid "Late persons:"
 msgstr ""

-#: templates/alsijil/lesson.html:60
-#: templates/alsijil/print/full_register.html:202
+#: templates/alsijil/class_register/lesson.html:130
+msgid "Change history"
+msgstr ""
+
+#: templates/alsijil/class_register/lesson.html:152
+#: templates/alsijil/print/full_register.html:292
 msgid "Tardiness"
 msgstr ""

-#: templates/alsijil/manage_personal_note_filter.html:5
-#: templates/alsijil/manage_personal_note_filter.html:6
-msgid "Manage personal note filter"
+#: templates/alsijil/class_register/lesson.html:173
+msgid "Tardiness (in m)"
 msgstr ""

-#: templates/alsijil/manage_personal_note_filter.html:11
-msgid "Delete filter"
+#: templates/alsijil/class_register/week_view.html:6
+msgid "Week view"
+msgstr ""
+
+#: templates/alsijil/class_register/week_view.html:27
+msgid "Select"
+msgstr ""
+
+#: templates/alsijil/class_register/week_view.html:33
+#, python-format
+msgid "CW %(week)s: %(instance)s"
+msgstr ""
+
+#: templates/alsijil/class_register/week_view.html:50
+msgid "Period"
+msgstr ""
+
+#: templates/alsijil/class_register/week_view.html:51
+#: templates/alsijil/print/full_register.html:151
+#: templates/alsijil/print/full_register.html:182
+msgid "Subject"
+msgstr ""
+
+#: templates/alsijil/class_register/week_view.html:52
+msgid "Teachers"
+msgstr ""
+
+#: templates/alsijil/class_register/week_view.html:94
+msgid "unexcused"
+msgstr ""
+
+#: templates/alsijil/class_register/week_view.html:97
+msgid "Summed up tardiness"
+msgstr ""
+
+#: templates/alsijil/class_register/week_view.html:121
+msgid "No lessons available"
+msgstr ""
+
+#: templates/alsijil/class_register/week_view.html:124
+msgid ""
+"\n"
+"            There are no lessons for the selected group or teacher in this week.\n"
+"          "
+msgstr ""
+
+#: templates/alsijil/excuse_type/create.html:6
+#: templates/alsijil/excuse_type/create.html:7
+#: templates/alsijil/excuse_type/list.html:16
+msgid "Create excuse type"
+msgstr ""
+
+#: templates/alsijil/excuse_type/edit.html:6
+#: templates/alsijil/excuse_type/edit.html:7
+msgid "Edit excuse type"
+msgstr ""
+
+#: templates/alsijil/excuse_type/warning.html:5
+msgid ""
+"\n"
+"      This function should only be used to define alternatives to the default excuse which also will be counted extra.\n"
+"      Don't use this to create a default excuse or if you don't divide between different types of excuse.\n"
+"    "
+msgstr ""
+
+#: templates/alsijil/partials/absences.html:4
+#: templates/alsijil/print/full_register.html:114
+msgid "(e)"
+msgstr ""
+
+#: templates/alsijil/partials/absences.html:4
+#: templates/alsijil/print/full_register.html:118
+msgid "(u)"
+msgstr ""
+
+#: templates/alsijil/partials/lesson_status_icon.html:6
+msgid "Data complete"
 msgstr ""

-#: templates/alsijil/personal_note_filters.html:7
-#: templates/alsijil/personal_note_filters.html:8
-msgid "List of all personal note filters"
+#: templates/alsijil/partials/lesson_status_icon.html:12
+msgid "Missing data"
 msgstr ""

-#: templates/alsijil/personal_note_filters.html:12
+#: templates/alsijil/partials/lesson_status_icon.html:14
+msgid "Pending"
+msgstr ""
+
+#: templates/alsijil/partials/lesson_status_icon.html:18
+#: templates/alsijil/print/full_register.html:392
+msgid "Lesson cancelled"
+msgstr ""
+
+#: templates/alsijil/partials/lesson_status_icon.html:20
+msgid "Substitution"
+msgstr ""
+
+#: templates/alsijil/personal_note_filter/list.html:7
+msgid "All personal note filters"
+msgstr ""
+
+#: templates/alsijil/personal_note_filter/list.html:12
 msgid "Add filter"
 msgstr ""

-#: templates/alsijil/print/full_register.html:22
-#: templates/alsijil/print/full_register.html:54
-msgid "Owners"
+#: templates/alsijil/personal_note_filter/manage.html:7
+#: templates/alsijil/personal_note_filter/manage.html:14
+msgid "Update personal note filter"
+msgstr ""
+
+#: templates/alsijil/personal_note_filter/manage.html:9
+#: templates/alsijil/personal_note_filter/manage.html:16
+msgid "Create personal note filter"
+msgstr ""
+
+#: templates/alsijil/personal_note_filter/manage.html:29
+msgid "Delete filter"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:6
+msgid "Class register:"
 msgstr ""

 #: templates/alsijil/print/full_register.html:26
+#: templates/alsijil/print/full_register.html:59
+msgid "Owners"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:30
 msgid "Printed on"
 msgstr ""

-#: templates/alsijil/print/full_register.html:34
+#: templates/alsijil/print/full_register.html:38
 msgid ""
 "\n"
-"            This printout is intended for archival purposes. The main copy "
-"of\n"
-"            the class register is stored in the AlekSIS School Information\n"
-"            System.\n"
-"          "
+"        This printout is intended for archival purposes. The main copy of\n"
+"        the class register is stored in the AlekSIS School Information\n"
+"        System.\n"
+"      "
 msgstr ""

-#: templates/alsijil/print/full_register.html:41
+#: templates/alsijil/print/full_register.html:45
 msgid ""
 "\n"
-"            Copies of the class register, both digital and as printout, "
-"must\n"
-"            only be kept inside the school and/or on devices authorised by "
-"the\n"
-"            school.\n"
-"          "
+"        Copies of the class register, both digital and as printout, must\n"
+"        only be kept inside the school and/or on devices authorised by the\n"
+"        school.\n"
+"      "
 msgstr ""

-#: templates/alsijil/print/full_register.html:48
+#: templates/alsijil/print/full_register.html:52
 msgid ""
 "\n"
-"            The owner of the group and the headteacher confirm the above, "
-"as\n"
-"            well as the correctness of this printout.\n"
-"          "
+"        The owner of the group and the headteacher confirm the above, as\n"
+"        well as the correctness of this printout.\n"
+"      "
 msgstr ""

-#: templates/alsijil/print/full_register.html:55
+#: templates/alsijil/print/full_register.html:62
 msgid "Headteacher"
 msgstr ""

-#: templates/alsijil/print/full_register.html:61
+#: templates/alsijil/print/full_register.html:69
+msgid "Abbreviations"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:71
+msgid "General"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:78
+msgid "Late"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:81
+#: templates/alsijil/print/full_register.html:288
+msgid "Unexcused"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:89
+msgid "Custom excuse types"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:103
 msgid "Persons in group"
 msgstr ""

-#: templates/alsijil/print/full_register.html:66
+#: templates/alsijil/print/full_register.html:108
 msgid "No."
 msgstr ""

-#: templates/alsijil/print/full_register.html:67
+#: templates/alsijil/print/full_register.html:109
 msgid "Last name"
 msgstr ""

-#: templates/alsijil/print/full_register.html:68
+#: templates/alsijil/print/full_register.html:110
 msgid "First name"
 msgstr ""

-#: templates/alsijil/print/full_register.html:69
+#: templates/alsijil/print/full_register.html:111
 msgid "Sex"
 msgstr ""

-#: templates/alsijil/print/full_register.html:70
+#: templates/alsijil/print/full_register.html:112
 msgid "Date of birth"
 msgstr ""

-#: templates/alsijil/print/full_register.html:71
-#: templates/alsijil/print/full_register.html:200
-msgid "Absences"
+#: templates/alsijil/print/full_register.html:113
+msgid "(a)"
 msgstr ""

-#: templates/alsijil/print/full_register.html:72
-#: templates/alsijil/print/full_register.html:201
-msgid "Unexcused"
+#: templates/alsijil/print/full_register.html:119
+msgid "(b)"
 msgstr ""

-#: templates/alsijil/print/full_register.html:73
-#: templates/alsijil/print/full_register.html:224
-msgid "Tard."
-msgstr ""
-
-#: templates/alsijil/print/full_register.html:95
+#: templates/alsijil/print/full_register.html:146
 msgid "Teachers and lessons in group"
 msgstr ""

-#: templates/alsijil/print/full_register.html:100
-#: templates/alsijil/week_view.html:48
-msgid "Subject"
-msgstr ""
-
-#: templates/alsijil/print/full_register.html:102
+#: templates/alsijil/print/full_register.html:153
+#: templates/alsijil/print/full_register.html:184
 msgid "Lesson start"
 msgstr ""

-#: templates/alsijil/print/full_register.html:103
+#: templates/alsijil/print/full_register.html:154
+#: templates/alsijil/print/full_register.html:185
 msgid "Lesson end"
 msgstr ""

-#: templates/alsijil/print/full_register.html:104
+#: templates/alsijil/print/full_register.html:155
+#: templates/alsijil/print/full_register.html:186
 msgid "Per week"
 msgstr ""

-#: templates/alsijil/print/full_register.html:124
+#: templates/alsijil/print/full_register.html:176
+msgid "Teachers and lessons in child groups"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:209
 msgid "Personal overview"
 msgstr ""

-#: templates/alsijil/print/full_register.html:126
+#: templates/alsijil/print/full_register.html:211
 msgid "Contact details"
 msgstr ""

-#: templates/alsijil/print/full_register.html:174
+#: templates/alsijil/print/full_register.html:249
 msgid "Statistics on remarks"
 msgstr ""

-#: templates/alsijil/print/full_register.html:179
+#: templates/alsijil/print/full_register.html:254
 msgid "Count"
 msgstr ""

-#: templates/alsijil/print/full_register.html:196
+#: templates/alsijil/print/full_register.html:271
 msgid "Absences and tardiness"
 msgstr ""

-#: templates/alsijil/print/full_register.html:215
+#: templates/alsijil/print/full_register.html:274
+msgid "Absences"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:279
+msgid "thereof"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:297
 msgid "Relevant personal notes"
 msgstr ""

-#: templates/alsijil/print/full_register.html:219
+#: templates/alsijil/print/full_register.html:301
 msgid "Date"
 msgstr ""

-#: templates/alsijil/print/full_register.html:220
-#: templates/alsijil/print/full_register.html:268
+#: templates/alsijil/print/full_register.html:302
+#: templates/alsijil/print/full_register.html:355
 msgid "Pe."
 msgstr ""

-#: templates/alsijil/print/full_register.html:221
-#: templates/alsijil/print/full_register.html:269
+#: templates/alsijil/print/full_register.html:303
+#: templates/alsijil/print/full_register.html:356
 msgid "Subj."
 msgstr ""

-#: templates/alsijil/print/full_register.html:222
-#: templates/alsijil/print/full_register.html:274
+#: templates/alsijil/print/full_register.html:304
+#: templates/alsijil/print/full_register.html:360
 msgid "Te."
 msgstr ""

-#: templates/alsijil/print/full_register.html:240
-msgid "Yes"
+#: templates/alsijil/print/full_register.html:306
+msgid "Tard."
 msgstr ""

-#: templates/alsijil/print/full_register.html:242
-#: templates/alsijil/print/full_register.html:314
-#: templates/alsijil/print/full_register.html:324
-msgid "e"
+#: templates/alsijil/print/full_register.html:322
+msgid "Yes"
 msgstr ""

-#: templates/alsijil/print/full_register.html:262
-msgid "Lesson documentation for calendar week"
+#: templates/alsijil/print/full_register.html:327
+#: templates/alsijil/print/full_register.html:409
+#: templates/alsijil/print/full_register.html:424
+msgid "e"
 msgstr ""

-#: templates/alsijil/print/full_register.html:270
-msgid "Subs."
+#: templates/alsijil/print/full_register.html:349
+msgid "Lesson documentation for week"
 msgstr ""

-#: templates/alsijil/print/full_register.html:273
+#: templates/alsijil/print/full_register.html:359
 msgid "Notes"
 msgstr ""

-#: templates/alsijil/print/full_register.html:301
-msgid "Lesson cancelled"
+#: views.py:66
+msgid "You either selected an invalid lesson or there is currently no lesson in progress."
 msgstr ""

-#: templates/alsijil/register_absence.html:5
-#: templates/alsijil/register_absence.html:6
-msgid "Manage absence"
+#: views.py:80
+msgid "You are not allowed to create a lesson documentation for a lesson in the future."
 msgstr ""

-#: templates/alsijil/week_view.html:6
-msgid "Week view"
+#: views.py:106
+msgid "The lesson documentation has been saved."
 msgstr ""

-#: templates/alsijil/week_view.html:21
-msgid "Select"
+#: views.py:121
+msgid "The personal notes have been saved."
 msgstr ""

-#: templates/alsijil/week_view.html:47
-msgid "Period"
+#: views.py:303
+msgid "There is no current school term."
 msgstr ""

-#: templates/alsijil/week_view.html:49
-msgid "Teachers"
-msgstr ""
-
-#: templates/alsijil/week_view.html:97
-msgid "unexcused"
-msgstr ""
-
-#: templates/alsijil/week_view.html:100
-msgid "Summed up tardiness"
-msgstr ""
-
-#: templates/alsijil/week_view.html:122
-msgid "No group selected"
-msgstr ""
-
-#: templates/alsijil/week_view.html:125
-msgid ""
-"\n"
-"            There are no lessons for the selected group, teacher, room or "
-"time.\n"
-"          "
+#: views.py:419
+msgid "The absence has been saved."
 msgstr ""

-#: views.py:56
-msgid ""
-"You either selected an invalid lesson or there is currently no lesson in "
-"progress."
+#: views.py:459
+msgid "The filter has been saved"
 msgstr ""

-#: views.py:68
-msgid ""
-"You are not allowed to create a lesson documentation for a lesson in the "
-"future."
+#: views.py:474
+msgid "The filter has been deleted."
 msgstr ""

-#: views.py:306
-msgid "The absence has been saved."
+#: views.py:497
+msgid "The excuse type has been created."
 msgstr ""

-#: views.py:344
-msgid "The filter has been saved"
+#: views.py:508
+msgid "The excuse type has been saved."
 msgstr ""

-#: views.py:360
-msgid "The filter has been deleted."
+#: views.py:518
+msgid "The excuse type has been deleted."
 msgstr ""
--- a/aleksis/apps/alsijil/locale/de_DE/LC_MESSAGES/django.po
+++ b/aleksis/apps/alsijil/locale/de_DE/LC_MESSAGES/django.po
--- a/aleksis/apps/alsijil/locale/fr/LC_MESSAGES/django.po
+++ b/aleksis/apps/alsijil/locale/fr/LC_MESSAGES/django.po
--- a/aleksis/apps/alsijil/locale/la/LC_MESSAGES/django.po
+++ b/aleksis/apps/alsijil/locale/la/LC_MESSAGES/django.po
@@ -3,60 +3,70 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-01 13:20+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"POT-Creation-Date: 2020-07-26 16:10+0200\n"
+"PO-Revision-Date: 2020-07-26 14:08+0000\n"
+"Last-Translator: Julian <leuckerj@gmail.com>\n"
+"Language-Team: Latin <https://translate.edugit.org/projects/aleksis/aleksis-app-alsijil/la/>\n"
+"Language: la\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.0.1\n"

-#: forms.py:41
-msgid "Group"
+#: forms.py:25
+msgid "Homework for the next lesson"
 msgstr ""

-#: forms.py:49 templates/alsijil/print/full_register.html:101
+#: forms.py:50 templates/alsijil/print/full_register.html:181
+msgid "Group"
+msgstr "Grex"
+
+#: forms.py:56 templates/alsijil/print/full_register.html:152
+#: templates/alsijil/print/full_register.html:183
 msgid "Teacher"
 msgstr ""

-#: forms.py:57
-msgid "Room"
+#: forms.py:73
+msgid "You can't select a group and a teacher both."
 msgstr ""

-#: forms.py:70
+#: forms.py:101
 msgid "Start date"
 msgstr ""

-#: forms.py:73
+#: forms.py:102
 msgid "End date"
 msgstr ""

-#: forms.py:75
+#: forms.py:103
 msgid "From period"
 msgstr ""

-#: forms.py:77 templates/alsijil/lesson.html:58
+#: forms.py:105 templates/alsijil/class_register/lesson.html:150
 msgid "Person"
-msgstr ""
+msgstr "Persona"

-#: forms.py:79 templates/alsijil/lesson.html:59
-#: templates/alsijil/print/full_register.html:223
-#: templates/alsijil/week_view.html:96
+#: forms.py:107 templates/alsijil/class_register/lesson.html:151
+#: templates/alsijil/class_register/week_view.html:93
+#: templates/alsijil/print/full_register.html:75
+#: templates/alsijil/print/full_register.html:305
 msgid "Absent"
 msgstr ""

-#: forms.py:80 templates/alsijil/lesson.html:61
+#: forms.py:108 templates/alsijil/class_register/lesson.html:153
+#: templates/alsijil/print/full_register.html:84
+#: templates/alsijil/print/full_register.html:280
 msgid "Excused"
 msgstr ""

-#: forms.py:81 templates/alsijil/lesson.html:62
-#: templates/alsijil/print/full_register.html:225
+#: forms.py:109 templates/alsijil/class_register/lesson.html:155
+#: templates/alsijil/class_register/lesson.html:195
+#: templates/alsijil/print/full_register.html:307
 msgid "Remarks"
 msgstr ""

@@ -76,306 +86,497 @@ msgstr ""
 msgid "Register absence"
 msgstr ""

-#: menus.py:34
+#: menus.py:34 models.py:129 templates/alsijil/personal_note_filter/list.html:8
 msgid "Personal note filters"
 msgstr ""

-#: models.py:51 templates/alsijil/print/full_register.html:271
+#: menus.py:40 models.py:32 templates/alsijil/excuse_type/list.html:8
+#: templates/alsijil/excuse_type/list.html:9
+msgid "Excuse types"
+msgstr ""
+
+#: models.py:18
+#, fuzzy
+#| msgid "First name"
+msgid "Short name"
+msgstr "Primus nomen"
+
+#: models.py:20
+msgid "Name"
+msgstr ""
+
+#: models.py:31 models.py:59 templates/alsijil/class_register/lesson.html:154
+#: templates/alsijil/class_register/lesson.html:187
+msgid "Excuse type"
+msgstr ""
+
+#: models.py:70
+#, fuzzy
+#| msgid "Person"
+msgid "Personal note"
+msgstr "Persona"
+
+#: models.py:71 templates/alsijil/class_register/lesson.html:143
+#: templates/alsijil/class_register/week_view.html:88
+msgid "Personal notes"
+msgstr ""
+
+#: models.py:94 templates/alsijil/print/full_register.html:357
 msgid "Lesson topic"
 msgstr ""

-#: models.py:52 templates/alsijil/print/full_register.html:272
+#: models.py:95 templates/alsijil/print/full_register.html:358
 msgid "Homework"
 msgstr ""

-#: models.py:68
+#: models.py:96
+#, fuzzy
+#| msgid "Group"
+msgid "Group note"
+msgstr "Grex"
+
+#: models.py:99 templates/alsijil/class_register/lesson.html:119
+msgid "Lesson documentation"
+msgstr ""
+
+#: models.py:100
+msgid "Lesson documentations"
+msgstr ""
+
+#: models.py:114
 msgid "Identifier"
 msgstr ""

-#: models.py:71 templates/alsijil/print/full_register.html:178
+#: models.py:120 templates/alsijil/print/full_register.html:253
 msgid "Description"
-msgstr ""
+msgstr "Descriptio"

-#: models.py:74
+#: models.py:124
 msgid "Match expression"
 msgstr ""

-#: tables.py:14
+#: models.py:128
+msgid "Personal note filter"
+msgstr ""
+
+#: tables.py:17 tables.py:31
 msgid "Edit"
 msgstr ""

-#: templates/alsijil/lesson.html:5
+#: tables.py:37
+msgid "Delete"
+msgstr ""
+
+#: templates/alsijil/absences/register.html:5
+#: templates/alsijil/absences/register.html:6
+msgid "Manage absence"
+msgstr ""
+
+#: templates/alsijil/class_register/lesson.html:6
 msgid "Lesson"
 msgstr ""

-#: templates/alsijil/lesson.html:34
-msgid "Lesson documentation"
+#: templates/alsijil/class_register/lesson.html:14
+#: templates/alsijil/class_register/lesson.html:71
+#, python-format
+msgid "%(period)s. period"
 msgstr ""

-#: templates/alsijil/lesson.html:43
-msgid "Change history"
+#: templates/alsijil/class_register/lesson.html:38
+msgid "Previous lesson"
 msgstr ""

-#: templates/alsijil/lesson.html:52 templates/alsijil/week_view.html:91
-msgid "Personal notes"
+#: templates/alsijil/class_register/lesson.html:46
+msgid "Next lesson"
+msgstr ""
+
+#: templates/alsijil/class_register/lesson.html:70
+msgid "Overview: Previous lesson"
+msgstr ""
+
+#: templates/alsijil/class_register/lesson.html:77
+msgid "Lesson topic of previous lesson:"
+msgstr ""
+
+#: templates/alsijil/class_register/lesson.html:84
+msgid "Homework for this lesson:"
+msgstr ""
+
+#: templates/alsijil/class_register/lesson.html:91
+msgid "Group notes for previous lesson:"
+msgstr ""
+
+#: templates/alsijil/class_register/lesson.html:98
+msgid "Absent persons:"
 msgstr ""

-#: templates/alsijil/lesson.html:60
-#: templates/alsijil/print/full_register.html:202
+#: templates/alsijil/class_register/lesson.html:105
+msgid "Late persons:"
+msgstr ""
+
+#: templates/alsijil/class_register/lesson.html:130
+msgid "Change history"
+msgstr ""
+
+#: templates/alsijil/class_register/lesson.html:152
+#: templates/alsijil/print/full_register.html:292
 msgid "Tardiness"
 msgstr ""

-#: templates/alsijil/manage_personal_note_filter.html:5
-#: templates/alsijil/manage_personal_note_filter.html:6
-msgid "Manage personal note filter"
+#: templates/alsijil/class_register/lesson.html:173
+msgid "Tardiness (in m)"
 msgstr ""

-#: templates/alsijil/manage_personal_note_filter.html:11
-msgid "Delete filter"
+#: templates/alsijil/class_register/week_view.html:6
+msgid "Week view"
+msgstr ""
+
+#: templates/alsijil/class_register/week_view.html:27
+msgid "Select"
+msgstr ""
+
+#: templates/alsijil/class_register/week_view.html:33
+#, python-format
+msgid "CW %(week)s: %(instance)s"
+msgstr ""
+
+#: templates/alsijil/class_register/week_view.html:50
+msgid "Period"
+msgstr ""
+
+#: templates/alsijil/class_register/week_view.html:51
+#: templates/alsijil/print/full_register.html:151
+#: templates/alsijil/print/full_register.html:182
+msgid "Subject"
+msgstr ""
+
+#: templates/alsijil/class_register/week_view.html:52
+msgid "Teachers"
+msgstr ""
+
+#: templates/alsijil/class_register/week_view.html:94
+msgid "unexcused"
+msgstr ""
+
+#: templates/alsijil/class_register/week_view.html:97
+msgid "Summed up tardiness"
+msgstr ""
+
+#: templates/alsijil/class_register/week_view.html:121
+msgid "No lessons available"
+msgstr ""
+
+#: templates/alsijil/class_register/week_view.html:124
+msgid ""
+"\n"
+"            There are no lessons for the selected group or teacher in this week.\n"
+"          "
+msgstr ""
+
+#: templates/alsijil/excuse_type/create.html:6
+#: templates/alsijil/excuse_type/create.html:7
+#: templates/alsijil/excuse_type/list.html:16
+msgid "Create excuse type"
+msgstr ""
+
+#: templates/alsijil/excuse_type/edit.html:6
+#: templates/alsijil/excuse_type/edit.html:7
+msgid "Edit excuse type"
+msgstr ""
+
+#: templates/alsijil/excuse_type/warning.html:5
+msgid ""
+"\n"
+"      This function should only be used to define alternatives to the default excuse which also will be counted extra.\n"
+"      Don't use this to create a default excuse or if you don't divide between different types of excuse.\n"
+"    "
+msgstr ""
+
+#: templates/alsijil/partials/absences.html:4
+#: templates/alsijil/print/full_register.html:114
+msgid "(e)"
+msgstr ""
+
+#: templates/alsijil/partials/absences.html:4
+#: templates/alsijil/print/full_register.html:118
+msgid "(u)"
+msgstr ""
+
+#: templates/alsijil/partials/lesson_status_icon.html:6
+msgid "Data complete"
 msgstr ""

-#: templates/alsijil/personal_note_filters.html:7
-#: templates/alsijil/personal_note_filters.html:8
-msgid "List of all personal note filters"
+#: templates/alsijil/partials/lesson_status_icon.html:12
+msgid "Missing data"
 msgstr ""

-#: templates/alsijil/personal_note_filters.html:12
+#: templates/alsijil/partials/lesson_status_icon.html:14
+msgid "Pending"
+msgstr ""
+
+#: templates/alsijil/partials/lesson_status_icon.html:18
+#: templates/alsijil/print/full_register.html:392
+msgid "Lesson cancelled"
+msgstr ""
+
+#: templates/alsijil/partials/lesson_status_icon.html:20
+msgid "Substitution"
+msgstr ""
+
+#: templates/alsijil/personal_note_filter/list.html:7
+msgid "All personal note filters"
+msgstr ""
+
+#: templates/alsijil/personal_note_filter/list.html:12
 msgid "Add filter"
 msgstr ""

-#: templates/alsijil/print/full_register.html:22
-#: templates/alsijil/print/full_register.html:54
-msgid "Owners"
+#: templates/alsijil/personal_note_filter/manage.html:7
+#: templates/alsijil/personal_note_filter/manage.html:14
+msgid "Update personal note filter"
+msgstr ""
+
+#: templates/alsijil/personal_note_filter/manage.html:9
+#: templates/alsijil/personal_note_filter/manage.html:16
+msgid "Create personal note filter"
+msgstr ""
+
+#: templates/alsijil/personal_note_filter/manage.html:29
+msgid "Delete filter"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:6
+msgid "Class register:"
 msgstr ""

 #: templates/alsijil/print/full_register.html:26
+#: templates/alsijil/print/full_register.html:59
+msgid "Owners"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:30
 msgid "Printed on"
 msgstr ""

-#: templates/alsijil/print/full_register.html:34
+#: templates/alsijil/print/full_register.html:38
 msgid ""
 "\n"
-"            This printout is intended for archival purposes. The main copy "
-"of\n"
-"            the class register is stored in the AlekSIS School Information\n"
-"            System.\n"
-"          "
+"        This printout is intended for archival purposes. The main copy of\n"
+"        the class register is stored in the AlekSIS School Information\n"
+"        System.\n"
+"      "
 msgstr ""

-#: templates/alsijil/print/full_register.html:41
+#: templates/alsijil/print/full_register.html:45
 msgid ""
 "\n"
-"            Copies of the class register, both digital and as printout, "
-"must\n"
-"            only be kept inside the school and/or on devices authorised by "
-"the\n"
-"            school.\n"
-"          "
+"        Copies of the class register, both digital and as printout, must\n"
+"        only be kept inside the school and/or on devices authorised by the\n"
+"        school.\n"
+"      "
 msgstr ""

-#: templates/alsijil/print/full_register.html:48
+#: templates/alsijil/print/full_register.html:52
 msgid ""
 "\n"
-"            The owner of the group and the headteacher confirm the above, "
-"as\n"
-"            well as the correctness of this printout.\n"
-"          "
+"        The owner of the group and the headteacher confirm the above, as\n"
+"        well as the correctness of this printout.\n"
+"      "
 msgstr ""

-#: templates/alsijil/print/full_register.html:55
+#: templates/alsijil/print/full_register.html:62
 msgid "Headteacher"
 msgstr ""

-#: templates/alsijil/print/full_register.html:61
-msgid "Persons in group"
+#: templates/alsijil/print/full_register.html:69
+msgid "Abbreviations"
 msgstr ""

-#: templates/alsijil/print/full_register.html:66
-msgid "No."
+#: templates/alsijil/print/full_register.html:71
+msgid "General"
 msgstr ""

-#: templates/alsijil/print/full_register.html:67
-msgid "Last name"
+#: templates/alsijil/print/full_register.html:78
+msgid "Late"
 msgstr ""

-#: templates/alsijil/print/full_register.html:68
-msgid "First name"
+#: templates/alsijil/print/full_register.html:81
+#: templates/alsijil/print/full_register.html:288
+msgid "Unexcused"
 msgstr ""

-#: templates/alsijil/print/full_register.html:69
-msgid "Sex"
+#: templates/alsijil/print/full_register.html:89
+msgid "Custom excuse types"
 msgstr ""

-#: templates/alsijil/print/full_register.html:70
-msgid "Date of birth"
+#: templates/alsijil/print/full_register.html:103
+msgid "Persons in group"
 msgstr ""

-#: templates/alsijil/print/full_register.html:71
-#: templates/alsijil/print/full_register.html:200
-msgid "Absences"
+#: templates/alsijil/print/full_register.html:108
+msgid "No."
 msgstr ""

-#: templates/alsijil/print/full_register.html:72
-#: templates/alsijil/print/full_register.html:201
-msgid "Unexcused"
-msgstr ""
+#: templates/alsijil/print/full_register.html:109
+msgid "Last name"
+msgstr "Secondus nomen"

-#: templates/alsijil/print/full_register.html:73
-#: templates/alsijil/print/full_register.html:224
-msgid "Tard."
+#: templates/alsijil/print/full_register.html:110
+msgid "First name"
+msgstr "Primus nomen"
+
+#: templates/alsijil/print/full_register.html:111
+msgid "Sex"
+msgstr "Genus"
+
+#: templates/alsijil/print/full_register.html:112
+msgid "Date of birth"
+msgstr "Dies natalis"
+
+#: templates/alsijil/print/full_register.html:113
+msgid "(a)"
 msgstr ""

-#: templates/alsijil/print/full_register.html:95
-msgid "Teachers and lessons in group"
+#: templates/alsijil/print/full_register.html:119
+msgid "(b)"
 msgstr ""

-#: templates/alsijil/print/full_register.html:100
-#: templates/alsijil/week_view.html:48
-msgid "Subject"
+#: templates/alsijil/print/full_register.html:146
+msgid "Teachers and lessons in group"
 msgstr ""

-#: templates/alsijil/print/full_register.html:102
+#: templates/alsijil/print/full_register.html:153
+#: templates/alsijil/print/full_register.html:184
 msgid "Lesson start"
 msgstr ""

-#: templates/alsijil/print/full_register.html:103
+#: templates/alsijil/print/full_register.html:154
+#: templates/alsijil/print/full_register.html:185
 msgid "Lesson end"
 msgstr ""

-#: templates/alsijil/print/full_register.html:104
+#: templates/alsijil/print/full_register.html:155
+#: templates/alsijil/print/full_register.html:186
 msgid "Per week"
 msgstr ""

-#: templates/alsijil/print/full_register.html:124
+#: templates/alsijil/print/full_register.html:176
+msgid "Teachers and lessons in child groups"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:209
 msgid "Personal overview"
 msgstr ""

-#: templates/alsijil/print/full_register.html:126
+#: templates/alsijil/print/full_register.html:211
 msgid "Contact details"
 msgstr ""

-#: templates/alsijil/print/full_register.html:174
+#: templates/alsijil/print/full_register.html:249
 msgid "Statistics on remarks"
 msgstr ""

-#: templates/alsijil/print/full_register.html:179
+#: templates/alsijil/print/full_register.html:254
 msgid "Count"
 msgstr ""

-#: templates/alsijil/print/full_register.html:196
+#: templates/alsijil/print/full_register.html:271
 msgid "Absences and tardiness"
 msgstr ""

-#: templates/alsijil/print/full_register.html:215
+#: templates/alsijil/print/full_register.html:274
+msgid "Absences"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:279
+msgid "thereof"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:297
 msgid "Relevant personal notes"
 msgstr ""

-#: templates/alsijil/print/full_register.html:219
+#: templates/alsijil/print/full_register.html:301
 msgid "Date"
-msgstr ""
+msgstr "dies"

-#: templates/alsijil/print/full_register.html:220
-#: templates/alsijil/print/full_register.html:268
+#: templates/alsijil/print/full_register.html:302
+#: templates/alsijil/print/full_register.html:355
 msgid "Pe."
 msgstr ""

-#: templates/alsijil/print/full_register.html:221
-#: templates/alsijil/print/full_register.html:269
+#: templates/alsijil/print/full_register.html:303
+#: templates/alsijil/print/full_register.html:356
 msgid "Subj."
 msgstr ""

-#: templates/alsijil/print/full_register.html:222
-#: templates/alsijil/print/full_register.html:274
+#: templates/alsijil/print/full_register.html:304
+#: templates/alsijil/print/full_register.html:360
 msgid "Te."
 msgstr ""

-#: templates/alsijil/print/full_register.html:240
-msgid "Yes"
+#: templates/alsijil/print/full_register.html:306
+msgid "Tard."
 msgstr ""

-#: templates/alsijil/print/full_register.html:242
-#: templates/alsijil/print/full_register.html:314
-#: templates/alsijil/print/full_register.html:324
-msgid "e"
+#: templates/alsijil/print/full_register.html:322
+msgid "Yes"
 msgstr ""

-#: templates/alsijil/print/full_register.html:262
-msgid "Lesson documentation for calendar week"
+#: templates/alsijil/print/full_register.html:327
+#: templates/alsijil/print/full_register.html:409
+#: templates/alsijil/print/full_register.html:424
+msgid "e"
 msgstr ""

-#: templates/alsijil/print/full_register.html:270
-msgid "Subs."
+#: templates/alsijil/print/full_register.html:349
+msgid "Lesson documentation for week"
 msgstr ""

-#: templates/alsijil/print/full_register.html:273
+#: templates/alsijil/print/full_register.html:359
 msgid "Notes"
 msgstr ""

-#: templates/alsijil/print/full_register.html:301
-msgid "Lesson cancelled"
-msgstr ""
-
-#: templates/alsijil/register_absence.html:5
-#: templates/alsijil/register_absence.html:6
-msgid "Manage absence"
-msgstr ""
-
-#: templates/alsijil/week_view.html:6
-msgid "Week view"
-msgstr ""
-
-#: templates/alsijil/week_view.html:21
-msgid "Select"
-msgstr ""
-
-#: templates/alsijil/week_view.html:47
-msgid "Period"
+#: views.py:66
+msgid "You either selected an invalid lesson or there is currently no lesson in progress."
 msgstr ""

-#: templates/alsijil/week_view.html:49
-msgid "Teachers"
+#: views.py:80
+msgid "You are not allowed to create a lesson documentation for a lesson in the future."
 msgstr ""

-#: templates/alsijil/week_view.html:97
-msgid "unexcused"
+#: views.py:106
+msgid "The lesson documentation has been saved."
 msgstr ""

-#: templates/alsijil/week_view.html:100
-msgid "Summed up tardiness"
+#: views.py:121
+msgid "The personal notes have been saved."
 msgstr ""

-#: templates/alsijil/week_view.html:122
-msgid "No group selected"
+#: views.py:303
+msgid "There is no current school term."
 msgstr ""

-#: templates/alsijil/week_view.html:125
-msgid ""
-"\n"
-"            There are no lessons for the selected group, teacher, room or "
-"time.\n"
-"          "
+#: views.py:419
+msgid "The absence has been saved."
 msgstr ""

-#: views.py:56
-msgid ""
-"You either selected an invalid lesson or there is currently no lesson in "
-"progress."
+#: views.py:459
+msgid "The filter has been saved"
 msgstr ""

-#: views.py:68
-msgid ""
-"You are not allowed to create a lesson documentation for a lesson in the "
-"future."
+#: views.py:474
+msgid "The filter has been deleted."
 msgstr ""

-#: views.py:306
-msgid "The absence has been saved."
+#: views.py:497
+msgid "The excuse type has been created."
 msgstr ""

-#: views.py:344
-msgid "The filter has been saved"
+#: views.py:508
+msgid "The excuse type has been saved."
 msgstr ""

-#: views.py:360
-msgid "The filter has been deleted."
+#: views.py:518
+msgid "The excuse type has been deleted."
 msgstr ""
--- a/aleksis/apps/alsijil/locale/nb_NO/LC_MESSAGES/django.po
+++ b/aleksis/apps/alsijil/locale/nb_NO/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-01 13:20+0200\n"
+"POT-Creation-Date: 2020-07-26 16:10+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,46 +17,55 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

-#: forms.py:41
+#: forms.py:25
+msgid "Homework for the next lesson"
+msgstr ""
+
+#: forms.py:50 templates/alsijil/print/full_register.html:181
 msgid "Group"
 msgstr ""

-#: forms.py:49 templates/alsijil/print/full_register.html:101
+#: forms.py:56 templates/alsijil/print/full_register.html:152
+#: templates/alsijil/print/full_register.html:183
 msgid "Teacher"
 msgstr ""

-#: forms.py:57
-msgid "Room"
+#: forms.py:73
+msgid "You can't select a group and a teacher both."
 msgstr ""

-#: forms.py:70
+#: forms.py:101
 msgid "Start date"
 msgstr ""

-#: forms.py:73
+#: forms.py:102
 msgid "End date"
 msgstr ""

-#: forms.py:75
+#: forms.py:103
 msgid "From period"
 msgstr ""

-#: forms.py:77 templates/alsijil/lesson.html:58
+#: forms.py:105 templates/alsijil/class_register/lesson.html:150
 msgid "Person"
 msgstr ""

-#: forms.py:79 templates/alsijil/lesson.html:59
-#: templates/alsijil/print/full_register.html:223
-#: templates/alsijil/week_view.html:96
+#: forms.py:107 templates/alsijil/class_register/lesson.html:151
+#: templates/alsijil/class_register/week_view.html:93
+#: templates/alsijil/print/full_register.html:75
+#: templates/alsijil/print/full_register.html:305
 msgid "Absent"
 msgstr ""

-#: forms.py:80 templates/alsijil/lesson.html:61
+#: forms.py:108 templates/alsijil/class_register/lesson.html:153
+#: templates/alsijil/print/full_register.html:84
+#: templates/alsijil/print/full_register.html:280
 msgid "Excused"
 msgstr ""

-#: forms.py:81 templates/alsijil/lesson.html:62
-#: templates/alsijil/print/full_register.html:225
+#: forms.py:109 templates/alsijil/class_register/lesson.html:155
+#: templates/alsijil/class_register/lesson.html:195
+#: templates/alsijil/print/full_register.html:307
 msgid "Remarks"
 msgstr ""

@@ -76,306 +85,491 @@ msgstr ""
 msgid "Register absence"
 msgstr ""

-#: menus.py:34
+#: menus.py:34 models.py:129 templates/alsijil/personal_note_filter/list.html:8
 msgid "Personal note filters"
 msgstr ""

-#: models.py:51 templates/alsijil/print/full_register.html:271
+#: menus.py:40 models.py:32 templates/alsijil/excuse_type/list.html:8
+#: templates/alsijil/excuse_type/list.html:9
+msgid "Excuse types"
+msgstr ""
+
+#: models.py:18
+msgid "Short name"
+msgstr ""
+
+#: models.py:20
+msgid "Name"
+msgstr ""
+
+#: models.py:31 models.py:59 templates/alsijil/class_register/lesson.html:154
+#: templates/alsijil/class_register/lesson.html:187
+msgid "Excuse type"
+msgstr ""
+
+#: models.py:70
+msgid "Personal note"
+msgstr ""
+
+#: models.py:71 templates/alsijil/class_register/lesson.html:143
+#: templates/alsijil/class_register/week_view.html:88
+msgid "Personal notes"
+msgstr ""
+
+#: models.py:94 templates/alsijil/print/full_register.html:357
 msgid "Lesson topic"
 msgstr ""

-#: models.py:52 templates/alsijil/print/full_register.html:272
+#: models.py:95 templates/alsijil/print/full_register.html:358
 msgid "Homework"
 msgstr ""

-#: models.py:68
+#: models.py:96
+msgid "Group note"
+msgstr ""
+
+#: models.py:99 templates/alsijil/class_register/lesson.html:119
+msgid "Lesson documentation"
+msgstr ""
+
+#: models.py:100
+msgid "Lesson documentations"
+msgstr ""
+
+#: models.py:114
 msgid "Identifier"
 msgstr ""

-#: models.py:71 templates/alsijil/print/full_register.html:178
+#: models.py:120 templates/alsijil/print/full_register.html:253
 msgid "Description"
 msgstr ""

-#: models.py:74
+#: models.py:124
 msgid "Match expression"
 msgstr ""

-#: tables.py:14
+#: models.py:128
+msgid "Personal note filter"
+msgstr ""
+
+#: tables.py:17 tables.py:31
 msgid "Edit"
 msgstr ""

-#: templates/alsijil/lesson.html:5
+#: tables.py:37
+msgid "Delete"
+msgstr ""
+
+#: templates/alsijil/absences/register.html:5
+#: templates/alsijil/absences/register.html:6
+msgid "Manage absence"
+msgstr ""
+
+#: templates/alsijil/class_register/lesson.html:6
 msgid "Lesson"
 msgstr ""

-#: templates/alsijil/lesson.html:34
-msgid "Lesson documentation"
+#: templates/alsijil/class_register/lesson.html:14
+#: templates/alsijil/class_register/lesson.html:71
+#, python-format
+msgid "%(period)s. period"
 msgstr ""

-#: templates/alsijil/lesson.html:43
-msgid "Change history"
+#: templates/alsijil/class_register/lesson.html:38
+msgid "Previous lesson"
 msgstr ""

-#: templates/alsijil/lesson.html:52 templates/alsijil/week_view.html:91
-msgid "Personal notes"
+#: templates/alsijil/class_register/lesson.html:46
+msgid "Next lesson"
+msgstr ""
+
+#: templates/alsijil/class_register/lesson.html:70
+msgid "Overview: Previous lesson"
+msgstr ""
+
+#: templates/alsijil/class_register/lesson.html:77
+msgid "Lesson topic of previous lesson:"
+msgstr ""
+
+#: templates/alsijil/class_register/lesson.html:84
+msgid "Homework for this lesson:"
+msgstr ""
+
+#: templates/alsijil/class_register/lesson.html:91
+msgid "Group notes for previous lesson:"
+msgstr ""
+
+#: templates/alsijil/class_register/lesson.html:98
+msgid "Absent persons:"
+msgstr ""
+
+#: templates/alsijil/class_register/lesson.html:105
+msgid "Late persons:"
 msgstr ""

-#: templates/alsijil/lesson.html:60
-#: templates/alsijil/print/full_register.html:202
+#: templates/alsijil/class_register/lesson.html:130
+msgid "Change history"
+msgstr ""
+
+#: templates/alsijil/class_register/lesson.html:152
+#: templates/alsijil/print/full_register.html:292
 msgid "Tardiness"
 msgstr ""

-#: templates/alsijil/manage_personal_note_filter.html:5
-#: templates/alsijil/manage_personal_note_filter.html:6
-msgid "Manage personal note filter"
+#: templates/alsijil/class_register/lesson.html:173
+msgid "Tardiness (in m)"
 msgstr ""

-#: templates/alsijil/manage_personal_note_filter.html:11
-msgid "Delete filter"
+#: templates/alsijil/class_register/week_view.html:6
+msgid "Week view"
+msgstr ""
+
+#: templates/alsijil/class_register/week_view.html:27
+msgid "Select"
+msgstr ""
+
+#: templates/alsijil/class_register/week_view.html:33
+#, python-format
+msgid "CW %(week)s: %(instance)s"
+msgstr ""
+
+#: templates/alsijil/class_register/week_view.html:50
+msgid "Period"
+msgstr ""
+
+#: templates/alsijil/class_register/week_view.html:51
+#: templates/alsijil/print/full_register.html:151
+#: templates/alsijil/print/full_register.html:182
+msgid "Subject"
+msgstr ""
+
+#: templates/alsijil/class_register/week_view.html:52
+msgid "Teachers"
+msgstr ""
+
+#: templates/alsijil/class_register/week_view.html:94
+msgid "unexcused"
+msgstr ""
+
+#: templates/alsijil/class_register/week_view.html:97
+msgid "Summed up tardiness"
+msgstr ""
+
+#: templates/alsijil/class_register/week_view.html:121
+msgid "No lessons available"
+msgstr ""
+
+#: templates/alsijil/class_register/week_view.html:124
+msgid ""
+"\n"
+"            There are no lessons for the selected group or teacher in this week.\n"
+"          "
+msgstr ""
+
+#: templates/alsijil/excuse_type/create.html:6
+#: templates/alsijil/excuse_type/create.html:7
+#: templates/alsijil/excuse_type/list.html:16
+msgid "Create excuse type"
+msgstr ""
+
+#: templates/alsijil/excuse_type/edit.html:6
+#: templates/alsijil/excuse_type/edit.html:7
+msgid "Edit excuse type"
+msgstr ""
+
+#: templates/alsijil/excuse_type/warning.html:5
+msgid ""
+"\n"
+"      This function should only be used to define alternatives to the default excuse which also will be counted extra.\n"
+"      Don't use this to create a default excuse or if you don't divide between different types of excuse.\n"
+"    "
+msgstr ""
+
+#: templates/alsijil/partials/absences.html:4
+#: templates/alsijil/print/full_register.html:114
+msgid "(e)"
+msgstr ""
+
+#: templates/alsijil/partials/absences.html:4
+#: templates/alsijil/print/full_register.html:118
+msgid "(u)"
+msgstr ""
+
+#: templates/alsijil/partials/lesson_status_icon.html:6
+msgid "Data complete"
 msgstr ""

-#: templates/alsijil/personal_note_filters.html:7
-#: templates/alsijil/personal_note_filters.html:8
-msgid "List of all personal note filters"
+#: templates/alsijil/partials/lesson_status_icon.html:12
+msgid "Missing data"
 msgstr ""

-#: templates/alsijil/personal_note_filters.html:12
+#: templates/alsijil/partials/lesson_status_icon.html:14
+msgid "Pending"
+msgstr ""
+
+#: templates/alsijil/partials/lesson_status_icon.html:18
+#: templates/alsijil/print/full_register.html:392
+msgid "Lesson cancelled"
+msgstr ""
+
+#: templates/alsijil/partials/lesson_status_icon.html:20
+msgid "Substitution"
+msgstr ""
+
+#: templates/alsijil/personal_note_filter/list.html:7
+msgid "All personal note filters"
+msgstr ""
+
+#: templates/alsijil/personal_note_filter/list.html:12
 msgid "Add filter"
 msgstr ""

-#: templates/alsijil/print/full_register.html:22
-#: templates/alsijil/print/full_register.html:54
-msgid "Owners"
+#: templates/alsijil/personal_note_filter/manage.html:7
+#: templates/alsijil/personal_note_filter/manage.html:14
+msgid "Update personal note filter"
+msgstr ""
+
+#: templates/alsijil/personal_note_filter/manage.html:9
+#: templates/alsijil/personal_note_filter/manage.html:16
+msgid "Create personal note filter"
+msgstr ""
+
+#: templates/alsijil/personal_note_filter/manage.html:29
+msgid "Delete filter"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:6
+msgid "Class register:"
 msgstr ""

 #: templates/alsijil/print/full_register.html:26
+#: templates/alsijil/print/full_register.html:59
+msgid "Owners"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:30
 msgid "Printed on"
 msgstr ""

-#: templates/alsijil/print/full_register.html:34
+#: templates/alsijil/print/full_register.html:38
 msgid ""
 "\n"
-"            This printout is intended for archival purposes. The main copy "
-"of\n"
-"            the class register is stored in the AlekSIS School Information\n"
-"            System.\n"
-"          "
+"        This printout is intended for archival purposes. The main copy of\n"
+"        the class register is stored in the AlekSIS School Information\n"
+"        System.\n"
+"      "
 msgstr ""

-#: templates/alsijil/print/full_register.html:41
+#: templates/alsijil/print/full_register.html:45
 msgid ""
 "\n"
-"            Copies of the class register, both digital and as printout, "
-"must\n"
-"            only be kept inside the school and/or on devices authorised by "
-"the\n"
-"            school.\n"
-"          "
+"        Copies of the class register, both digital and as printout, must\n"
+"        only be kept inside the school and/or on devices authorised by the\n"
+"        school.\n"
+"      "
 msgstr ""

-#: templates/alsijil/print/full_register.html:48
+#: templates/alsijil/print/full_register.html:52
 msgid ""
 "\n"
-"            The owner of the group and the headteacher confirm the above, "
-"as\n"
-"            well as the correctness of this printout.\n"
-"          "
+"        The owner of the group and the headteacher confirm the above, as\n"
+"        well as the correctness of this printout.\n"
+"      "
 msgstr ""

-#: templates/alsijil/print/full_register.html:55
+#: templates/alsijil/print/full_register.html:62
 msgid "Headteacher"
 msgstr ""

-#: templates/alsijil/print/full_register.html:61
+#: templates/alsijil/print/full_register.html:69
+msgid "Abbreviations"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:71
+msgid "General"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:78
+msgid "Late"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:81
+#: templates/alsijil/print/full_register.html:288
+msgid "Unexcused"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:89
+msgid "Custom excuse types"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:103
 msgid "Persons in group"
 msgstr ""

-#: templates/alsijil/print/full_register.html:66
+#: templates/alsijil/print/full_register.html:108
 msgid "No."
 msgstr ""

-#: templates/alsijil/print/full_register.html:67
+#: templates/alsijil/print/full_register.html:109
 msgid "Last name"
 msgstr ""

-#: templates/alsijil/print/full_register.html:68
+#: templates/alsijil/print/full_register.html:110
 msgid "First name"
 msgstr ""

-#: templates/alsijil/print/full_register.html:69
+#: templates/alsijil/print/full_register.html:111
 msgid "Sex"
 msgstr ""

-#: templates/alsijil/print/full_register.html:70
+#: templates/alsijil/print/full_register.html:112
 msgid "Date of birth"
 msgstr ""

-#: templates/alsijil/print/full_register.html:71
-#: templates/alsijil/print/full_register.html:200
-msgid "Absences"
+#: templates/alsijil/print/full_register.html:113
+msgid "(a)"
 msgstr ""

-#: templates/alsijil/print/full_register.html:72
-#: templates/alsijil/print/full_register.html:201
-msgid "Unexcused"
+#: templates/alsijil/print/full_register.html:119
+msgid "(b)"
 msgstr ""

-#: templates/alsijil/print/full_register.html:73
-#: templates/alsijil/print/full_register.html:224
-msgid "Tard."
-msgstr ""
-
-#: templates/alsijil/print/full_register.html:95
+#: templates/alsijil/print/full_register.html:146
 msgid "Teachers and lessons in group"
 msgstr ""

-#: templates/alsijil/print/full_register.html:100
-#: templates/alsijil/week_view.html:48
-msgid "Subject"
-msgstr ""
-
-#: templates/alsijil/print/full_register.html:102
+#: templates/alsijil/print/full_register.html:153
+#: templates/alsijil/print/full_register.html:184
 msgid "Lesson start"
 msgstr ""

-#: templates/alsijil/print/full_register.html:103
+#: templates/alsijil/print/full_register.html:154
+#: templates/alsijil/print/full_register.html:185
 msgid "Lesson end"
 msgstr ""

-#: templates/alsijil/print/full_register.html:104
+#: templates/alsijil/print/full_register.html:155
+#: templates/alsijil/print/full_register.html:186
 msgid "Per week"
 msgstr ""

-#: templates/alsijil/print/full_register.html:124
+#: templates/alsijil/print/full_register.html:176
+msgid "Teachers and lessons in child groups"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:209
 msgid "Personal overview"
 msgstr ""

-#: templates/alsijil/print/full_register.html:126
+#: templates/alsijil/print/full_register.html:211
 msgid "Contact details"
 msgstr ""

-#: templates/alsijil/print/full_register.html:174
+#: templates/alsijil/print/full_register.html:249
 msgid "Statistics on remarks"
 msgstr ""

-#: templates/alsijil/print/full_register.html:179
+#: templates/alsijil/print/full_register.html:254
 msgid "Count"
 msgstr ""

-#: templates/alsijil/print/full_register.html:196
+#: templates/alsijil/print/full_register.html:271
 msgid "Absences and tardiness"
 msgstr ""

-#: templates/alsijil/print/full_register.html:215
+#: templates/alsijil/print/full_register.html:274
+msgid "Absences"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:279
+msgid "thereof"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:297
 msgid "Relevant personal notes"
 msgstr ""

-#: templates/alsijil/print/full_register.html:219
+#: templates/alsijil/print/full_register.html:301
 msgid "Date"
 msgstr ""

-#: templates/alsijil/print/full_register.html:220
-#: templates/alsijil/print/full_register.html:268
+#: templates/alsijil/print/full_register.html:302
+#: templates/alsijil/print/full_register.html:355
 msgid "Pe."
 msgstr ""

-#: templates/alsijil/print/full_register.html:221
-#: templates/alsijil/print/full_register.html:269
+#: templates/alsijil/print/full_register.html:303
+#: templates/alsijil/print/full_register.html:356
 msgid "Subj."
 msgstr ""

-#: templates/alsijil/print/full_register.html:222
-#: templates/alsijil/print/full_register.html:274
+#: templates/alsijil/print/full_register.html:304
+#: templates/alsijil/print/full_register.html:360
 msgid "Te."
 msgstr ""

-#: templates/alsijil/print/full_register.html:240
-msgid "Yes"
+#: templates/alsijil/print/full_register.html:306
+msgid "Tard."
 msgstr ""

-#: templates/alsijil/print/full_register.html:242
-#: templates/alsijil/print/full_register.html:314
-#: templates/alsijil/print/full_register.html:324
-msgid "e"
+#: templates/alsijil/print/full_register.html:322
+msgid "Yes"
 msgstr ""

-#: templates/alsijil/print/full_register.html:262
-msgid "Lesson documentation for calendar week"
+#: templates/alsijil/print/full_register.html:327
+#: templates/alsijil/print/full_register.html:409
+#: templates/alsijil/print/full_register.html:424
+msgid "e"
 msgstr ""

-#: templates/alsijil/print/full_register.html:270
-msgid "Subs."
+#: templates/alsijil/print/full_register.html:349
+msgid "Lesson documentation for week"
 msgstr ""

-#: templates/alsijil/print/full_register.html:273
+#: templates/alsijil/print/full_register.html:359
 msgid "Notes"
 msgstr ""

-#: templates/alsijil/print/full_register.html:301
-msgid "Lesson cancelled"
+#: views.py:66
+msgid "You either selected an invalid lesson or there is currently no lesson in progress."
 msgstr ""

-#: templates/alsijil/register_absence.html:5
-#: templates/alsijil/register_absence.html:6
-msgid "Manage absence"
+#: views.py:80
+msgid "You are not allowed to create a lesson documentation for a lesson in the future."
 msgstr ""

-#: templates/alsijil/week_view.html:6
-msgid "Week view"
+#: views.py:106
+msgid "The lesson documentation has been saved."
 msgstr ""

-#: templates/alsijil/week_view.html:21
-msgid "Select"
+#: views.py:121
+msgid "The personal notes have been saved."
 msgstr ""

-#: templates/alsijil/week_view.html:47
-msgid "Period"
+#: views.py:303
+msgid "There is no current school term."
 msgstr ""

-#: templates/alsijil/week_view.html:49
-msgid "Teachers"
-msgstr ""
-
-#: templates/alsijil/week_view.html:97
-msgid "unexcused"
-msgstr ""
-
-#: templates/alsijil/week_view.html:100
-msgid "Summed up tardiness"
-msgstr ""
-
-#: templates/alsijil/week_view.html:122
-msgid "No group selected"
-msgstr ""
-
-#: templates/alsijil/week_view.html:125
-msgid ""
-"\n"
-"            There are no lessons for the selected group, teacher, room or "
-"time.\n"
-"          "
+#: views.py:419
+msgid "The absence has been saved."
 msgstr ""

-#: views.py:56
-msgid ""
-"You either selected an invalid lesson or there is currently no lesson in "
-"progress."
+#: views.py:459
+msgid "The filter has been saved"
 msgstr ""

-#: views.py:68
-msgid ""
-"You are not allowed to create a lesson documentation for a lesson in the "
-"future."
+#: views.py:474
+msgid "The filter has been deleted."
 msgstr ""

-#: views.py:306
-msgid "The absence has been saved."
+#: views.py:497
+msgid "The excuse type has been created."
 msgstr ""

-#: views.py:344
-msgid "The filter has been saved"
+#: views.py:508
+msgid "The excuse type has been saved."
 msgstr ""

-#: views.py:360
-msgid "The filter has been deleted."
+#: views.py:518
+msgid "The excuse type has been deleted."
 msgstr ""
--- a/aleksis/apps/alsijil/locale/tr_TR/LC_MESSAGES/django.po
+++ b/aleksis/apps/alsijil/locale/tr_TR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-01 13:20+0200\n"
+"POT-Creation-Date: 2020-07-26 16:10+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,46 +17,55 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

-#: forms.py:41
+#: forms.py:25
+msgid "Homework for the next lesson"
+msgstr ""
+
+#: forms.py:50 templates/alsijil/print/full_register.html:181
 msgid "Group"
 msgstr ""

-#: forms.py:49 templates/alsijil/print/full_register.html:101
+#: forms.py:56 templates/alsijil/print/full_register.html:152
+#: templates/alsijil/print/full_register.html:183
 msgid "Teacher"
 msgstr ""

-#: forms.py:57
-msgid "Room"
+#: forms.py:73
+msgid "You can't select a group and a teacher both."
 msgstr ""

-#: forms.py:70
+#: forms.py:101
 msgid "Start date"
 msgstr ""

-#: forms.py:73
+#: forms.py:102
 msgid "End date"
 msgstr ""

-#: forms.py:75
+#: forms.py:103
 msgid "From period"
 msgstr ""

-#: forms.py:77 templates/alsijil/lesson.html:58
+#: forms.py:105 templates/alsijil/class_register/lesson.html:150
 msgid "Person"
 msgstr ""

-#: forms.py:79 templates/alsijil/lesson.html:59
-#: templates/alsijil/print/full_register.html:223
-#: templates/alsijil/week_view.html:96
+#: forms.py:107 templates/alsijil/class_register/lesson.html:151
+#: templates/alsijil/class_register/week_view.html:93
+#: templates/alsijil/print/full_register.html:75
+#: templates/alsijil/print/full_register.html:305
 msgid "Absent"
 msgstr ""

-#: forms.py:80 templates/alsijil/lesson.html:61
+#: forms.py:108 templates/alsijil/class_register/lesson.html:153
+#: templates/alsijil/print/full_register.html:84
+#: templates/alsijil/print/full_register.html:280
 msgid "Excused"
 msgstr ""

-#: forms.py:81 templates/alsijil/lesson.html:62
-#: templates/alsijil/print/full_register.html:225
+#: forms.py:109 templates/alsijil/class_register/lesson.html:155
+#: templates/alsijil/class_register/lesson.html:195
+#: templates/alsijil/print/full_register.html:307
 msgid "Remarks"
 msgstr ""

@@ -76,306 +85,491 @@ msgstr ""
 msgid "Register absence"
 msgstr ""

-#: menus.py:34
+#: menus.py:34 models.py:129 templates/alsijil/personal_note_filter/list.html:8
 msgid "Personal note filters"
 msgstr ""

-#: models.py:51 templates/alsijil/print/full_register.html:271
+#: menus.py:40 models.py:32 templates/alsijil/excuse_type/list.html:8
+#: templates/alsijil/excuse_type/list.html:9
+msgid "Excuse types"
+msgstr ""
+
+#: models.py:18
+msgid "Short name"
+msgstr ""
+
+#: models.py:20
+msgid "Name"
+msgstr ""
+
+#: models.py:31 models.py:59 templates/alsijil/class_register/lesson.html:154
+#: templates/alsijil/class_register/lesson.html:187
+msgid "Excuse type"
+msgstr ""
+
+#: models.py:70
+msgid "Personal note"
+msgstr ""
+
+#: models.py:71 templates/alsijil/class_register/lesson.html:143
+#: templates/alsijil/class_register/week_view.html:88
+msgid "Personal notes"
+msgstr ""
+
+#: models.py:94 templates/alsijil/print/full_register.html:357
 msgid "Lesson topic"
 msgstr ""

-#: models.py:52 templates/alsijil/print/full_register.html:272
+#: models.py:95 templates/alsijil/print/full_register.html:358
 msgid "Homework"
 msgstr ""

-#: models.py:68
+#: models.py:96
+msgid "Group note"
+msgstr ""
+
+#: models.py:99 templates/alsijil/class_register/lesson.html:119
+msgid "Lesson documentation"
+msgstr ""
+
+#: models.py:100
+msgid "Lesson documentations"
+msgstr ""
+
+#: models.py:114
 msgid "Identifier"
 msgstr ""

-#: models.py:71 templates/alsijil/print/full_register.html:178
+#: models.py:120 templates/alsijil/print/full_register.html:253
 msgid "Description"
 msgstr ""

-#: models.py:74
+#: models.py:124
 msgid "Match expression"
 msgstr ""

-#: tables.py:14
+#: models.py:128
+msgid "Personal note filter"
+msgstr ""
+
+#: tables.py:17 tables.py:31
 msgid "Edit"
 msgstr ""

-#: templates/alsijil/lesson.html:5
+#: tables.py:37
+msgid "Delete"
+msgstr ""
+
+#: templates/alsijil/absences/register.html:5
+#: templates/alsijil/absences/register.html:6
+msgid "Manage absence"
+msgstr ""
+
+#: templates/alsijil/class_register/lesson.html:6
 msgid "Lesson"
 msgstr ""

-#: templates/alsijil/lesson.html:34
-msgid "Lesson documentation"
+#: templates/alsijil/class_register/lesson.html:14
+#: templates/alsijil/class_register/lesson.html:71
+#, python-format
+msgid "%(period)s. period"
 msgstr ""

-#: templates/alsijil/lesson.html:43
-msgid "Change history"
+#: templates/alsijil/class_register/lesson.html:38
+msgid "Previous lesson"
 msgstr ""

-#: templates/alsijil/lesson.html:52 templates/alsijil/week_view.html:91
-msgid "Personal notes"
+#: templates/alsijil/class_register/lesson.html:46
+msgid "Next lesson"
+msgstr ""
+
+#: templates/alsijil/class_register/lesson.html:70
+msgid "Overview: Previous lesson"
+msgstr ""
+
+#: templates/alsijil/class_register/lesson.html:77
+msgid "Lesson topic of previous lesson:"
+msgstr ""
+
+#: templates/alsijil/class_register/lesson.html:84
+msgid "Homework for this lesson:"
+msgstr ""
+
+#: templates/alsijil/class_register/lesson.html:91
+msgid "Group notes for previous lesson:"
+msgstr ""
+
+#: templates/alsijil/class_register/lesson.html:98
+msgid "Absent persons:"
+msgstr ""
+
+#: templates/alsijil/class_register/lesson.html:105
+msgid "Late persons:"
 msgstr ""

-#: templates/alsijil/lesson.html:60
-#: templates/alsijil/print/full_register.html:202
+#: templates/alsijil/class_register/lesson.html:130
+msgid "Change history"
+msgstr ""
+
+#: templates/alsijil/class_register/lesson.html:152
+#: templates/alsijil/print/full_register.html:292
 msgid "Tardiness"
 msgstr ""

-#: templates/alsijil/manage_personal_note_filter.html:5
-#: templates/alsijil/manage_personal_note_filter.html:6
-msgid "Manage personal note filter"
+#: templates/alsijil/class_register/lesson.html:173
+msgid "Tardiness (in m)"
 msgstr ""

-#: templates/alsijil/manage_personal_note_filter.html:11
-msgid "Delete filter"
+#: templates/alsijil/class_register/week_view.html:6
+msgid "Week view"
+msgstr ""
+
+#: templates/alsijil/class_register/week_view.html:27
+msgid "Select"
+msgstr ""
+
+#: templates/alsijil/class_register/week_view.html:33
+#, python-format
+msgid "CW %(week)s: %(instance)s"
+msgstr ""
+
+#: templates/alsijil/class_register/week_view.html:50
+msgid "Period"
+msgstr ""
+
+#: templates/alsijil/class_register/week_view.html:51
+#: templates/alsijil/print/full_register.html:151
+#: templates/alsijil/print/full_register.html:182
+msgid "Subject"
+msgstr ""
+
+#: templates/alsijil/class_register/week_view.html:52
+msgid "Teachers"
+msgstr ""
+
+#: templates/alsijil/class_register/week_view.html:94
+msgid "unexcused"
+msgstr ""
+
+#: templates/alsijil/class_register/week_view.html:97
+msgid "Summed up tardiness"
+msgstr ""
+
+#: templates/alsijil/class_register/week_view.html:121
+msgid "No lessons available"
+msgstr ""
+
+#: templates/alsijil/class_register/week_view.html:124
+msgid ""
+"\n"
+"            There are no lessons for the selected group or teacher in this week.\n"
+"          "
+msgstr ""
+
+#: templates/alsijil/excuse_type/create.html:6
+#: templates/alsijil/excuse_type/create.html:7
+#: templates/alsijil/excuse_type/list.html:16
+msgid "Create excuse type"
+msgstr ""
+
+#: templates/alsijil/excuse_type/edit.html:6
+#: templates/alsijil/excuse_type/edit.html:7
+msgid "Edit excuse type"
+msgstr ""
+
+#: templates/alsijil/excuse_type/warning.html:5
+msgid ""
+"\n"
+"      This function should only be used to define alternatives to the default excuse which also will be counted extra.\n"
+"      Don't use this to create a default excuse or if you don't divide between different types of excuse.\n"
+"    "
+msgstr ""
+
+#: templates/alsijil/partials/absences.html:4
+#: templates/alsijil/print/full_register.html:114
+msgid "(e)"
+msgstr ""
+
+#: templates/alsijil/partials/absences.html:4
+#: templates/alsijil/print/full_register.html:118
+msgid "(u)"
+msgstr ""
+
+#: templates/alsijil/partials/lesson_status_icon.html:6
+msgid "Data complete"
 msgstr ""

-#: templates/alsijil/personal_note_filters.html:7
-#: templates/alsijil/personal_note_filters.html:8
-msgid "List of all personal note filters"
+#: templates/alsijil/partials/lesson_status_icon.html:12
+msgid "Missing data"
 msgstr ""

-#: templates/alsijil/personal_note_filters.html:12
+#: templates/alsijil/partials/lesson_status_icon.html:14
+msgid "Pending"
+msgstr ""
+
+#: templates/alsijil/partials/lesson_status_icon.html:18
+#: templates/alsijil/print/full_register.html:392
+msgid "Lesson cancelled"
+msgstr ""
+
+#: templates/alsijil/partials/lesson_status_icon.html:20
+msgid "Substitution"
+msgstr ""
+
+#: templates/alsijil/personal_note_filter/list.html:7
+msgid "All personal note filters"
+msgstr ""
+
+#: templates/alsijil/personal_note_filter/list.html:12
 msgid "Add filter"
 msgstr ""

-#: templates/alsijil/print/full_register.html:22
-#: templates/alsijil/print/full_register.html:54
-msgid "Owners"
+#: templates/alsijil/personal_note_filter/manage.html:7
+#: templates/alsijil/personal_note_filter/manage.html:14
+msgid "Update personal note filter"
+msgstr ""
+
+#: templates/alsijil/personal_note_filter/manage.html:9
+#: templates/alsijil/personal_note_filter/manage.html:16
+msgid "Create personal note filter"
+msgstr ""
+
+#: templates/alsijil/personal_note_filter/manage.html:29
+msgid "Delete filter"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:6
+msgid "Class register:"
 msgstr ""

 #: templates/alsijil/print/full_register.html:26
+#: templates/alsijil/print/full_register.html:59
+msgid "Owners"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:30
 msgid "Printed on"
 msgstr ""

-#: templates/alsijil/print/full_register.html:34
+#: templates/alsijil/print/full_register.html:38
 msgid ""
 "\n"
-"            This printout is intended for archival purposes. The main copy "
-"of\n"
-"            the class register is stored in the AlekSIS School Information\n"
-"            System.\n"
-"          "
+"        This printout is intended for archival purposes. The main copy of\n"
+"        the class register is stored in the AlekSIS School Information\n"
+"        System.\n"
+"      "
 msgstr ""

-#: templates/alsijil/print/full_register.html:41
+#: templates/alsijil/print/full_register.html:45
 msgid ""
 "\n"
-"            Copies of the class register, both digital and as printout, "
-"must\n"
-"            only be kept inside the school and/or on devices authorised by "
-"the\n"
-"            school.\n"
-"          "
+"        Copies of the class register, both digital and as printout, must\n"
+"        only be kept inside the school and/or on devices authorised by the\n"
+"        school.\n"
+"      "
 msgstr ""

-#: templates/alsijil/print/full_register.html:48
+#: templates/alsijil/print/full_register.html:52
 msgid ""
 "\n"
-"            The owner of the group and the headteacher confirm the above, "
-"as\n"
-"            well as the correctness of this printout.\n"
-"          "
+"        The owner of the group and the headteacher confirm the above, as\n"
+"        well as the correctness of this printout.\n"
+"      "
 msgstr ""

-#: templates/alsijil/print/full_register.html:55
+#: templates/alsijil/print/full_register.html:62
 msgid "Headteacher"
 msgstr ""

-#: templates/alsijil/print/full_register.html:61
+#: templates/alsijil/print/full_register.html:69
+msgid "Abbreviations"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:71
+msgid "General"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:78
+msgid "Late"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:81
+#: templates/alsijil/print/full_register.html:288
+msgid "Unexcused"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:89
+msgid "Custom excuse types"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:103
 msgid "Persons in group"
 msgstr ""

-#: templates/alsijil/print/full_register.html:66
+#: templates/alsijil/print/full_register.html:108
 msgid "No."
 msgstr ""

-#: templates/alsijil/print/full_register.html:67
+#: templates/alsijil/print/full_register.html:109
 msgid "Last name"
 msgstr ""

-#: templates/alsijil/print/full_register.html:68
+#: templates/alsijil/print/full_register.html:110
 msgid "First name"
 msgstr ""

-#: templates/alsijil/print/full_register.html:69
+#: templates/alsijil/print/full_register.html:111
 msgid "Sex"
 msgstr ""

-#: templates/alsijil/print/full_register.html:70
+#: templates/alsijil/print/full_register.html:112
 msgid "Date of birth"
 msgstr ""

-#: templates/alsijil/print/full_register.html:71
-#: templates/alsijil/print/full_register.html:200
-msgid "Absences"
+#: templates/alsijil/print/full_register.html:113
+msgid "(a)"
 msgstr ""

-#: templates/alsijil/print/full_register.html:72
-#: templates/alsijil/print/full_register.html:201
-msgid "Unexcused"
+#: templates/alsijil/print/full_register.html:119
+msgid "(b)"
 msgstr ""

-#: templates/alsijil/print/full_register.html:73
-#: templates/alsijil/print/full_register.html:224
-msgid "Tard."
-msgstr ""
-
-#: templates/alsijil/print/full_register.html:95
+#: templates/alsijil/print/full_register.html:146
 msgid "Teachers and lessons in group"
 msgstr ""

-#: templates/alsijil/print/full_register.html:100
-#: templates/alsijil/week_view.html:48
-msgid "Subject"
-msgstr ""
-
-#: templates/alsijil/print/full_register.html:102
+#: templates/alsijil/print/full_register.html:153
+#: templates/alsijil/print/full_register.html:184
 msgid "Lesson start"
 msgstr ""

-#: templates/alsijil/print/full_register.html:103
+#: templates/alsijil/print/full_register.html:154
+#: templates/alsijil/print/full_register.html:185
 msgid "Lesson end"
 msgstr ""

-#: templates/alsijil/print/full_register.html:104
+#: templates/alsijil/print/full_register.html:155
+#: templates/alsijil/print/full_register.html:186
 msgid "Per week"
 msgstr ""

-#: templates/alsijil/print/full_register.html:124
+#: templates/alsijil/print/full_register.html:176
+msgid "Teachers and lessons in child groups"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:209
 msgid "Personal overview"
 msgstr ""

-#: templates/alsijil/print/full_register.html:126
+#: templates/alsijil/print/full_register.html:211
 msgid "Contact details"
 msgstr ""

-#: templates/alsijil/print/full_register.html:174
+#: templates/alsijil/print/full_register.html:249
 msgid "Statistics on remarks"
 msgstr ""

-#: templates/alsijil/print/full_register.html:179
+#: templates/alsijil/print/full_register.html:254
 msgid "Count"
 msgstr ""

-#: templates/alsijil/print/full_register.html:196
+#: templates/alsijil/print/full_register.html:271
 msgid "Absences and tardiness"
 msgstr ""

-#: templates/alsijil/print/full_register.html:215
+#: templates/alsijil/print/full_register.html:274
+msgid "Absences"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:279
+msgid "thereof"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:297
 msgid "Relevant personal notes"
 msgstr ""

-#: templates/alsijil/print/full_register.html:219
+#: templates/alsijil/print/full_register.html:301
 msgid "Date"
 msgstr ""

-#: templates/alsijil/print/full_register.html:220
-#: templates/alsijil/print/full_register.html:268
+#: templates/alsijil/print/full_register.html:302
+#: templates/alsijil/print/full_register.html:355
 msgid "Pe."
 msgstr ""

-#: templates/alsijil/print/full_register.html:221
-#: templates/alsijil/print/full_register.html:269
+#: templates/alsijil/print/full_register.html:303
+#: templates/alsijil/print/full_register.html:356
 msgid "Subj."
 msgstr ""

-#: templates/alsijil/print/full_register.html:222
-#: templates/alsijil/print/full_register.html:274
+#: templates/alsijil/print/full_register.html:304
+#: templates/alsijil/print/full_register.html:360
 msgid "Te."
 msgstr ""

-#: templates/alsijil/print/full_register.html:240
-msgid "Yes"
+#: templates/alsijil/print/full_register.html:306
+msgid "Tard."
 msgstr ""

-#: templates/alsijil/print/full_register.html:242
-#: templates/alsijil/print/full_register.html:314
-#: templates/alsijil/print/full_register.html:324
-msgid "e"
+#: templates/alsijil/print/full_register.html:322
+msgid "Yes"
 msgstr ""

-#: templates/alsijil/print/full_register.html:262
-msgid "Lesson documentation for calendar week"
+#: templates/alsijil/print/full_register.html:327
+#: templates/alsijil/print/full_register.html:409
+#: templates/alsijil/print/full_register.html:424
+msgid "e"
 msgstr ""

-#: templates/alsijil/print/full_register.html:270
-msgid "Subs."
+#: templates/alsijil/print/full_register.html:349
+msgid "Lesson documentation for week"
 msgstr ""

-#: templates/alsijil/print/full_register.html:273
+#: templates/alsijil/print/full_register.html:359
 msgid "Notes"
 msgstr ""

-#: templates/alsijil/print/full_register.html:301
-msgid "Lesson cancelled"
+#: views.py:66
+msgid "You either selected an invalid lesson or there is currently no lesson in progress."
 msgstr ""

-#: templates/alsijil/register_absence.html:5
-#: templates/alsijil/register_absence.html:6
-msgid "Manage absence"
+#: views.py:80
+msgid "You are not allowed to create a lesson documentation for a lesson in the future."
 msgstr ""

-#: templates/alsijil/week_view.html:6
-msgid "Week view"
+#: views.py:106
+msgid "The lesson documentation has been saved."
 msgstr ""

-#: templates/alsijil/week_view.html:21
-msgid "Select"
+#: views.py:121
+msgid "The personal notes have been saved."
 msgstr ""

-#: templates/alsijil/week_view.html:47
-msgid "Period"
+#: views.py:303
+msgid "There is no current school term."
 msgstr ""

-#: templates/alsijil/week_view.html:49
-msgid "Teachers"
-msgstr ""
-
-#: templates/alsijil/week_view.html:97
-msgid "unexcused"
-msgstr ""
-
-#: templates/alsijil/week_view.html:100
-msgid "Summed up tardiness"
-msgstr ""
-
-#: templates/alsijil/week_view.html:122
-msgid "No group selected"
-msgstr ""
-
-#: templates/alsijil/week_view.html:125
-msgid ""
-"\n"
-"            There are no lessons for the selected group, teacher, room or "
-"time.\n"
-"          "
+#: views.py:419
+msgid "The absence has been saved."
 msgstr ""

-#: views.py:56
-msgid ""
-"You either selected an invalid lesson or there is currently no lesson in "
-"progress."
+#: views.py:459
+msgid "The filter has been saved"
 msgstr ""

-#: views.py:68
-msgid ""
-"You are not allowed to create a lesson documentation for a lesson in the "
-"future."
+#: views.py:474
+msgid "The filter has been deleted."
 msgstr ""

-#: views.py:306
-msgid "The absence has been saved."
+#: views.py:497
+msgid "The excuse type has been created."
 msgstr ""

-#: views.py:344
-msgid "The filter has been saved"
+#: views.py:508
+msgid "The excuse type has been saved."
 msgstr ""

-#: views.py:360
-msgid "The filter has been deleted."
+#: views.py:518
+msgid "The excuse type has been deleted."
 msgstr ""
--- a/aleksis/apps/alsijil/menus.py
+++ b/aleksis/apps/alsijil/menus.py
@@ -31,14 +31,14 @@ MENUS = {
                    "validators": ["menu_generator.validators.is_superuser"],
                },
                {
-                    "name": _("Personal note filters"),
-                    "url": "list_personal_note_filters",
-                    "icon": "filter_list",
+                    "name": _("Excuse types"),
+                    "url": "excuse_types",
+                    "icon": "label",
                    "validators": ["menu_generator.validators.is_superuser"],
                },
                {
-                    "name": _("Excuse types"),
-                    "url": "excuse_types",
+                    "name": _("Extra marks"),
+                    "url": "extra_marks",
                    "icon": "label",
                    "validators": ["menu_generator.validators.is_superuser"],
                },

--- a/aleksis/apps/alsijil/migrations/0003_extra_mark.py
+++ b/aleksis/apps/alsijil/migrations/0003_extra_mark.py
+# Generated by Django 3.0.8 on 2020-07-12 12:43
+
+import django.contrib.postgres.fields.jsonb
+import django.contrib.sites.managers
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("sites", "0002_alter_domain_unique"),
+        ("alsijil", "0002_excuse_type"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="ExtraMark",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                (
+                    "extended_data",
+                    django.contrib.postgres.fields.jsonb.JSONField(
+                        default=dict, editable=False
+                    ),
+                ),
+                (
+                    "short_name",
+                    models.CharField(
+                        max_length=255, unique=True, verbose_name="Short name"
+                    ),
+                ),
+                (
+                    "name",
+                    models.CharField(max_length=255, unique=True, verbose_name="Name"),
+                ),
+                (
+                    "site",
+                    models.ForeignKey(
+                        default=1,
+                        editable=False,
+                        on_delete=django.db.models.deletion.CASCADE,
+                        to="sites.Site",
+                    ),
+                ),
+            ],
+            options={
+                "verbose_name": "Extra mark",
+                "verbose_name_plural": "Extra marks",
+                "ordering": ["short_name"],
+            },
+            managers=[("objects", django.contrib.sites.managers.CurrentSiteManager()),],
+        ),
+        migrations.AddField(
+            model_name="personalnote",
+            name="extra_marks",
+            field=models.ManyToManyField(
+                blank=True,
+                null=True,
+                to="alsijil.ExtraMark",
+                verbose_name="Extra marks",
+            ),
+        ),
+    ]
--- a/aleksis/apps/alsijil/migrations/0004_group_notes.py
+++ b/aleksis/apps/alsijil/migrations/0004_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', '0003_extra_mark'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='lessondocumentation',
+            name='group_note',
+            field=models.CharField(blank=True, max_length=200, verbose_name='Group note'),
+        ),
+    ]
--- a/aleksis/apps/alsijil/migrations/0005_groups_of_person.py
+++ b/aleksis/apps/alsijil/migrations/0005_groups_of_person.py
+# Generated by Django 3.0.8 on 2020-07-22 17:29
+
+from django.db import migrations, models
+
+
+def add_groups(apps, schema_editor):
+    PersonalNote = apps.get_model("alsijil", "PersonalNote")
+
+    db_alias = schema_editor.connection.alias
+
+    for personal_note in PersonalNote.objects.using(db_alias).all():
+        groups = list(personal_note.person.member_of.using(db_alias).all())
+        personal_note.groups_of_person.set(groups)
+        personal_note.save()
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("core", "0003_drop_image_cropping"),
+        ("alsijil", "0004_group_notes"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="personalnote",
+            name="groups_of_person",
+            field=models.ManyToManyField(
+                related_name="_personalnote_groups_of_person_+", to="core.Group"
+            ),
+        ),
+        migrations.RunPython(add_groups),
+    ]
--- a/aleksis/apps/alsijil/migrations/0006_delete_personal_notes_filter.py
+++ b/aleksis/apps/alsijil/migrations/0006_delete_personal_notes_filter.py
+# Generated by Django 3.0.8 on 2020-07-18 15:23
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("alsijil", "0005_groups_of_person"),
+    ]
+
+    operations = [
+        migrations.DeleteModel(name="PersonalNoteFilter",),
+    ]
--- a/aleksis/apps/alsijil/model_extensions.py
+++ b/aleksis/apps/alsijil/model_extensions.py
 from datetime import date
-from typing import Optional, Union
+from typing import Dict, Optional, Union

 from django.db.models import Exists, OuterRef, QuerySet

@@ -8,7 +8,7 @@ from calendarweek import CalendarWeek
 from aleksis.apps.chronos.models import LessonPeriod
 from aleksis.core.models import Group, Person

-from .models import ExcuseType, LessonDocumentation, PersonalNote
+from .models import ExcuseType, ExtraMark, LessonDocumentation, PersonalNote


 @Person.method
@@ -151,3 +151,20 @@ def get_tardinesses(self, week: Optional[CalendarWeek] = None) -> QuerySet:
    if not week:
        week = self.week
    return self.personal_notes.filter(week=week.week, late__gt=0)
+
+
+@LessonPeriod.method
+def get_extra_marks(
+    self, week: Optional[CalendarWeek] = None
+) -> Dict[ExtraMark, QuerySet]:
+    """Get all statistics on extra marks for this lesson."""
+    if not week:
+        week = self.week
+
+    stats = {}
+    for extra_mark in ExtraMark.objects.all():
+        qs = self.personal_notes.filter(week=week.week, extra_marks=extra_mark)
+        if qs:
+            stats[extra_mark] = qs
+
+    return stats
--- a/aleksis/apps/alsijil/models.py
+++ b/aleksis/apps/alsijil/models.py
@@ -42,6 +42,7 @@ class PersonalNote(ExtensibleModel):
    person = models.ForeignKey(
        "core.Person", models.CASCADE, related_name="personal_notes"
    )
+    groups_of_person = models.ManyToManyField("core.Group", related_name="+")

    week = models.IntegerField()
    lesson_period = models.ForeignKey(
@@ -61,6 +62,10 @@ class PersonalNote(ExtensibleModel):

    remarks = models.CharField(max_length=200, blank=True)

+    extra_marks = models.ManyToManyField(
+        "ExtraMark", null=True, blank=True, verbose_name=_("Extra marks")
+    )
+
    def save(self, *args, **kwargs):
        if self.excuse_type:
            self.excused = True
@@ -93,6 +98,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")
@@ -106,24 +112,25 @@ class LessonDocumentation(ExtensibleModel):
        ]


-class PersonalNoteFilter(ExtensibleModel):
-    """A filter definition that can generate statistics on personal note texts."""
+class ExtraMark(ExtensibleModel):
+    """A model for extra marks.

-    identifier = models.CharField(
-        verbose_name=_("Identifier"),
-        max_length=30,
-        validators=[isidentifier],
-        unique=True,
-    )
-    description = models.CharField(
-        verbose_name=_("Description"), max_length=60, blank=True, unique=True
-    )
+    Can be used for lesson-based counting of things (like forgotten homework).
+    """

-    regex = models.CharField(
-        verbose_name=_("Match expression"), max_length=100, unique=True
+    short_name = models.CharField(
+        max_length=255, unique=True, verbose_name=_("Short name")
    )
+    name = models.CharField(max_length=255, unique=True, verbose_name=_("Name"))
+
+    def __str__(self):
+        return f"{self.name}"
+
+    @property
+    def count_label(self):
+        return f"{self.short_name}_count"

    class Meta:
-        verbose_name = _("Personal note filter")
-        verbose_name_plural = _("Personal note filters")
-        ordering = ["identifier"]
+        ordering = ["short_name"]
+        verbose_name = _("Extra mark")
+        verbose_name_plural = _("Extra marks")
--- a/aleksis/apps/alsijil/static/css/alsijil/lesson.css
+++ b/aleksis/apps/alsijil/static/css/alsijil/lesson.css
+.alsijil-check-box {
+    margin-right: 10px;
+}
+
+.alsijil-check-box [type="checkbox"] {
+    padding-left: 30px;
+}
+
 .alsijil-lesson-cancelled {
    text-decoration: line-through;
 }

--- a/aleksis/apps/alsijil/tables.py
+++ b/aleksis/apps/alsijil/tables.py
@@ -4,18 +4,23 @@ import django_tables2 as tables
 from django_tables2.utils import A


-class PersonalNoteFilterTable(tables.Table):
+class ExtraMarkTable(tables.Table):
    class Meta:
        attrs = {"class": "highlight"}

-    identifier = tables.Column()
-    description = tables.Column()
-    regex = tables.Column()
-    edit_filter = tables.LinkColumn(
-        "edit_personal_note_filter",
+    name = tables.LinkColumn("edit_extra_mark", args=[A("id")])
+    short_name = tables.Column()
+    edit = tables.LinkColumn(
+        "edit_extra_mark",
        args=[A("id")],
        text=_("Edit"),
-        attrs={"a": {"class": "btn-flat waves-effect waves-orange"}},
+        attrs={"a": {"class": "btn-flat waves-effect waves-orange orange-text"}},
+    )
+    delete = tables.LinkColumn(
+        "delete_extra_mark",
+        args=[A("id")],
+        text=_("Delete"),
+        attrs={"a": {"class": "btn-flat waves-effect waves-red red-text"}},
    )



--- a/aleksis/apps/alsijil/templates/alsijil/class_register/lesson.html
+++ b/aleksis/apps/alsijil/templates/alsijil/class_register/lesson.html
--- a/aleksis/apps/alsijil/templates/alsijil/class_register/week_view.html
+++ b/aleksis/apps/alsijil/templates/alsijil/class_register/week_view.html
 {# -*- engine:django -*- #}

 {% extends "core/base.html" %}
-{% load material_form i18n week_helpers static %}
+{% load material_form i18n week_helpers static data_helpers %}

 {% block browser_title %}{% blocktrans %}Week view{% endblocktrans %}{% endblock %}

@@ -48,8 +48,12 @@
                <tr>
                  <th></th>
                  <th>{% blocktrans %}Period{% endblocktrans %}</th>
+                  {% if not group %}
+                    <th>{% blocktrans %}Groups{% endblocktrans %}</th>
+                  {% endif %}
                  <th>{% blocktrans %}Subject{% endblocktrans %}</th>
                  <th>{% blocktrans %}Teachers{% endblocktrans %}</th>
+                  <th>{% blocktrans %}Lesson topic{% endblocktrans %}</th>
                </tr>
                </thead>
                <tbody>
@@ -63,6 +67,13 @@
                        {{ period.period.period }}.
                      </a>
                    </td>
+                    {% if not group %}
+                      <td>
+                        <a class="tr-link" href="{% url 'lesson_by_week_and_period' week.year week.week period.id %}">
+                          {{ period.lesson.group_names }}
+                        </a>
+                      </td>
+                    {% endif %}
                    <td>
                      <a class="tr-link" href="{% url 'lesson_by_week_and_period' week.year week.week period.id %}">
                        {{ period.get_subject.name }}
@@ -73,6 +84,11 @@
                        {{ period.get_teacher_names }}
                      </a>
                    </td>
+                    <td>
+                      <a class="tr-link" href="{% url 'lesson_by_week_and_period' week.year week.week period.id %}">
+                        {{ period.get_lesson_documentation.topic }}
+                      </a>
+                    </td>
                  </tr>
                {% endfor %}
                </tbody>
@@ -96,6 +112,11 @@
              <p class="card-text">
                {% trans "Summed up tardiness" %}: {{ person.person.tardiness_sum }}'
              </p>
+              {% for extra_mark in extra_marks %}
+                <p class="card-text">
+                  {{ extra_mark.name }}: {{ person.person|get_dict:extra_mark.count_label }}
+                </p>
+              {% endfor %}
              {% for note in person.personal_notes %}
                {% if note.remarks %}
                  <blockquote>

--- a/aleksis/apps/alsijil/templates/alsijil/extra_mark/create.html
+++ b/aleksis/apps/alsijil/templates/alsijil/extra_mark/create.html
+	{# -*- engine:django -*- #}
+
+	{% extends "core/base.html" %}
+	{% load material_form i18n %}
+
+	{% block browser_title %}{% blocktrans %}Create extra mark{% endblocktrans %}{% endblock %}
+	{% block page_title %}{% blocktrans %}Create extra mark{% endblocktrans %}{% endblock %}
+
+	{% block content %}
+
+	  <form method="post">
+	    {% csrf_token %}
+	    {% form form=form %}{% endform %}
+	    {% include "core/partials/save_button.html" %}
+	  </form>
+
+	{% endblock %}
No results found