CHANGELOG.rst

@@ -15,6 +15,8 @@ Bugfixes
 ~~~~~~~~
 
 * Show lesson documentations in printout again.
+* Allow pages overflowing in printout
+* Show all relevant personal notes in week view.
 
 `1.0a2`_
 --------

biscuit/apps/alsijil/forms.py

@@ -7,7 +7,7 @@ from datetime import datetime
 from biscuit.apps.chronos.models import Room
 from biscuit.core.models import Group, Person
 
-from .models import LessonDocumentation, PersonalNote
+from .models import LessonDocumentation, PersonalNote, PersonalNoteFilter
 
 
 class LessonDocumentationForm(forms.ModelForm):
@@ -53,8 +53,14 @@ PersonalNoteFormSet = forms.modelformset_factory(
 class RegisterAbsenceForm(forms.Form):
     date_start = forms.DateField(label=_('Start date'), widget=forms.SelectDateWidget, initial=datetime.today)
     date_end = forms.DateField(label=_('End date'), widget=forms.SelectDateWidget, initial=datetime.today)
-    starting_lesson = forms.IntegerField(label=_('Starting lesson'), initial=0, min_value=0)
+    from_period = forms.IntegerField(label=_('From period'), initial=0, min_value=0)
     person = forms.ModelChoiceField(label=_('Person'), queryset=Person.objects.all(), widget=Select2Widget)
     absent = forms.BooleanField(label=_('Absent'), initial=True, required=False)
     excused = forms.BooleanField(label=_('Excused'), initial=True, required=False)
     remarks = forms.CharField(label=_('Remarks'), max_length=30, required=False)
+
+
+class PersonalNoteFilterForm(forms.ModelForm):
+    class Meta:
+        model = PersonalNoteFilter
+        fields = ['identifier', 'description', 'regex']

biscuit/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: 2019-11-03 20:09+0100\n"
+"POT-Creation-Date: 2019-11-24 22:45+0100\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"
@@ -19,19 +19,50 @@ msgstr ""
 "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:36
+#: forms.py:38
 msgid "Group"
 msgstr ""
 
-#: forms.py:40 templates/alsijil/print/full_register.html:100
+#: forms.py:42 templates/alsijil/print/full_register.html:104
 msgid "Teacher"
 msgstr ""
 
-#: forms.py:44
+#: forms.py:46
 msgid "Room"
 msgstr ""
 
-#: menus.py:6 templates/alsijil/print/full_register.html:15
+#: forms.py:54
+msgid "Start date"
+msgstr ""
+
+#: forms.py:55
+msgid "End date"
+msgstr ""
+
+#: forms.py:56
+msgid "From period"
+msgstr ""
+
+#: forms.py:57 templates/alsijil/lesson.html:61
+msgid "Person"
+msgstr ""
+
+#: forms.py:58 templates/alsijil/lesson.html:62
+#: templates/alsijil/print/full_register.html:226
+#: templates/alsijil/week_view.html:98
+msgid "Absent"
+msgstr ""
+
+#: forms.py:59 templates/alsijil/lesson.html:64
+msgid "Excused"
+msgstr ""
+
+#: forms.py:60 templates/alsijil/lesson.html:65
+#: templates/alsijil/print/full_register.html:228
+msgid "Remarks"
+msgstr ""
+
+#: menus.py:6 templates/alsijil/print/full_register.html:19
 msgid "Class register"
 msgstr ""
 
@@ -39,18 +70,42 @@ msgstr ""
 msgid "Current lesson"
 msgstr ""
 
-#: menus.py:17 templates/alsijil/week_view.html:6
+#: menus.py:17 templates/alsijil/week_view.html:16
 msgid "Current week"
 msgstr ""
 
-#: models.py:30 templates/alsijil/print/full_register.html:132
+#: menus.py:22
+msgid "Register absence"
+msgstr ""
+
+#: menus.py:27
+msgid "Personal note filters"
+msgstr ""
+
+#: models.py:42 templates/alsijil/print/full_register.html:274
 msgid "Lesson topic"
 msgstr ""
 
-#: models.py:31 templates/alsijil/print/full_register.html:133
+#: models.py:43 templates/alsijil/print/full_register.html:275
 msgid "Homework"
 msgstr ""
 
+#: models.py:54
+msgid "Identifier"
+msgstr ""
+
+#: models.py:56 templates/alsijil/print/full_register.html:181
+msgid "Description"
+msgstr ""
+
+#: models.py:58
+msgid "Match expression"
+msgstr ""
+
+#: tables.py:14
+msgid "Edit"
+msgstr ""
+
 #: templates/alsijil/lesson.html:10 templates/alsijil/lesson.html:34
 msgid "Lesson documentation"
 msgstr ""
@@ -59,44 +114,47 @@ msgstr ""
 msgid "Change history"
 msgstr ""
 
-#: templates/alsijil/lesson.html:54 templates/alsijil/week_view.html:82
+#: templates/alsijil/lesson.html:54 templates/alsijil/week_view.html:92
 msgid "Personal notes"
 msgstr ""
 
-#: templates/alsijil/lesson.html:61
-msgid "Person"
-msgstr ""
-
-#: templates/alsijil/lesson.html:62 templates/alsijil/week_view.html:88
-msgid "Absent"
-msgstr ""
-
 #: templates/alsijil/lesson.html:63
+#: templates/alsijil/print/full_register.html:205
 msgid "Tardiness"
 msgstr ""
 
-#: templates/alsijil/lesson.html:64
-msgid "Excused"
+#: templates/alsijil/lesson.html:81
+#: templates/alsijil/manage_personal_note_filter.html:34
+#: templates/alsijil/manage_personal_note_filters.html:34
+#: templates/alsijil/register_absence.html:25
+msgid "Save"
 msgstr ""
 
-#: templates/alsijil/lesson.html:65
-msgid "Remarks"
+#: templates/alsijil/manage_personal_note_filter.html:15
+#: templates/alsijil/manage_personal_note_filter.html:17
+msgid "Manage personal note filter"
 msgstr ""
 
-#: templates/alsijil/lesson.html:81
-msgid "Save"
+#: templates/alsijil/manage_personal_note_filters.html:15
+#: templates/alsijil/manage_personal_note_filters.html:17
+msgid "Manage personal note filters"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:21
-#: templates/alsijil/print/full_register.html:53
-msgid "Owners"
+#: templates/alsijil/personal_note_filters.html:7
+#: templates/alsijil/personal_note_filters.html:8
+msgid "List of all personal note filters"
 msgstr ""
 
 #: templates/alsijil/print/full_register.html:25
+#: templates/alsijil/print/full_register.html:57
+msgid "Owners"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:29
 msgid "Printed on"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:33
+#: templates/alsijil/print/full_register.html:37
 msgid ""
 "\n"
 "            This printout is intended for archival purposes. The main copy "
@@ -106,7 +164,7 @@ msgid ""
 "          "
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:40
+#: templates/alsijil/print/full_register.html:44
 msgid ""
 "\n"
 "            Copies of the class register, both digital and as printout, "
@@ -117,7 +175,7 @@ msgid ""
 "          "
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:47
+#: templates/alsijil/print/full_register.html:51
 msgid ""
 "\n"
 "            The owner of the group and the headteacher confirm the above, "
@@ -126,129 +184,173 @@ msgid ""
 "          "
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:54
+#: templates/alsijil/print/full_register.html:58
 msgid "Headteacher"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:60
+#: templates/alsijil/print/full_register.html:64
 msgid "Persons in group"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:65
+#: templates/alsijil/print/full_register.html:69
 msgid "No."
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:66
+#: templates/alsijil/print/full_register.html:70
 msgid "Last name"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:67
+#: templates/alsijil/print/full_register.html:71
 msgid "First name"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:68
+#: templates/alsijil/print/full_register.html:72
 msgid "Sex"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:69
+#: templates/alsijil/print/full_register.html:73
 msgid "Date of birth"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:70
+#: templates/alsijil/print/full_register.html:74
+#: templates/alsijil/print/full_register.html:203
 msgid "Absences"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:71
+#: templates/alsijil/print/full_register.html:75
+#: templates/alsijil/print/full_register.html:204
 msgid "Unexcused"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:72
+#: templates/alsijil/print/full_register.html:76
+#: templates/alsijil/print/full_register.html:227
 msgid "Tard."
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:94
+#: templates/alsijil/print/full_register.html:98
 msgid "Teachers and lessons in group"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:99
-#: templates/alsijil/week_view.html:40
+#: templates/alsijil/print/full_register.html:103
+#: templates/alsijil/week_view.html:50
 msgid "Subject"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:101
+#: templates/alsijil/print/full_register.html:105
 msgid "Lesson start"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:102
+#: templates/alsijil/print/full_register.html:106
 msgid "Lesson end"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:103
+#: templates/alsijil/print/full_register.html:107
 msgid "Per week"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:123
-msgid "Lesson documentation for calendar week"
+#: templates/alsijil/print/full_register.html:127
+msgid "Personal overview"
 msgstr ""
 
 #: templates/alsijil/print/full_register.html:129
+msgid "Contact details"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:177
+msgid "Statistics on remarks"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:182
+msgid "Count"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:199
+msgid "Absences and tardiness"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:218
+msgid "Relevant personal notes"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:222
+msgid "Date"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:223
+#: templates/alsijil/print/full_register.html:271
 msgid "Pe."
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:130
+#: templates/alsijil/print/full_register.html:224
+#: templates/alsijil/print/full_register.html:272
 msgid "Subj."
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:131
-msgid "Subs."
+#: templates/alsijil/print/full_register.html:225
+#: templates/alsijil/print/full_register.html:277
+msgid "Te."
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:134
-msgid "Notes"
+#: templates/alsijil/print/full_register.html:243
+msgid "Yes"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:135
-msgid "Te."
+#: templates/alsijil/print/full_register.html:245
+#: templates/alsijil/print/full_register.html:317
+#: templates/alsijil/print/full_register.html:327
+msgid "e"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:265
+msgid "Lesson documentation for calendar week"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:273
+msgid "Subs."
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:162
+#: templates/alsijil/print/full_register.html:276
+msgid "Notes"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:304
 msgid "Lesson cancelled"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:175
-#: templates/alsijil/print/full_register.html:185
-msgid "e"
+#: templates/alsijil/register_absence.html:15
+#: templates/alsijil/register_absence.html:17
+msgid "Manage absence"
 msgstr ""
 
-#: templates/alsijil/week_view.html:15
+#: templates/alsijil/week_view.html:25
 msgid "Select"
 msgstr ""
 
-#: templates/alsijil/week_view.html:30
+#: templates/alsijil/week_view.html:40
 msgid "Lessons"
 msgstr ""
 
-#: templates/alsijil/week_view.html:39
+#: templates/alsijil/week_view.html:49
 msgid "Period"
 msgstr ""
 
-#: templates/alsijil/week_view.html:41
+#: templates/alsijil/week_view.html:51
 msgid "Teachers"
 msgstr ""
 
-#: templates/alsijil/week_view.html:89
+#: templates/alsijil/week_view.html:99
 msgid "unexcused"
 msgstr ""
 
-#: templates/alsijil/week_view.html:92
+#: templates/alsijil/week_view.html:102
 msgid "Summed up tardiness"
 msgstr ""
 
-#: templates/alsijil/week_view.html:113
+#: templates/alsijil/week_view.html:123
 msgid "No group selected"
 msgstr ""
 
-#: templates/alsijil/week_view.html:117
+#: templates/alsijil/week_view.html:127
 msgid ""
 "\n"
 "            There are no lessons for the selected group, teacher, room or "
@@ -256,14 +358,26 @@ msgid ""
 "          "
 msgstr ""
 
-#: views.py:36
+#: views.py:41
 msgid ""
 "You either selected an invalid lesson or there is currently no lesson in "
 "progress."
 msgstr ""
 
-#: views.py:39
+#: views.py:44
 msgid ""
 "You are not allowed to create a lesson documentation for a lesson in the "
 "future."
 msgstr ""
+
+#: views.py:247
+msgid "The absence has been saved."
+msgstr ""
+
+#: views.py:285
+msgid "The filter has been saved"
+msgstr ""
+
+#: views.py:300
+msgid "The filter has been deleted."
+msgstr ""

biscuit/apps/alsijil/locale/de_DE/LC_MESSAGES/django.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-03 20:09+0100\n"
-"PO-Revision-Date: 2019-11-05 16:37+0000\n"
+"POT-Creation-Date: 2019-11-24 22:45+0100\n"
+"PO-Revision-Date: 2019-11-24 21:56+0000\n"
 "Last-Translator: Tom Teichler <tom.teichler@teckids.org>\n"
 "Language-Team: German <https://translate.edugit.org/projects/biscuit-sis/"
 "biscuit-app-alsijil/de/>\n"
@@ -19,19 +19,50 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.8\n"
 
-#: forms.py:36
+#: forms.py:38
 msgid "Group"
 msgstr "Gruppe"
 
-#: forms.py:40 templates/alsijil/print/full_register.html:100
+#: forms.py:42 templates/alsijil/print/full_register.html:104
 msgid "Teacher"
 msgstr "Lehrkraft"
 
-#: forms.py:44
+#: forms.py:46
 msgid "Room"
 msgstr "Raum"
 
-#: menus.py:6 templates/alsijil/print/full_register.html:15
+#: forms.py:54
+msgid "Start date"
+msgstr "Startdatum"
+
+#: forms.py:55
+msgid "End date"
+msgstr "Enddatum"
+
+#: forms.py:56
+msgid "From period"
+msgstr "Ab Stunde"
+
+#: forms.py:57 templates/alsijil/lesson.html:61
+msgid "Person"
+msgstr "Person"
+
+#: forms.py:58 templates/alsijil/lesson.html:62
+#: templates/alsijil/print/full_register.html:226
+#: templates/alsijil/week_view.html:98
+msgid "Absent"
+msgstr "Abwesend"
+
+#: forms.py:59 templates/alsijil/lesson.html:64
+msgid "Excused"
+msgstr "Entschuldigt"
+
+#: forms.py:60 templates/alsijil/lesson.html:65
+#: templates/alsijil/print/full_register.html:228
+msgid "Remarks"
+msgstr "Bemerkungen"
+
+#: menus.py:6 templates/alsijil/print/full_register.html:19
 msgid "Class register"
 msgstr "Klassenbuch"
 
@@ -39,18 +70,42 @@ msgstr "Klassenbuch"
 msgid "Current lesson"
 msgstr "Aktuelle Unterrichtsstunde"
 
-#: menus.py:17 templates/alsijil/week_view.html:6
+#: menus.py:17 templates/alsijil/week_view.html:16
 msgid "Current week"
 msgstr "Aktuelle Woche"
 
-#: models.py:30 templates/alsijil/print/full_register.html:132
+#: menus.py:22
+msgid "Register absence"
+msgstr "Abwesenheit eintragen"
+
+#: menus.py:27
+msgid "Personal note filters"
+msgstr "Filter für persönliche Notizen"
+
+#: models.py:42 templates/alsijil/print/full_register.html:274
 msgid "Lesson topic"
 msgstr "Stundenthema"
 
-#: models.py:31 templates/alsijil/print/full_register.html:133
+#: models.py:43 templates/alsijil/print/full_register.html:275
 msgid "Homework"
 msgstr "Hausaufgaben"
 
+#: models.py:54
+msgid "Identifier"
+msgstr "Kennung"
+
+#: models.py:56 templates/alsijil/print/full_register.html:181
+msgid "Description"
+msgstr "Beschreibung"
+
+#: models.py:58
+msgid "Match expression"
+msgstr "Suchausdruck"
+
+#: tables.py:14
+msgid "Edit"
+msgstr "Bearbeiten"
+
 #: templates/alsijil/lesson.html:10 templates/alsijil/lesson.html:34
 msgid "Lesson documentation"
 msgstr "Stunden-Dokumentation"
@@ -59,44 +114,47 @@ msgstr "Stunden-Dokumentation"
 msgid "Change history"
 msgstr "Veränderungen"
 
-#: templates/alsijil/lesson.html:54 templates/alsijil/week_view.html:82
+#: templates/alsijil/lesson.html:54 templates/alsijil/week_view.html:92
 msgid "Personal notes"
 msgstr "Persönliche Notizen"
 
-#: templates/alsijil/lesson.html:61
-msgid "Person"
-msgstr "Person"
-
-#: templates/alsijil/lesson.html:62 templates/alsijil/week_view.html:88
-msgid "Absent"
-msgstr "Abwesend"
-
 #: templates/alsijil/lesson.html:63
+#: templates/alsijil/print/full_register.html:205
 msgid "Tardiness"
 msgstr "Verspätung"
 
-#: templates/alsijil/lesson.html:64
-msgid "Excused"
-msgstr "Entschuldigt"
-
-#: templates/alsijil/lesson.html:65
-msgid "Remarks"
-msgstr "Bemerkungen"
-
 #: templates/alsijil/lesson.html:81
+#: templates/alsijil/manage_personal_note_filter.html:34
+#: templates/alsijil/manage_personal_note_filters.html:34
+#: templates/alsijil/register_absence.html:25
 msgid "Save"
 msgstr "Speichern"
 
-#: templates/alsijil/print/full_register.html:21
-#: templates/alsijil/print/full_register.html:53
+#: templates/alsijil/manage_personal_note_filter.html:15
+#: templates/alsijil/manage_personal_note_filter.html:17
+msgid "Manage personal note filter"
+msgstr "Filter für persönliche Notizen verwalten"
+
+#: templates/alsijil/manage_personal_note_filters.html:15
+#: templates/alsijil/manage_personal_note_filters.html:17
+msgid "Manage personal note filters"
+msgstr "Filter für persönliche Notizen verwalten"
+
+#: templates/alsijil/personal_note_filters.html:7
+#: templates/alsijil/personal_note_filters.html:8
+msgid "List of all personal note filters"
+msgstr "Liste aller Filter für persönliche Notizen"
+
+#: templates/alsijil/print/full_register.html:25
+#: templates/alsijil/print/full_register.html:57
 msgid "Owners"
 msgstr "Leiter/-innen"
 
-#: templates/alsijil/print/full_register.html:25
+#: templates/alsijil/print/full_register.html:29
 msgid "Printed on"
 msgstr "Gedruckt am"
 
-#: templates/alsijil/print/full_register.html:33
+#: templates/alsijil/print/full_register.html:37
 msgid ""
 "\n"
 "            This printout is intended for archival purposes. The main copy "
@@ -112,7 +170,7 @@ msgstr ""
 "gespeichert.\n"
 "          "
 
-#: templates/alsijil/print/full_register.html:40
+#: templates/alsijil/print/full_register.html:44
 msgid ""
 "\n"
 "            Copies of the class register, both digital and as printout, "
@@ -130,7 +188,7 @@ msgstr ""
 "            gespeichert werden.\n"
 "          "
 
-#: templates/alsijil/print/full_register.html:47
+#: templates/alsijil/print/full_register.html:51
 msgid ""
 "\n"
 "            The owner of the group and the headteacher confirm the above, "
@@ -144,129 +202,173 @@ msgstr ""
 "            die Richtigkeit des Ausdrucks.\n"
 "          "
 
-#: templates/alsijil/print/full_register.html:54
+#: templates/alsijil/print/full_register.html:58
 msgid "Headteacher"
 msgstr "Schulleitung"
 
-#: templates/alsijil/print/full_register.html:60
+#: templates/alsijil/print/full_register.html:64
 msgid "Persons in group"
 msgstr "Personen in der Gruppe"
 
-#: templates/alsijil/print/full_register.html:65
+#: templates/alsijil/print/full_register.html:69
 msgid "No."
 msgstr "Nr."
 
-#: templates/alsijil/print/full_register.html:66
+#: templates/alsijil/print/full_register.html:70
 msgid "Last name"
 msgstr "Nachname"
 
-#: templates/alsijil/print/full_register.html:67
+#: templates/alsijil/print/full_register.html:71
 msgid "First name"
 msgstr "Vorname"
 
-#: templates/alsijil/print/full_register.html:68
+#: templates/alsijil/print/full_register.html:72
 msgid "Sex"
 msgstr "Geschlecht"
 
-#: templates/alsijil/print/full_register.html:69
+#: templates/alsijil/print/full_register.html:73
 msgid "Date of birth"
 msgstr "Geburtsdatum"
 
-#: templates/alsijil/print/full_register.html:70
+#: templates/alsijil/print/full_register.html:74
+#: templates/alsijil/print/full_register.html:203
 msgid "Absences"
 msgstr "Abwesenheiten"
 
-#: templates/alsijil/print/full_register.html:71
+#: templates/alsijil/print/full_register.html:75
+#: templates/alsijil/print/full_register.html:204
 msgid "Unexcused"
 msgstr "Unentschuldigt"
 
-#: templates/alsijil/print/full_register.html:72
+#: templates/alsijil/print/full_register.html:76
+#: templates/alsijil/print/full_register.html:227
 msgid "Tard."
 msgstr "Verspät."
 
-#: templates/alsijil/print/full_register.html:94
+#: templates/alsijil/print/full_register.html:98
 msgid "Teachers and lessons in group"
 msgstr "Lehrkräfte und Fächer der Gruppe"
 
-#: templates/alsijil/print/full_register.html:99
-#: templates/alsijil/week_view.html:40
+#: templates/alsijil/print/full_register.html:103
+#: templates/alsijil/week_view.html:50
 msgid "Subject"
 msgstr "Fach"
 
-#: templates/alsijil/print/full_register.html:101
+#: templates/alsijil/print/full_register.html:105
 msgid "Lesson start"
 msgstr "Unterrichtsbeginn"
 
-#: templates/alsijil/print/full_register.html:102
+#: templates/alsijil/print/full_register.html:106
 msgid "Lesson end"
 msgstr "Unterrichtsende"
 
-#: templates/alsijil/print/full_register.html:103
+#: templates/alsijil/print/full_register.html:107
 msgid "Per week"
 msgstr "Pro Woche"
 
-#: templates/alsijil/print/full_register.html:123
-msgid "Lesson documentation for calendar week"
-msgstr "Unterrichtsdokumentation für Kalenderwoche"
+#: templates/alsijil/print/full_register.html:127
+msgid "Personal overview"
+msgstr "Persönliche Übersicht"
 
 #: templates/alsijil/print/full_register.html:129
+msgid "Contact details"
+msgstr "Kontaktdetails"
+
+#: templates/alsijil/print/full_register.html:177
+msgid "Statistics on remarks"
+msgstr "Statistiken zu Bemerkungen"
+
+#: templates/alsijil/print/full_register.html:182
+msgid "Count"
+msgstr "Anzahl"
+
+#: templates/alsijil/print/full_register.html:199
+msgid "Absences and tardiness"
+msgstr "Abwesenheiten und Verspätungen"
+
+#: templates/alsijil/print/full_register.html:218
+msgid "Relevant personal notes"
+msgstr "Relevante persönliche Notizen"
+
+#: templates/alsijil/print/full_register.html:222
+msgid "Date"
+msgstr "Datum"
+
+#: templates/alsijil/print/full_register.html:223
+#: templates/alsijil/print/full_register.html:271
 msgid "Pe."
 msgstr "Std."
 
-#: templates/alsijil/print/full_register.html:130
+#: templates/alsijil/print/full_register.html:224
+#: templates/alsijil/print/full_register.html:272
 msgid "Subj."
 msgstr "Fa."
 
-#: templates/alsijil/print/full_register.html:131
+#: templates/alsijil/print/full_register.html:225
+#: templates/alsijil/print/full_register.html:277
+msgid "Te."
+msgstr "Lk."
+
+#: templates/alsijil/print/full_register.html:243
+msgid "Yes"
+msgstr "Ja"
+
+#: templates/alsijil/print/full_register.html:245
+#: templates/alsijil/print/full_register.html:317
+#: templates/alsijil/print/full_register.html:327
+msgid "e"
+msgstr "e"
+
+#: templates/alsijil/print/full_register.html:265
+msgid "Lesson documentation for calendar week"
+msgstr "Unterrichtsdokumentation für Kalenderwoche"
+
+#: templates/alsijil/print/full_register.html:273
 msgid "Subs."
 msgstr "Vertr."
 
-#: templates/alsijil/print/full_register.html:134
+#: templates/alsijil/print/full_register.html:276
 msgid "Notes"
 msgstr "Notizen"
 
-#: templates/alsijil/print/full_register.html:135
-msgid "Te."
-msgstr "Lk."
-
-#: templates/alsijil/print/full_register.html:162
+#: templates/alsijil/print/full_register.html:304
 msgid "Lesson cancelled"
 msgstr "Stunde ist ausgefallen"
 
-#: templates/alsijil/print/full_register.html:175
-#: templates/alsijil/print/full_register.html:185
-msgid "e"
-msgstr "e"
+#: templates/alsijil/register_absence.html:15
+#: templates/alsijil/register_absence.html:17
+msgid "Manage absence"
+msgstr "Abwesenheiten verwalten"
 
-#: templates/alsijil/week_view.html:15
+#: templates/alsijil/week_view.html:25
 msgid "Select"
 msgstr "Auswählen"
 
-#: templates/alsijil/week_view.html:30
+#: templates/alsijil/week_view.html:40
 msgid "Lessons"
 msgstr "Unterrichtsstunden"
 
-#: templates/alsijil/week_view.html:39
+#: templates/alsijil/week_view.html:49
 msgid "Period"
 msgstr "Stunde"
 
-#: templates/alsijil/week_view.html:41
+#: templates/alsijil/week_view.html:51
 msgid "Teachers"
 msgstr "Lehrkräfte"
 
-#: templates/alsijil/week_view.html:89
+#: templates/alsijil/week_view.html:99
 msgid "unexcused"
 msgstr "unentschuldigt"
 
-#: templates/alsijil/week_view.html:92
+#: templates/alsijil/week_view.html:102
 msgid "Summed up tardiness"
 msgstr "Summierte Verspätung"
 
-#: templates/alsijil/week_view.html:113
+#: templates/alsijil/week_view.html:123
 msgid "No group selected"
 msgstr "Keine Gruppe ausgewählt"
 
-#: templates/alsijil/week_view.html:117
+#: templates/alsijil/week_view.html:127
 msgid ""
 "\n"
 "            There are no lessons for the selected group, teacher, room or "
@@ -278,7 +380,7 @@ msgstr ""
 "oder Raum.\n"
 "          "
 
-#: views.py:36
+#: views.py:41
 msgid ""
 "You either selected an invalid lesson or there is currently no lesson in "
 "progress."
@@ -286,7 +388,7 @@ msgstr ""
 "Sie haben eine ungültige Stunde ausgewählt oder es\n"
 "      läuft momentan keine Stunde."
 
-#: views.py:39
+#: views.py:44
 msgid ""
 "You are not allowed to create a lesson documentation for a lesson in the "
 "future."
@@ -294,6 +396,23 @@ msgstr ""
 "Ihnen ist es nicht erlaubt, eine Eintragung für eine Unterrichtsstunde in "
 "der Zukunft vorzunehmen."
 
+#: views.py:247
+msgid "The absence has been saved."
+msgstr "Die Abwesenheit wurde gespeichert."
+
+#: views.py:285
+msgid "The filter has been saved"
+msgstr "Der Filter wurde gespeichert"
+
+#: views.py:300
+msgid "The filter has been deleted."
+msgstr "Der Filter wurde gespeichert."
+
+#, fuzzy
+#~| msgid "Current lesson"
+#~ msgid "Starting lesson"
+#~ msgstr "Aktuelle Unterrichtsstunde"
+
 #~ msgid "Week"
 #~ msgstr "Woche"
 

biscuit/apps/alsijil/locale/fr/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-03 20:09+0100\n"
+"POT-Creation-Date: 2019-11-24 22:45+0100\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"
@@ -18,19 +18,50 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: forms.py:36
+#: forms.py:38
 msgid "Group"
 msgstr ""
 
-#: forms.py:40 templates/alsijil/print/full_register.html:100
+#: forms.py:42 templates/alsijil/print/full_register.html:104
 msgid "Teacher"
 msgstr ""
 
-#: forms.py:44
+#: forms.py:46
 msgid "Room"
 msgstr ""
 
-#: menus.py:6 templates/alsijil/print/full_register.html:15
+#: forms.py:54
+msgid "Start date"
+msgstr ""
+
+#: forms.py:55
+msgid "End date"
+msgstr ""
+
+#: forms.py:56
+msgid "From period"
+msgstr ""
+
+#: forms.py:57 templates/alsijil/lesson.html:61
+msgid "Person"
+msgstr ""
+
+#: forms.py:58 templates/alsijil/lesson.html:62
+#: templates/alsijil/print/full_register.html:226
+#: templates/alsijil/week_view.html:98
+msgid "Absent"
+msgstr ""
+
+#: forms.py:59 templates/alsijil/lesson.html:64
+msgid "Excused"
+msgstr ""
+
+#: forms.py:60 templates/alsijil/lesson.html:65
+#: templates/alsijil/print/full_register.html:228
+msgid "Remarks"
+msgstr ""
+
+#: menus.py:6 templates/alsijil/print/full_register.html:19
 msgid "Class register"
 msgstr ""
 
@@ -38,18 +69,42 @@ msgstr ""
 msgid "Current lesson"
 msgstr ""
 
-#: menus.py:17 templates/alsijil/week_view.html:6
+#: menus.py:17 templates/alsijil/week_view.html:16
 msgid "Current week"
 msgstr ""
 
-#: models.py:30 templates/alsijil/print/full_register.html:132
+#: menus.py:22
+msgid "Register absence"
+msgstr ""
+
+#: menus.py:27
+msgid "Personal note filters"
+msgstr ""
+
+#: models.py:42 templates/alsijil/print/full_register.html:274
 msgid "Lesson topic"
 msgstr ""
 
-#: models.py:31 templates/alsijil/print/full_register.html:133
+#: models.py:43 templates/alsijil/print/full_register.html:275
 msgid "Homework"
 msgstr ""
 
+#: models.py:54
+msgid "Identifier"
+msgstr ""
+
+#: models.py:56 templates/alsijil/print/full_register.html:181
+msgid "Description"
+msgstr ""
+
+#: models.py:58
+msgid "Match expression"
+msgstr ""
+
+#: tables.py:14
+msgid "Edit"
+msgstr ""
+
 #: templates/alsijil/lesson.html:10 templates/alsijil/lesson.html:34
 msgid "Lesson documentation"
 msgstr ""
@@ -58,44 +113,47 @@ msgstr ""
 msgid "Change history"
 msgstr ""
 
-#: templates/alsijil/lesson.html:54 templates/alsijil/week_view.html:82
+#: templates/alsijil/lesson.html:54 templates/alsijil/week_view.html:92
 msgid "Personal notes"
 msgstr ""
 
-#: templates/alsijil/lesson.html:61
-msgid "Person"
-msgstr ""
-
-#: templates/alsijil/lesson.html:62 templates/alsijil/week_view.html:88
-msgid "Absent"
-msgstr ""
-
 #: templates/alsijil/lesson.html:63
+#: templates/alsijil/print/full_register.html:205
 msgid "Tardiness"
 msgstr ""
 
-#: templates/alsijil/lesson.html:64
-msgid "Excused"
+#: templates/alsijil/lesson.html:81
+#: templates/alsijil/manage_personal_note_filter.html:34
+#: templates/alsijil/manage_personal_note_filters.html:34
+#: templates/alsijil/register_absence.html:25
+msgid "Save"
 msgstr ""
 
-#: templates/alsijil/lesson.html:65
-msgid "Remarks"
+#: templates/alsijil/manage_personal_note_filter.html:15
+#: templates/alsijil/manage_personal_note_filter.html:17
+msgid "Manage personal note filter"
 msgstr ""
 
-#: templates/alsijil/lesson.html:81
-msgid "Save"
+#: templates/alsijil/manage_personal_note_filters.html:15
+#: templates/alsijil/manage_personal_note_filters.html:17
+msgid "Manage personal note filters"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:21
-#: templates/alsijil/print/full_register.html:53
-msgid "Owners"
+#: templates/alsijil/personal_note_filters.html:7
+#: templates/alsijil/personal_note_filters.html:8
+msgid "List of all personal note filters"
 msgstr ""
 
 #: templates/alsijil/print/full_register.html:25
+#: templates/alsijil/print/full_register.html:57
+msgid "Owners"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:29
 msgid "Printed on"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:33
+#: templates/alsijil/print/full_register.html:37
 msgid ""
 "\n"
 "            This printout is intended for archival purposes. The main copy "
@@ -105,7 +163,7 @@ msgid ""
 "          "
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:40
+#: templates/alsijil/print/full_register.html:44
 msgid ""
 "\n"
 "            Copies of the class register, both digital and as printout, "
@@ -116,7 +174,7 @@ msgid ""
 "          "
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:47
+#: templates/alsijil/print/full_register.html:51
 msgid ""
 "\n"
 "            The owner of the group and the headteacher confirm the above, "
@@ -125,129 +183,173 @@ msgid ""
 "          "
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:54
+#: templates/alsijil/print/full_register.html:58
 msgid "Headteacher"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:60
+#: templates/alsijil/print/full_register.html:64
 msgid "Persons in group"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:65
+#: templates/alsijil/print/full_register.html:69
 msgid "No."
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:66
+#: templates/alsijil/print/full_register.html:70
 msgid "Last name"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:67
+#: templates/alsijil/print/full_register.html:71
 msgid "First name"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:68
+#: templates/alsijil/print/full_register.html:72
 msgid "Sex"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:69
+#: templates/alsijil/print/full_register.html:73
 msgid "Date of birth"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:70
+#: templates/alsijil/print/full_register.html:74
+#: templates/alsijil/print/full_register.html:203
 msgid "Absences"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:71
+#: templates/alsijil/print/full_register.html:75
+#: templates/alsijil/print/full_register.html:204
 msgid "Unexcused"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:72
+#: templates/alsijil/print/full_register.html:76
+#: templates/alsijil/print/full_register.html:227
 msgid "Tard."
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:94
+#: templates/alsijil/print/full_register.html:98
 msgid "Teachers and lessons in group"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:99
-#: templates/alsijil/week_view.html:40
+#: templates/alsijil/print/full_register.html:103
+#: templates/alsijil/week_view.html:50
 msgid "Subject"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:101
+#: templates/alsijil/print/full_register.html:105
 msgid "Lesson start"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:102
+#: templates/alsijil/print/full_register.html:106
 msgid "Lesson end"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:103
+#: templates/alsijil/print/full_register.html:107
 msgid "Per week"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:123
-msgid "Lesson documentation for calendar week"
+#: templates/alsijil/print/full_register.html:127
+msgid "Personal overview"
 msgstr ""
 
 #: templates/alsijil/print/full_register.html:129
+msgid "Contact details"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:177
+msgid "Statistics on remarks"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:182
+msgid "Count"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:199
+msgid "Absences and tardiness"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:218
+msgid "Relevant personal notes"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:222
+msgid "Date"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:223
+#: templates/alsijil/print/full_register.html:271
 msgid "Pe."
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:130
+#: templates/alsijil/print/full_register.html:224
+#: templates/alsijil/print/full_register.html:272
 msgid "Subj."
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:131
-msgid "Subs."
+#: templates/alsijil/print/full_register.html:225
+#: templates/alsijil/print/full_register.html:277
+msgid "Te."
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:134
-msgid "Notes"
+#: templates/alsijil/print/full_register.html:243
+msgid "Yes"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:135
-msgid "Te."
+#: templates/alsijil/print/full_register.html:245
+#: templates/alsijil/print/full_register.html:317
+#: templates/alsijil/print/full_register.html:327
+msgid "e"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:265
+msgid "Lesson documentation for calendar week"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:273
+msgid "Subs."
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:162
+#: templates/alsijil/print/full_register.html:276
+msgid "Notes"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:304
 msgid "Lesson cancelled"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:175
-#: templates/alsijil/print/full_register.html:185
-msgid "e"
+#: templates/alsijil/register_absence.html:15
+#: templates/alsijil/register_absence.html:17
+msgid "Manage absence"
 msgstr ""
 
-#: templates/alsijil/week_view.html:15
+#: templates/alsijil/week_view.html:25
 msgid "Select"
 msgstr ""
 
-#: templates/alsijil/week_view.html:30
+#: templates/alsijil/week_view.html:40
 msgid "Lessons"
 msgstr ""
 
-#: templates/alsijil/week_view.html:39
+#: templates/alsijil/week_view.html:49
 msgid "Period"
 msgstr ""
 
-#: templates/alsijil/week_view.html:41
+#: templates/alsijil/week_view.html:51
 msgid "Teachers"
 msgstr ""
 
-#: templates/alsijil/week_view.html:89
+#: templates/alsijil/week_view.html:99
 msgid "unexcused"
 msgstr ""
 
-#: templates/alsijil/week_view.html:92
+#: templates/alsijil/week_view.html:102
 msgid "Summed up tardiness"
 msgstr ""
 
-#: templates/alsijil/week_view.html:113
+#: templates/alsijil/week_view.html:123
 msgid "No group selected"
 msgstr ""
 
-#: templates/alsijil/week_view.html:117
+#: templates/alsijil/week_view.html:127
 msgid ""
 "\n"
 "            There are no lessons for the selected group, teacher, room or "
@@ -255,14 +357,26 @@ msgid ""
 "          "
 msgstr ""
 
-#: views.py:36
+#: views.py:41
 msgid ""
 "You either selected an invalid lesson or there is currently no lesson in "
 "progress."
 msgstr ""
 
-#: views.py:39
+#: views.py:44
 msgid ""
 "You are not allowed to create a lesson documentation for a lesson in the "
 "future."
 msgstr ""
+
+#: views.py:247
+msgid "The absence has been saved."
+msgstr ""
+
+#: views.py:285
+msgid "The filter has been saved"
+msgstr ""
+
+#: views.py:300
+msgid "The filter has been deleted."
+msgstr ""

biscuit/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: 2019-11-03 20:09+0100\n"
+"POT-Creation-Date: 2019-11-24 22:45+0100\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,19 +17,50 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: forms.py:36
+#: forms.py:38
 msgid "Group"
 msgstr ""
 
-#: forms.py:40 templates/alsijil/print/full_register.html:100
+#: forms.py:42 templates/alsijil/print/full_register.html:104
 msgid "Teacher"
 msgstr ""
 
-#: forms.py:44
+#: forms.py:46
 msgid "Room"
 msgstr ""
 
-#: menus.py:6 templates/alsijil/print/full_register.html:15
+#: forms.py:54
+msgid "Start date"
+msgstr ""
+
+#: forms.py:55
+msgid "End date"
+msgstr ""
+
+#: forms.py:56
+msgid "From period"
+msgstr ""
+
+#: forms.py:57 templates/alsijil/lesson.html:61
+msgid "Person"
+msgstr ""
+
+#: forms.py:58 templates/alsijil/lesson.html:62
+#: templates/alsijil/print/full_register.html:226
+#: templates/alsijil/week_view.html:98
+msgid "Absent"
+msgstr ""
+
+#: forms.py:59 templates/alsijil/lesson.html:64
+msgid "Excused"
+msgstr ""
+
+#: forms.py:60 templates/alsijil/lesson.html:65
+#: templates/alsijil/print/full_register.html:228
+msgid "Remarks"
+msgstr ""
+
+#: menus.py:6 templates/alsijil/print/full_register.html:19
 msgid "Class register"
 msgstr ""
 
@@ -37,18 +68,42 @@ msgstr ""
 msgid "Current lesson"
 msgstr ""
 
-#: menus.py:17 templates/alsijil/week_view.html:6
+#: menus.py:17 templates/alsijil/week_view.html:16
 msgid "Current week"
 msgstr ""
 
-#: models.py:30 templates/alsijil/print/full_register.html:132
+#: menus.py:22
+msgid "Register absence"
+msgstr ""
+
+#: menus.py:27
+msgid "Personal note filters"
+msgstr ""
+
+#: models.py:42 templates/alsijil/print/full_register.html:274
 msgid "Lesson topic"
 msgstr ""
 
-#: models.py:31 templates/alsijil/print/full_register.html:133
+#: models.py:43 templates/alsijil/print/full_register.html:275
 msgid "Homework"
 msgstr ""
 
+#: models.py:54
+msgid "Identifier"
+msgstr ""
+
+#: models.py:56 templates/alsijil/print/full_register.html:181
+msgid "Description"
+msgstr ""
+
+#: models.py:58
+msgid "Match expression"
+msgstr ""
+
+#: tables.py:14
+msgid "Edit"
+msgstr ""
+
 #: templates/alsijil/lesson.html:10 templates/alsijil/lesson.html:34
 msgid "Lesson documentation"
 msgstr ""
@@ -57,44 +112,47 @@ msgstr ""
 msgid "Change history"
 msgstr ""
 
-#: templates/alsijil/lesson.html:54 templates/alsijil/week_view.html:82
+#: templates/alsijil/lesson.html:54 templates/alsijil/week_view.html:92
 msgid "Personal notes"
 msgstr ""
 
-#: templates/alsijil/lesson.html:61
-msgid "Person"
-msgstr ""
-
-#: templates/alsijil/lesson.html:62 templates/alsijil/week_view.html:88
-msgid "Absent"
-msgstr ""
-
 #: templates/alsijil/lesson.html:63
+#: templates/alsijil/print/full_register.html:205
 msgid "Tardiness"
 msgstr ""
 
-#: templates/alsijil/lesson.html:64
-msgid "Excused"
+#: templates/alsijil/lesson.html:81
+#: templates/alsijil/manage_personal_note_filter.html:34
+#: templates/alsijil/manage_personal_note_filters.html:34
+#: templates/alsijil/register_absence.html:25
+msgid "Save"
 msgstr ""
 
-#: templates/alsijil/lesson.html:65
-msgid "Remarks"
+#: templates/alsijil/manage_personal_note_filter.html:15
+#: templates/alsijil/manage_personal_note_filter.html:17
+msgid "Manage personal note filter"
 msgstr ""
 
-#: templates/alsijil/lesson.html:81
-msgid "Save"
+#: templates/alsijil/manage_personal_note_filters.html:15
+#: templates/alsijil/manage_personal_note_filters.html:17
+msgid "Manage personal note filters"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:21
-#: templates/alsijil/print/full_register.html:53
-msgid "Owners"
+#: templates/alsijil/personal_note_filters.html:7
+#: templates/alsijil/personal_note_filters.html:8
+msgid "List of all personal note filters"
 msgstr ""
 
 #: templates/alsijil/print/full_register.html:25
+#: templates/alsijil/print/full_register.html:57
+msgid "Owners"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:29
 msgid "Printed on"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:33
+#: templates/alsijil/print/full_register.html:37
 msgid ""
 "\n"
 "            This printout is intended for archival purposes. The main copy "
@@ -104,7 +162,7 @@ msgid ""
 "          "
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:40
+#: templates/alsijil/print/full_register.html:44
 msgid ""
 "\n"
 "            Copies of the class register, both digital and as printout, "
@@ -115,7 +173,7 @@ msgid ""
 "          "
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:47
+#: templates/alsijil/print/full_register.html:51
 msgid ""
 "\n"
 "            The owner of the group and the headteacher confirm the above, "
@@ -124,129 +182,173 @@ msgid ""
 "          "
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:54
+#: templates/alsijil/print/full_register.html:58
 msgid "Headteacher"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:60
+#: templates/alsijil/print/full_register.html:64
 msgid "Persons in group"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:65
+#: templates/alsijil/print/full_register.html:69
 msgid "No."
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:66
+#: templates/alsijil/print/full_register.html:70
 msgid "Last name"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:67
+#: templates/alsijil/print/full_register.html:71
 msgid "First name"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:68
+#: templates/alsijil/print/full_register.html:72
 msgid "Sex"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:69
+#: templates/alsijil/print/full_register.html:73
 msgid "Date of birth"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:70
+#: templates/alsijil/print/full_register.html:74
+#: templates/alsijil/print/full_register.html:203
 msgid "Absences"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:71
+#: templates/alsijil/print/full_register.html:75
+#: templates/alsijil/print/full_register.html:204
 msgid "Unexcused"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:72
+#: templates/alsijil/print/full_register.html:76
+#: templates/alsijil/print/full_register.html:227
 msgid "Tard."
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:94
+#: templates/alsijil/print/full_register.html:98
 msgid "Teachers and lessons in group"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:99
-#: templates/alsijil/week_view.html:40
+#: templates/alsijil/print/full_register.html:103
+#: templates/alsijil/week_view.html:50
 msgid "Subject"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:101
+#: templates/alsijil/print/full_register.html:105
 msgid "Lesson start"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:102
+#: templates/alsijil/print/full_register.html:106
 msgid "Lesson end"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:103
+#: templates/alsijil/print/full_register.html:107
 msgid "Per week"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:123
-msgid "Lesson documentation for calendar week"
+#: templates/alsijil/print/full_register.html:127
+msgid "Personal overview"
 msgstr ""
 
 #: templates/alsijil/print/full_register.html:129
+msgid "Contact details"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:177
+msgid "Statistics on remarks"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:182
+msgid "Count"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:199
+msgid "Absences and tardiness"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:218
+msgid "Relevant personal notes"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:222
+msgid "Date"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:223
+#: templates/alsijil/print/full_register.html:271
 msgid "Pe."
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:130
+#: templates/alsijil/print/full_register.html:224
+#: templates/alsijil/print/full_register.html:272
 msgid "Subj."
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:131
-msgid "Subs."
+#: templates/alsijil/print/full_register.html:225
+#: templates/alsijil/print/full_register.html:277
+msgid "Te."
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:134
-msgid "Notes"
+#: templates/alsijil/print/full_register.html:243
+msgid "Yes"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:135
-msgid "Te."
+#: templates/alsijil/print/full_register.html:245
+#: templates/alsijil/print/full_register.html:317
+#: templates/alsijil/print/full_register.html:327
+msgid "e"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:265
+msgid "Lesson documentation for calendar week"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:273
+msgid "Subs."
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:162
+#: templates/alsijil/print/full_register.html:276
+msgid "Notes"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:304
 msgid "Lesson cancelled"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:175
-#: templates/alsijil/print/full_register.html:185
-msgid "e"
+#: templates/alsijil/register_absence.html:15
+#: templates/alsijil/register_absence.html:17
+msgid "Manage absence"
 msgstr ""
 
-#: templates/alsijil/week_view.html:15
+#: templates/alsijil/week_view.html:25
 msgid "Select"
 msgstr ""
 
-#: templates/alsijil/week_view.html:30
+#: templates/alsijil/week_view.html:40
 msgid "Lessons"
 msgstr ""
 
-#: templates/alsijil/week_view.html:39
+#: templates/alsijil/week_view.html:49
 msgid "Period"
 msgstr ""
 
-#: templates/alsijil/week_view.html:41
+#: templates/alsijil/week_view.html:51
 msgid "Teachers"
 msgstr ""
 
-#: templates/alsijil/week_view.html:89
+#: templates/alsijil/week_view.html:99
 msgid "unexcused"
 msgstr ""
 
-#: templates/alsijil/week_view.html:92
+#: templates/alsijil/week_view.html:102
 msgid "Summed up tardiness"
 msgstr ""
 
-#: templates/alsijil/week_view.html:113
+#: templates/alsijil/week_view.html:123
 msgid "No group selected"
 msgstr ""
 
-#: templates/alsijil/week_view.html:117
+#: templates/alsijil/week_view.html:127
 msgid ""
 "\n"
 "            There are no lessons for the selected group, teacher, room or "
@@ -254,14 +356,26 @@ msgid ""
 "          "
 msgstr ""
 
-#: views.py:36
+#: views.py:41
 msgid ""
 "You either selected an invalid lesson or there is currently no lesson in "
 "progress."
 msgstr ""
 
-#: views.py:39
+#: views.py:44
 msgid ""
 "You are not allowed to create a lesson documentation for a lesson in the "
 "future."
 msgstr ""
+
+#: views.py:247
+msgid "The absence has been saved."
+msgstr ""
+
+#: views.py:285
+msgid "The filter has been saved"
+msgstr ""
+
+#: views.py:300
+msgid "The filter has been deleted."
+msgstr ""

biscuit/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: 2019-11-03 20:09+0100\n"
+"POT-Creation-Date: 2019-11-24 22:45+0100\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,19 +17,50 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: forms.py:36
+#: forms.py:38
 msgid "Group"
 msgstr ""
 
-#: forms.py:40 templates/alsijil/print/full_register.html:100
+#: forms.py:42 templates/alsijil/print/full_register.html:104
 msgid "Teacher"
 msgstr ""
 
-#: forms.py:44
+#: forms.py:46
 msgid "Room"
 msgstr ""
 
-#: menus.py:6 templates/alsijil/print/full_register.html:15
+#: forms.py:54
+msgid "Start date"
+msgstr ""
+
+#: forms.py:55
+msgid "End date"
+msgstr ""
+
+#: forms.py:56
+msgid "From period"
+msgstr ""
+
+#: forms.py:57 templates/alsijil/lesson.html:61
+msgid "Person"
+msgstr ""
+
+#: forms.py:58 templates/alsijil/lesson.html:62
+#: templates/alsijil/print/full_register.html:226
+#: templates/alsijil/week_view.html:98
+msgid "Absent"
+msgstr ""
+
+#: forms.py:59 templates/alsijil/lesson.html:64
+msgid "Excused"
+msgstr ""
+
+#: forms.py:60 templates/alsijil/lesson.html:65
+#: templates/alsijil/print/full_register.html:228
+msgid "Remarks"
+msgstr ""
+
+#: menus.py:6 templates/alsijil/print/full_register.html:19
 msgid "Class register"
 msgstr ""
 
@@ -37,18 +68,42 @@ msgstr ""
 msgid "Current lesson"
 msgstr ""
 
-#: menus.py:17 templates/alsijil/week_view.html:6
+#: menus.py:17 templates/alsijil/week_view.html:16
 msgid "Current week"
 msgstr ""
 
-#: models.py:30 templates/alsijil/print/full_register.html:132
+#: menus.py:22
+msgid "Register absence"
+msgstr ""
+
+#: menus.py:27
+msgid "Personal note filters"
+msgstr ""
+
+#: models.py:42 templates/alsijil/print/full_register.html:274
 msgid "Lesson topic"
 msgstr ""
 
-#: models.py:31 templates/alsijil/print/full_register.html:133
+#: models.py:43 templates/alsijil/print/full_register.html:275
 msgid "Homework"
 msgstr ""
 
+#: models.py:54
+msgid "Identifier"
+msgstr ""
+
+#: models.py:56 templates/alsijil/print/full_register.html:181
+msgid "Description"
+msgstr ""
+
+#: models.py:58
+msgid "Match expression"
+msgstr ""
+
+#: tables.py:14
+msgid "Edit"
+msgstr ""
+
 #: templates/alsijil/lesson.html:10 templates/alsijil/lesson.html:34
 msgid "Lesson documentation"
 msgstr ""
@@ -57,44 +112,47 @@ msgstr ""
 msgid "Change history"
 msgstr ""
 
-#: templates/alsijil/lesson.html:54 templates/alsijil/week_view.html:82
+#: templates/alsijil/lesson.html:54 templates/alsijil/week_view.html:92
 msgid "Personal notes"
 msgstr ""
 
-#: templates/alsijil/lesson.html:61
-msgid "Person"
-msgstr ""
-
-#: templates/alsijil/lesson.html:62 templates/alsijil/week_view.html:88
-msgid "Absent"
-msgstr ""
-
 #: templates/alsijil/lesson.html:63
+#: templates/alsijil/print/full_register.html:205
 msgid "Tardiness"
 msgstr ""
 
-#: templates/alsijil/lesson.html:64
-msgid "Excused"
+#: templates/alsijil/lesson.html:81
+#: templates/alsijil/manage_personal_note_filter.html:34
+#: templates/alsijil/manage_personal_note_filters.html:34
+#: templates/alsijil/register_absence.html:25
+msgid "Save"
 msgstr ""
 
-#: templates/alsijil/lesson.html:65
-msgid "Remarks"
+#: templates/alsijil/manage_personal_note_filter.html:15
+#: templates/alsijil/manage_personal_note_filter.html:17
+msgid "Manage personal note filter"
 msgstr ""
 
-#: templates/alsijil/lesson.html:81
-msgid "Save"
+#: templates/alsijil/manage_personal_note_filters.html:15
+#: templates/alsijil/manage_personal_note_filters.html:17
+msgid "Manage personal note filters"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:21
-#: templates/alsijil/print/full_register.html:53
-msgid "Owners"
+#: templates/alsijil/personal_note_filters.html:7
+#: templates/alsijil/personal_note_filters.html:8
+msgid "List of all personal note filters"
 msgstr ""
 
 #: templates/alsijil/print/full_register.html:25
+#: templates/alsijil/print/full_register.html:57
+msgid "Owners"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:29
 msgid "Printed on"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:33
+#: templates/alsijil/print/full_register.html:37
 msgid ""
 "\n"
 "            This printout is intended for archival purposes. The main copy "
@@ -104,7 +162,7 @@ msgid ""
 "          "
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:40
+#: templates/alsijil/print/full_register.html:44
 msgid ""
 "\n"
 "            Copies of the class register, both digital and as printout, "
@@ -115,7 +173,7 @@ msgid ""
 "          "
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:47
+#: templates/alsijil/print/full_register.html:51
 msgid ""
 "\n"
 "            The owner of the group and the headteacher confirm the above, "
@@ -124,129 +182,173 @@ msgid ""
 "          "
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:54
+#: templates/alsijil/print/full_register.html:58
 msgid "Headteacher"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:60
+#: templates/alsijil/print/full_register.html:64
 msgid "Persons in group"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:65
+#: templates/alsijil/print/full_register.html:69
 msgid "No."
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:66
+#: templates/alsijil/print/full_register.html:70
 msgid "Last name"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:67
+#: templates/alsijil/print/full_register.html:71
 msgid "First name"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:68
+#: templates/alsijil/print/full_register.html:72
 msgid "Sex"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:69
+#: templates/alsijil/print/full_register.html:73
 msgid "Date of birth"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:70
+#: templates/alsijil/print/full_register.html:74
+#: templates/alsijil/print/full_register.html:203
 msgid "Absences"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:71
+#: templates/alsijil/print/full_register.html:75
+#: templates/alsijil/print/full_register.html:204
 msgid "Unexcused"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:72
+#: templates/alsijil/print/full_register.html:76
+#: templates/alsijil/print/full_register.html:227
 msgid "Tard."
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:94
+#: templates/alsijil/print/full_register.html:98
 msgid "Teachers and lessons in group"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:99
-#: templates/alsijil/week_view.html:40
+#: templates/alsijil/print/full_register.html:103
+#: templates/alsijil/week_view.html:50
 msgid "Subject"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:101
+#: templates/alsijil/print/full_register.html:105
 msgid "Lesson start"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:102
+#: templates/alsijil/print/full_register.html:106
 msgid "Lesson end"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:103
+#: templates/alsijil/print/full_register.html:107
 msgid "Per week"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:123
-msgid "Lesson documentation for calendar week"
+#: templates/alsijil/print/full_register.html:127
+msgid "Personal overview"
 msgstr ""
 
 #: templates/alsijil/print/full_register.html:129
+msgid "Contact details"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:177
+msgid "Statistics on remarks"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:182
+msgid "Count"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:199
+msgid "Absences and tardiness"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:218
+msgid "Relevant personal notes"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:222
+msgid "Date"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:223
+#: templates/alsijil/print/full_register.html:271
 msgid "Pe."
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:130
+#: templates/alsijil/print/full_register.html:224
+#: templates/alsijil/print/full_register.html:272
 msgid "Subj."
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:131
-msgid "Subs."
+#: templates/alsijil/print/full_register.html:225
+#: templates/alsijil/print/full_register.html:277
+msgid "Te."
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:134
-msgid "Notes"
+#: templates/alsijil/print/full_register.html:243
+msgid "Yes"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:135
-msgid "Te."
+#: templates/alsijil/print/full_register.html:245
+#: templates/alsijil/print/full_register.html:317
+#: templates/alsijil/print/full_register.html:327
+msgid "e"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:265
+msgid "Lesson documentation for calendar week"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:273
+msgid "Subs."
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:162
+#: templates/alsijil/print/full_register.html:276
+msgid "Notes"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:304
 msgid "Lesson cancelled"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:175
-#: templates/alsijil/print/full_register.html:185
-msgid "e"
+#: templates/alsijil/register_absence.html:15
+#: templates/alsijil/register_absence.html:17
+msgid "Manage absence"
 msgstr ""
 
-#: templates/alsijil/week_view.html:15
+#: templates/alsijil/week_view.html:25
 msgid "Select"
 msgstr ""
 
-#: templates/alsijil/week_view.html:30
+#: templates/alsijil/week_view.html:40
 msgid "Lessons"
 msgstr ""
 
-#: templates/alsijil/week_view.html:39
+#: templates/alsijil/week_view.html:49
 msgid "Period"
 msgstr ""
 
-#: templates/alsijil/week_view.html:41
+#: templates/alsijil/week_view.html:51
 msgid "Teachers"
 msgstr ""
 
-#: templates/alsijil/week_view.html:89
+#: templates/alsijil/week_view.html:99
 msgid "unexcused"
 msgstr ""
 
-#: templates/alsijil/week_view.html:92
+#: templates/alsijil/week_view.html:102
 msgid "Summed up tardiness"
 msgstr ""
 
-#: templates/alsijil/week_view.html:113
+#: templates/alsijil/week_view.html:123
 msgid "No group selected"
 msgstr ""
 
-#: templates/alsijil/week_view.html:117
+#: templates/alsijil/week_view.html:127
 msgid ""
 "\n"
 "            There are no lessons for the selected group, teacher, room or "
@@ -254,14 +356,26 @@ msgid ""
 "          "
 msgstr ""
 
-#: views.py:36
+#: views.py:41
 msgid ""
 "You either selected an invalid lesson or there is currently no lesson in "
 "progress."
 msgstr ""
 
-#: views.py:39
+#: views.py:44
 msgid ""
 "You are not allowed to create a lesson documentation for a lesson in the "
 "future."
 msgstr ""
+
+#: views.py:247
+msgid "The absence has been saved."
+msgstr ""
+
+#: views.py:285
+msgid "The filter has been saved"
+msgstr ""
+
+#: views.py:300
+msgid "The filter has been deleted."
+msgstr ""

biscuit/apps/alsijil/menus.py

@@ -22,6 +22,11 @@ MENUS = {
                     'name': _('Register absence'),
                     'url': 'register_absence',
                     'validators': ['menu_generator.validators.is_superuser']
+                },
+                {
+                    'name': _('Personal note filters'),
+                    'url': 'list_personal_note_filters',
+                    'validators': ['menu_generator.validators.is_superuser']
                 }
             ]
         }

biscuit/apps/alsijil/model_extensions.py

-from datetime import date
+From datetime import date
 
 from django.db.models import Exists, F, OuterRef
 
@@ -10,7 +10,7 @@ from .models import PersonalNote
 
 
 @Person.method
-def mark_absent(self, day: date, starting_period: int = 0, absent: bool = True, bool = False, remarks: str = ''):
+def mark_absent(self, day: date, from_period: int = 0, absent: bool = True, bool = False, remarks: str = ''):
     """ Mark a person absent for all lessons in a day, optionally starting with
     a selected period number.
     
@@ -30,7 +30,7 @@ def mark_absent(self, day: date, starting_period: int = 0, absent: bool = True,
     lesson_periods = self.lesson_periods_as_participant.on_day(
         day
     ).filter(
-        period__period__gte=starting_period
+        period__period__gte=from_period
     )
 
     # Create and update all personal notes for the discovered lesson periods

biscuit/apps/alsijil/static/css/alsijil/full_register.css

@@ -121,3 +121,12 @@ table.person-info td.person-img {
 table.person-info td.person-img img {
   max-height: 30mm;
 }
+
+.sheet {
+    overflow: visible;
+    height: auto !important;
+}
+
+.sheet * {
+    page-break-inside: avoid;
+}

biscuit/apps/alsijil/static/css/alsijil/paper.css

@@ -30,16 +30,16 @@ body { margin: 0 }
   page-break-after: always;
 }
 /** Paper sizes **/
-body.A3               .sheet { width: 297mm; height: 419mm }
-body.A3.landscape     .sheet { width: 420mm; height: 296mm }
-body.A4               .sheet { width: 210mm; height: 296mm }
-body.A4.landscape     .sheet { width: 297mm; height: 209mm }
-body.A5               .sheet { width: 148mm; height: 209mm }
-body.A5.landscape     .sheet { width: 210mm; height: 147mm }
-body.letter           .sheet { width: 216mm; height: 279mm }
-body.letter.landscape .sheet { width: 280mm; height: 215mm }
-body.legal            .sheet { width: 216mm; height: 356mm }
-body.legal.landscape  .sheet { width: 357mm; height: 215mm }
+body.A3               .sheet { width: 297mm; min-height: 419mm }
+body.A3.landscape     .sheet { width: 420mm; min-height: 296mm }
+body.A4               .sheet { width: 210mm; min-height: 296mm }
+body.A4.landscape     .sheet { width: 297mm; min-height: 209mm }
+body.A5               .sheet { width: 148mm; min-height: 209mm }
+body.A5.landscape     .sheet { width: 210mm; min-height: 147mm }
+body.letter           .sheet { width: 216mm; min-height: 279mm }
+body.letter.landscape .sheet { width: 280mm; min-height: 215mm }
+body.legal            .sheet { width: 216mm; min-height: 356mm }
+body.legal.landscape  .sheet { width: 357mm; min-height: 215mm }
 /** Padding area **/
 .sheet.padding-10mm { padding: 10mm }
 .sheet.padding-15mm { padding: 15mm }

biscuit/apps/alsijil/tables.py

+from django.utils.translation import ugettext_lazy as _
+import django_tables2 as tables
+from django_tables2.utils import A
+
+
+class PersonalNoteFilterTable(tables.Table):
+    class Meta:
+        attrs = {'class': 'table table-striped table-bordered table-hover table-responsive-xl'}
+
+    identifier = tables.Column()
+    description = tables.Column()
+    regex = tables.Column()
+    edit_filter = tables.LinkColumn(
+        'edit_personal_note_filter', args=[A('id')], text=_('Edit'))

biscuit/apps/alsijil/templates/alsijil/manage_personal_note_filter.html

+{# -*- engine:django -*- #}
+{% extends "core/base.html" %}
+{% load bootstrap4 i18n static font_awesome %}
+
+{% block bootstrap4_extra_head %}
+  {{ block.super }}
+  {{ personal_note_filter_form.media.css }}
+{% endblock %}
+
+{% block bootstrap4_extra_script %}
+  {{ block.super }}
+  {{ personal_note_filter_form.media.js }}
+{% endblock %}
+
+{% block bootstrap4_title %}{% blocktrans%}Manage personal note filter{% endblocktrans %} - {{ block.super }}{% endblock %}
+
+{% block page_title %}{% blocktrans %}Manage personal note filter{% endblocktrans %}{% endblock %}
+
+{% block content %}
+<div class="d-flex justify-content-between">
+    <div class="btn-group" role="group" aria-label="Filter actions">
+      {% if personal_note_filter %}
+        <a href="{% url 'delete_personal_note_filter' personal_note_filter.id %}" class="btn btn-danger">
+          {% fa 'trash-o' %}
+        </a>
+      {% endif %}
+    </div>
+  </div>
+
+  <form method="post">
+    {% csrf_token %}
+    {% bootstrap_form personal_note_filter_form %}
+    <button type="submit" class="btn btn-dark">
+      {% blocktrans %}Save{% endblocktrans %}
+    </button>
+  </form>
+
+{% endblock %}

biscuit/apps/alsijil/templates/alsijil/manage_personal_note_filters.html

+{# -*- engine:django -*- #}
+{% extends "core/base.html" %}
+{% load bootstrap4 i18n static font_awesome %}
+
+{% block bootstrap4_extra_head %}
+  {{ block.super }}
+  {{ personal_note_filters_form.media.css }}
+{% endblock %}
+
+{% block bootstrap4_extra_script %}
+  {{ block.super }}
+  {{ personal_note_filters_form.media.js }}
+{% endblock %}
+
+{% block bootstrap4_title %}{% blocktrans%}Manage personal note filters{% endblocktrans %} - {{ block.super }}{% endblock %}
+
+{% block page_title %}{% blocktrans %}Manage personal note filters{% endblocktrans %}{% endblock %}
+
+{% block content %}
+<div class="d-flex justify-content-between">
+    <div class="btn-group" role="group" aria-label="Filter actions">
+      {% if personal_note_filters %}
+        <a href="{% url 'delete_personal_note_filters' personal_note_filters.id %}" class="btn btn-danger">
+          {% fa 'trash-o' %}
+        </a>
+      {% endif %}
+    </div>
+  </div>
+
+  <form method="post">
+    {% csrf_token %}
+    {% bootstrap_form personal_note_filters_form %}
+    <button type="submit" class="btn btn-dark">
+      {% blocktrans %}Save{% endblocktrans %}
+    </button>
+  </form>
+
+{% endblock %}

biscuit/apps/alsijil/templates/alsijil/personal_note_filters.html

+{# -*- engine:django -*- #}
+
+{% extends "core/base.html" %}
+{% load bootstrap4 i18n font_awesome %}
+{% load render_table from django_tables2 %}
+
+{% block bootstrap4_title %}{% blocktrans %}List of all personal note filters{% endblocktrans %} - {{ block.super }}{% endblock %}
+{% block page_title %}{% blocktrans %}List of all personal note filters{% endblocktrans %}{% endblock %}
+
+{% block content %}
+ <div class="btn-group" role="group" aria-lable="Filter actions">
+    <a href="{% url 'create_personal_note_filter' %}" class="btn btn-dark">
+      {% fa 'plus' %}
+    </a>
+  </div>
+
+  {% render_table personal_note_filters_table %}
+{% endblock %}

biscuit/apps/alsijil/templates/alsijil/print/full_register.html

@@ -195,6 +195,25 @@
           </table>
         {% endif %}
 
+        <h3>{% trans 'Absences and tardiness' %}</h3>
+        <table>
+          <thead>
+            <tr>
+              <th>{% trans 'Absences' %}</th>
+	      <th>{% trans 'Unexcused' %}</th>
+              <th>{% trans 'Tardiness' %}</th>
+            </tr>
+          </thead>
+
+          <tbody>
+            <tr>
+              <td>{{ person.absences }}</td>
+              <td>{{ person.unexcused }}</td>
+              <td>{{ person.tardiness }}</td>
+            </tr>
+          </tbody>
+        </table>
+
         <h3>{% trans 'Relevant personal notes' %}</h3>
         <table>
           <thead>

biscuit/apps/alsijil/templates/alsijil/register_absence.html

@@ -14,7 +14,7 @@
 
 {% block bootstrap4_title %}{% blocktrans%}Manage absence{% endblocktrans %} - {{ block.super }}{% endblock %}
 
-{% block page_title %}Manage absences{% endblock %}
+{% block page_title %}{% blocktrans %}Manage absence{% endblocktrans %}{% endblock %}
 
 {% block content %}
 

biscuit/apps/alsijil/urls.py

@@ -14,4 +14,12 @@ urlpatterns = [
          name='full_register_group'),
     path('absence/new', views.register_absence,
          name='register_absence'),
+    path('filters/list', views.list_personal_note_filters,
+         name='list_personal_note_filters'),
+    path('filters/create', views.edit_personal_note_filter,
+         name='create_personal_note_filter'),
+    path('filters/edit/<int:id>', views.edit_personal_note_filter,
+         name='edit_personal_note_filter'),
+    path('filters/delete/<int:id_>', views.delete_personal_note_filter,
+         name='delete_personal_note_filter')
 ]

biscuit/apps/alsijil/views.py

@@ -9,14 +9,17 @@ from django.shortcuts import get_object_or_404, redirect, render
 from django.urls import reverse
 from django.utils.translation import ugettext as _
 
+from django_tables2 import RequestConfig
+
 from biscuit.apps.chronos.models import LessonPeriod
 from biscuit.apps.chronos.util import CalendarWeek
 from biscuit.core.models import Group, Person
 from biscuit.core.decorators import admin_required
 from biscuit.core.util import messages
 
-from .forms import LessonDocumentationForm, PersonalNoteFormSet, RegisterAbsenceForm, SelectForm
+from .forms import LessonDocumentationForm, PersonalNoteFormSet, RegisterAbsenceForm, SelectForm, PersonalNoteFilterForm
 from .models import LessonDocumentation, PersonalNoteFilter
+from .tables import PersonalNoteFilterTable
 
 
 @login_required
@@ -119,7 +122,7 @@ def week_view(request: HttpRequest, year: Optional[int] = None, week: Optional[i
         persons = Person.objects.filter(
             is_active=True
         ).filter(
-            Q(member_of=group) | Q(member_of__parent_groups=group)
+            member_of__lessons__lesson_periods__in=lesson_periods
         ).distinct().prefetch_related(
             'personal_notes'
         ).annotate(
@@ -229,7 +232,7 @@ def register_absence(request: HttpRequest) -> HttpResponse:
             person = register_absence_form.cleaned_data['person']
             start_date = register_absence_form.cleaned_data['date_start']
             end_date = register_absence_form.cleaned_data['date_end']
-            starting_lesson = register_absence_form.cleaned_data['starting_lesson']
+            from_period = register_absence_form.cleaned_data['from_period']
             absent = register_absence_form.cleaned_data['absent']
             excused = register_absence_form.cleaned_data['excused']
             remarks = register_absence_form.cleaned_data['remarks']
@@ -237,9 +240,9 @@ def register_absence(request: HttpRequest) -> HttpResponse:
             # Mark person as absent
             delta = end_date - start_date
             for i in range(delta.days+1):
-                starting_period = starting_lesson if i == 0 else 0
+                from_period = from_period if i == 0 else 0
                 day = start_date + timedelta(days=i)
-                person.mark_absent(day, starting_period, absent, excused, remarks)
+                person.mark_absent(day, from_period, absent, excused, remarks)
 
             messages.success(request, _('The absence has been saved.'))
             return redirect('index')
@@ -247,3 +250,54 @@ def register_absence(request: HttpRequest) -> HttpResponse:
     context['register_absence_form'] = register_absence_form
 
     return render(request, 'alsijil/register_absence.html', context)
+
+
+def list_personal_note_filters(request: HttpRequest) -> HttpResponse:
+    context = {}
+
+    personal_note_filters = PersonalNoteFilter.objects.all()
+
+    # Prepare table
+    personal_note_filters_table = PersonalNoteFilterTable(personal_note_filters)
+    RequestConfig(request).configure(personal_note_filters_table)
+
+    context['personal_note_filters_table'] = personal_note_filters_table
+
+    return render(request, 'alsijil/personal_note_filters.html', context)
+
+
+def edit_personal_note_filter(request: HttpRequest, id: Optional['int'] = None) -> HttpResponse:
+    context = {}
+
+    if id:
+        personal_note_filter = PersonalNoteFilter.objects.get(id=id)
+        context['personal_note_filter'] = personal_note_filter
+        personal_note_filter_form = PersonalNoteFilterForm(
+            request.POST or None, instance=personal_note_filter)
+    else:
+        personal_note_filter_form = PersonalNoteFilterForm(
+            request.POST or None)
+    
+    if request.method == 'POST':
+        if personal_note_filter_form.is_valid():
+            personal_note_filter_form.save(commit=True)
+
+            messages.success(request, _('The filter has been saved'))
+            return redirect('list_personal_note_filters')
+
+    context['personal_note_filter_form'] = personal_note_filter_form
+
+    return render(request, 'alsijil/manage_personal_note_filter.html', context)
+
+@admin_required
+def delete_personal_note_filter(request: HttpRequest, id_: int) -> HttpResponse:
+    context = {}
+
+    personal_note_filter = get_object_or_404(PersonalNoteFilter, pk=id_)
+
+    PersonalNoteFilter.objects.filter(pk=id_).delete()
+    
+    messages.success(request, _('The filter has been deleted.'))
+
+    context['personal_note_filter'] = personal_note_filter
+    return redirect('list_personal_note_filters')

pyproject.toml

 [tool.poetry]
 name = "BiscuIT-App-Alsijil"
-version = "1.0a3.dev0"
+version = "1.0a3"
 packages = [
     { include = "biscuit" }
 ]