CHANGELOG.rst

 Changelog
 =========
 
+`1.0a2`_
+--------
+
+New features
+~~~~~~~~~~~~
+
+* Display sum of absences and tardiness in printout
+
+Minor changes
+~~~~~~~~~~~~~
+
+* Allow superusers to create lesson documentations in the future
+
+Bugfixes
+~~~~~~~~
+
+* Fixed minor style issues in register printout
+
 `1.0a1`_
 --------
 
@@ -25,3 +43,4 @@ Minor changes
 * Use bootstrap buttons everywhere
 
 _`1.0a1`: https://edugit.org/Teckids/BiscuIT/BiscuIT-App-Alsijil/-/tags/1.0a1
+_`1.0a2`: https://edugit.org/Teckids/BiscuIT/BiscuIT-App-Alsijil/-/tags/1.0a2

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-09-30 22:14+0200\n"
+"POT-Creation-Date: 2019-11-03 20:09+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"
@@ -23,7 +23,7 @@ msgstr ""
 msgid "Group"
 msgstr ""
 
-#: forms.py:40 templates/alsijil/print/full_register.html:96
+#: forms.py:40 templates/alsijil/print/full_register.html:100
 msgid "Teacher"
 msgstr ""
 
@@ -31,7 +31,7 @@ msgstr ""
 msgid "Room"
 msgstr ""
 
-#: menus.py:6 templates/alsijil/print/full_register.html:17
+#: menus.py:6 templates/alsijil/print/full_register.html:15
 msgid "Class register"
 msgstr ""
 
@@ -43,11 +43,11 @@ msgstr ""
 msgid "Current week"
 msgstr ""
 
-#: models.py:30 templates/alsijil/print/full_register.html:128
+#: models.py:30 templates/alsijil/print/full_register.html:132
 msgid "Lesson topic"
 msgstr ""
 
-#: models.py:31 templates/alsijil/print/full_register.html:129
+#: models.py:31 templates/alsijil/print/full_register.html:133
 msgid "Homework"
 msgstr ""
 
@@ -87,16 +87,16 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:23
-#: templates/alsijil/print/full_register.html:55
+#: templates/alsijil/print/full_register.html:21
+#: templates/alsijil/print/full_register.html:53
 msgid "Owners"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:27
+#: templates/alsijil/print/full_register.html:25
 msgid "Printed on"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:35
+#: templates/alsijil/print/full_register.html:33
 msgid ""
 "\n"
 "            This printout is intended for archival purposes. The main copy "
@@ -106,7 +106,7 @@ msgid ""
 "          "
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:42
+#: templates/alsijil/print/full_register.html:40
 msgid ""
 "\n"
 "            Copies of the class register, both digital and as printout, "
@@ -117,7 +117,7 @@ msgid ""
 "          "
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:49
+#: templates/alsijil/print/full_register.html:47
 msgid ""
 "\n"
 "            The owner of the group and the headteacher confirm the above, "
@@ -126,85 +126,97 @@ msgid ""
 "          "
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:56
+#: templates/alsijil/print/full_register.html:54
 msgid "Headteacher"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:62
+#: templates/alsijil/print/full_register.html:60
 msgid "Persons in group"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:67
+#: templates/alsijil/print/full_register.html:65
 msgid "No."
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:68
+#: templates/alsijil/print/full_register.html:66
 msgid "Last name"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:69
+#: templates/alsijil/print/full_register.html:67
 msgid "First name"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:70
+#: templates/alsijil/print/full_register.html:68
 msgid "Sex"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:71
+#: templates/alsijil/print/full_register.html:69
 msgid "Date of birth"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:90
+#: templates/alsijil/print/full_register.html:70
+msgid "Absences"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:71
+msgid "Unexcused"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:72
+msgid "Tard."
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:94
 msgid "Teachers and lessons in group"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:95
+#: templates/alsijil/print/full_register.html:99
 #: templates/alsijil/week_view.html:40
 msgid "Subject"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:97
+#: templates/alsijil/print/full_register.html:101
 msgid "Lesson start"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:98
+#: templates/alsijil/print/full_register.html:102
 msgid "Lesson end"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:99
+#: templates/alsijil/print/full_register.html:103
 msgid "Per week"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:119
+#: templates/alsijil/print/full_register.html:123
 msgid "Lesson documentation for calendar week"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:125
+#: templates/alsijil/print/full_register.html:129
 msgid "Pe."
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:126
+#: templates/alsijil/print/full_register.html:130
 msgid "Subj."
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:127
+#: templates/alsijil/print/full_register.html:131
 msgid "Subs."
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:130
+#: templates/alsijil/print/full_register.html:134
 msgid "Notes"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:131
+#: templates/alsijil/print/full_register.html:135
 msgid "Te."
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:158
+#: templates/alsijil/print/full_register.html:162
 msgid "Lesson cancelled"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:171
-#: templates/alsijil/print/full_register.html:181
+#: templates/alsijil/print/full_register.html:175
+#: templates/alsijil/print/full_register.html:185
 msgid "e"
 msgstr ""
 
@@ -239,18 +251,18 @@ msgstr ""
 #: templates/alsijil/week_view.html:117
 msgid ""
 "\n"
-"            You must select a group, a teacher or a room to see the week "
-"summary.\n"
+"            There are no lessons for the selected group, teacher, room or "
+"time.\n"
 "          "
 msgstr ""
 
-#: views.py:39
+#: views.py:36
 msgid ""
 "You either selected an invalid lesson or there is currently no lesson in "
 "progress."
 msgstr ""
 
-#: views.py:42
+#: views.py:39
 msgid ""
 "You are not allowed to create a lesson documentation for a lesson in the "
 "future."

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

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-30 22:14+0200\n"
+"POT-Creation-Date: 2019-11-03 20:09+0100\n"
 "PO-Revision-Date: 2019-09-17 19:44+0000\n"
 "Last-Translator: Tom Teichler <tom.teichler@teckids.org>\n"
 "Language-Team: German <https://translate.edugit.org/projects/biscuit-sis/"
@@ -23,7 +23,7 @@ msgstr ""
 msgid "Group"
 msgstr "Gruppe"
 
-#: forms.py:40 templates/alsijil/print/full_register.html:96
+#: forms.py:40 templates/alsijil/print/full_register.html:100
 msgid "Teacher"
 msgstr "Lehrkraft"
 
@@ -31,7 +31,7 @@ msgstr "Lehrkraft"
 msgid "Room"
 msgstr ""
 
-#: menus.py:6 templates/alsijil/print/full_register.html:17
+#: menus.py:6 templates/alsijil/print/full_register.html:15
 msgid "Class register"
 msgstr "Klassenbuch"
 
@@ -43,11 +43,11 @@ msgstr "Aktuelle Unterrichtsstunde"
 msgid "Current week"
 msgstr "Aktuelle Woche"
 
-#: models.py:30 templates/alsijil/print/full_register.html:128
+#: models.py:30 templates/alsijil/print/full_register.html:132
 msgid "Lesson topic"
 msgstr "Stundenthema"
 
-#: models.py:31 templates/alsijil/print/full_register.html:129
+#: models.py:31 templates/alsijil/print/full_register.html:133
 msgid "Homework"
 msgstr "Hausaufgaben"
 
@@ -87,16 +87,16 @@ msgstr "Bemerkungen"
 msgid "Save"
 msgstr "Speichern"
 
-#: templates/alsijil/print/full_register.html:23
-#: templates/alsijil/print/full_register.html:55
+#: templates/alsijil/print/full_register.html:21
+#: templates/alsijil/print/full_register.html:53
 msgid "Owners"
 msgstr "Leiter/-innen"
 
-#: templates/alsijil/print/full_register.html:27
+#: templates/alsijil/print/full_register.html:25
 msgid "Printed on"
 msgstr "Gedruckt am"
 
-#: templates/alsijil/print/full_register.html:35
+#: templates/alsijil/print/full_register.html:33
 msgid ""
 "\n"
 "            This printout is intended for archival purposes. The main copy "
@@ -112,7 +112,7 @@ msgstr ""
 "gespeichert.\n"
 "          "
 
-#: templates/alsijil/print/full_register.html:42
+#: templates/alsijil/print/full_register.html:40
 msgid ""
 "\n"
 "            Copies of the class register, both digital and as printout, "
@@ -130,7 +130,7 @@ msgstr ""
 "            gespeichert werden.\n"
 "          "
 
-#: templates/alsijil/print/full_register.html:49
+#: templates/alsijil/print/full_register.html:47
 msgid ""
 "\n"
 "            The owner of the group and the headteacher confirm the above, "
@@ -144,85 +144,101 @@ msgstr ""
 "            die Richtigkeit des Ausdrucks.\n"
 "          "
 
-#: templates/alsijil/print/full_register.html:56
+#: templates/alsijil/print/full_register.html:54
 msgid "Headteacher"
 msgstr "Schulleitung"
 
-#: templates/alsijil/print/full_register.html:62
+#: templates/alsijil/print/full_register.html:60
 msgid "Persons in group"
 msgstr "Personen in der Gruppe"
 
-#: templates/alsijil/print/full_register.html:67
+#: templates/alsijil/print/full_register.html:65
 msgid "No."
 msgstr "Nr."
 
-#: templates/alsijil/print/full_register.html:68
+#: templates/alsijil/print/full_register.html:66
 msgid "Last name"
 msgstr "Nachname"
 
-#: templates/alsijil/print/full_register.html:69
+#: templates/alsijil/print/full_register.html:67
 msgid "First name"
 msgstr "Vorname"
 
-#: templates/alsijil/print/full_register.html:70
+#: templates/alsijil/print/full_register.html:68
 msgid "Sex"
 msgstr "Geschlecht"
 
-#: templates/alsijil/print/full_register.html:71
+#: templates/alsijil/print/full_register.html:69
 msgid "Date of birth"
 msgstr "Geburtsdatum"
 
-#: templates/alsijil/print/full_register.html:90
+#: templates/alsijil/print/full_register.html:70
+#, fuzzy
+#| msgid "Absent"
+msgid "Absences"
+msgstr "Abwesend"
+
+#: templates/alsijil/print/full_register.html:71
+#, fuzzy
+#| msgid "unexcused"
+msgid "Unexcused"
+msgstr "unentschuldigt"
+
+#: templates/alsijil/print/full_register.html:72
+msgid "Tard."
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:94
 msgid "Teachers and lessons in group"
 msgstr "Lehrkräfte und Fächer der Gruppe"
 
-#: templates/alsijil/print/full_register.html:95
+#: templates/alsijil/print/full_register.html:99
 #: templates/alsijil/week_view.html:40
 msgid "Subject"
 msgstr "Fach"
 
-#: templates/alsijil/print/full_register.html:97
+#: templates/alsijil/print/full_register.html:101
 msgid "Lesson start"
 msgstr "Unterrichtsbeginn"
 
-#: templates/alsijil/print/full_register.html:98
+#: templates/alsijil/print/full_register.html:102
 msgid "Lesson end"
 msgstr "Unterrichtsende"
 
-#: templates/alsijil/print/full_register.html:99
+#: templates/alsijil/print/full_register.html:103
 msgid "Per week"
 msgstr "Pro Woche"
 
-#: templates/alsijil/print/full_register.html:119
+#: templates/alsijil/print/full_register.html:123
 msgid "Lesson documentation for calendar week"
 msgstr "Unterrichtsdokumentation für Kalenderwoche"
 
-#: templates/alsijil/print/full_register.html:125
+#: templates/alsijil/print/full_register.html:129
 msgid "Pe."
 msgstr "Std."
 
-#: templates/alsijil/print/full_register.html:126
+#: templates/alsijil/print/full_register.html:130
 msgid "Subj."
 msgstr "Fa."
 
-#: templates/alsijil/print/full_register.html:127
+#: templates/alsijil/print/full_register.html:131
 msgid "Subs."
 msgstr "Vertr."
 
-#: templates/alsijil/print/full_register.html:130
+#: templates/alsijil/print/full_register.html:134
 msgid "Notes"
 msgstr "Notizen"
 
-#: templates/alsijil/print/full_register.html:131
+#: templates/alsijil/print/full_register.html:135
 msgid "Te."
 msgstr "Lk."
 
-#: templates/alsijil/print/full_register.html:158
+#: templates/alsijil/print/full_register.html:162
 msgid "Lesson cancelled"
 msgstr "Stunde ist ausgefallen"
 
-#: templates/alsijil/print/full_register.html:171
-#: templates/alsijil/print/full_register.html:181
+#: templates/alsijil/print/full_register.html:175
+#: templates/alsijil/print/full_register.html:185
 msgid "e"
 msgstr "e"
 
@@ -262,8 +278,8 @@ msgstr "Keine Gruppe ausgewählt"
 #| "          "
 msgid ""
 "\n"
-"            You must select a group, a teacher or a room to see the week "
-"summary.\n"
+"            There are no lessons for the selected group, teacher, room or "
+"time.\n"
 "          "
 msgstr ""
 "\n"
@@ -271,7 +287,7 @@ msgstr ""
 "sehen.\n"
 "          "
 
-#: views.py:39
+#: views.py:36
 msgid ""
 "You either selected an invalid lesson or there is currently no lesson in "
 "progress."
@@ -279,7 +295,7 @@ msgstr ""
 "Sie haben eine ungültige Stunde ausgewählt oder es\n"
 "      läuft momentan keine Stunde."
 
-#: views.py:42
+#: views.py:39
 msgid ""
 "You are not allowed to create a lesson documentation for a lesson in the "
 "future."

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-09-30 22:14+0200\n"
+"POT-Creation-Date: 2019-11-03 20:09+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"
@@ -22,7 +22,7 @@ msgstr ""
 msgid "Group"
 msgstr ""
 
-#: forms.py:40 templates/alsijil/print/full_register.html:96
+#: forms.py:40 templates/alsijil/print/full_register.html:100
 msgid "Teacher"
 msgstr ""
 
@@ -30,7 +30,7 @@ msgstr ""
 msgid "Room"
 msgstr ""
 
-#: menus.py:6 templates/alsijil/print/full_register.html:17
+#: menus.py:6 templates/alsijil/print/full_register.html:15
 msgid "Class register"
 msgstr ""
 
@@ -42,11 +42,11 @@ msgstr ""
 msgid "Current week"
 msgstr ""
 
-#: models.py:30 templates/alsijil/print/full_register.html:128
+#: models.py:30 templates/alsijil/print/full_register.html:132
 msgid "Lesson topic"
 msgstr ""
 
-#: models.py:31 templates/alsijil/print/full_register.html:129
+#: models.py:31 templates/alsijil/print/full_register.html:133
 msgid "Homework"
 msgstr ""
 
@@ -86,16 +86,16 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:23
-#: templates/alsijil/print/full_register.html:55
+#: templates/alsijil/print/full_register.html:21
+#: templates/alsijil/print/full_register.html:53
 msgid "Owners"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:27
+#: templates/alsijil/print/full_register.html:25
 msgid "Printed on"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:35
+#: templates/alsijil/print/full_register.html:33
 msgid ""
 "\n"
 "            This printout is intended for archival purposes. The main copy "
@@ -105,7 +105,7 @@ msgid ""
 "          "
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:42
+#: templates/alsijil/print/full_register.html:40
 msgid ""
 "\n"
 "            Copies of the class register, both digital and as printout, "
@@ -116,7 +116,7 @@ msgid ""
 "          "
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:49
+#: templates/alsijil/print/full_register.html:47
 msgid ""
 "\n"
 "            The owner of the group and the headteacher confirm the above, "
@@ -125,85 +125,97 @@ msgid ""
 "          "
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:56
+#: templates/alsijil/print/full_register.html:54
 msgid "Headteacher"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:62
+#: templates/alsijil/print/full_register.html:60
 msgid "Persons in group"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:67
+#: templates/alsijil/print/full_register.html:65
 msgid "No."
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:68
+#: templates/alsijil/print/full_register.html:66
 msgid "Last name"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:69
+#: templates/alsijil/print/full_register.html:67
 msgid "First name"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:70
+#: templates/alsijil/print/full_register.html:68
 msgid "Sex"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:71
+#: templates/alsijil/print/full_register.html:69
 msgid "Date of birth"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:90
+#: templates/alsijil/print/full_register.html:70
+msgid "Absences"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:71
+msgid "Unexcused"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:72
+msgid "Tard."
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:94
 msgid "Teachers and lessons in group"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:95
+#: templates/alsijil/print/full_register.html:99
 #: templates/alsijil/week_view.html:40
 msgid "Subject"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:97
+#: templates/alsijil/print/full_register.html:101
 msgid "Lesson start"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:98
+#: templates/alsijil/print/full_register.html:102
 msgid "Lesson end"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:99
+#: templates/alsijil/print/full_register.html:103
 msgid "Per week"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:119
+#: templates/alsijil/print/full_register.html:123
 msgid "Lesson documentation for calendar week"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:125
+#: templates/alsijil/print/full_register.html:129
 msgid "Pe."
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:126
+#: templates/alsijil/print/full_register.html:130
 msgid "Subj."
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:127
+#: templates/alsijil/print/full_register.html:131
 msgid "Subs."
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:130
+#: templates/alsijil/print/full_register.html:134
 msgid "Notes"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:131
+#: templates/alsijil/print/full_register.html:135
 msgid "Te."
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:158
+#: templates/alsijil/print/full_register.html:162
 msgid "Lesson cancelled"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:171
-#: templates/alsijil/print/full_register.html:181
+#: templates/alsijil/print/full_register.html:175
+#: templates/alsijil/print/full_register.html:185
 msgid "e"
 msgstr ""
 
@@ -238,18 +250,18 @@ msgstr ""
 #: templates/alsijil/week_view.html:117
 msgid ""
 "\n"
-"            You must select a group, a teacher or a room to see the week "
-"summary.\n"
+"            There are no lessons for the selected group, teacher, room or "
+"time.\n"
 "          "
 msgstr ""
 
-#: views.py:39
+#: views.py:36
 msgid ""
 "You either selected an invalid lesson or there is currently no lesson in "
 "progress."
 msgstr ""
 
-#: views.py:42
+#: views.py:39
 msgid ""
 "You are not allowed to create a lesson documentation for a lesson in the "
 "future."

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-09-30 22:14+0200\n"
+"POT-Creation-Date: 2019-11-03 20:09+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"
@@ -21,7 +21,7 @@ msgstr ""
 msgid "Group"
 msgstr ""
 
-#: forms.py:40 templates/alsijil/print/full_register.html:96
+#: forms.py:40 templates/alsijil/print/full_register.html:100
 msgid "Teacher"
 msgstr ""
 
@@ -29,7 +29,7 @@ msgstr ""
 msgid "Room"
 msgstr ""
 
-#: menus.py:6 templates/alsijil/print/full_register.html:17
+#: menus.py:6 templates/alsijil/print/full_register.html:15
 msgid "Class register"
 msgstr ""
 
@@ -41,11 +41,11 @@ msgstr ""
 msgid "Current week"
 msgstr ""
 
-#: models.py:30 templates/alsijil/print/full_register.html:128
+#: models.py:30 templates/alsijil/print/full_register.html:132
 msgid "Lesson topic"
 msgstr ""
 
-#: models.py:31 templates/alsijil/print/full_register.html:129
+#: models.py:31 templates/alsijil/print/full_register.html:133
 msgid "Homework"
 msgstr ""
 
@@ -85,16 +85,16 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:23
-#: templates/alsijil/print/full_register.html:55
+#: templates/alsijil/print/full_register.html:21
+#: templates/alsijil/print/full_register.html:53
 msgid "Owners"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:27
+#: templates/alsijil/print/full_register.html:25
 msgid "Printed on"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:35
+#: templates/alsijil/print/full_register.html:33
 msgid ""
 "\n"
 "            This printout is intended for archival purposes. The main copy "
@@ -104,7 +104,7 @@ msgid ""
 "          "
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:42
+#: templates/alsijil/print/full_register.html:40
 msgid ""
 "\n"
 "            Copies of the class register, both digital and as printout, "
@@ -115,7 +115,7 @@ msgid ""
 "          "
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:49
+#: templates/alsijil/print/full_register.html:47
 msgid ""
 "\n"
 "            The owner of the group and the headteacher confirm the above, "
@@ -124,85 +124,97 @@ msgid ""
 "          "
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:56
+#: templates/alsijil/print/full_register.html:54
 msgid "Headteacher"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:62
+#: templates/alsijil/print/full_register.html:60
 msgid "Persons in group"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:67
+#: templates/alsijil/print/full_register.html:65
 msgid "No."
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:68
+#: templates/alsijil/print/full_register.html:66
 msgid "Last name"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:69
+#: templates/alsijil/print/full_register.html:67
 msgid "First name"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:70
+#: templates/alsijil/print/full_register.html:68
 msgid "Sex"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:71
+#: templates/alsijil/print/full_register.html:69
 msgid "Date of birth"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:90
+#: templates/alsijil/print/full_register.html:70
+msgid "Absences"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:71
+msgid "Unexcused"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:72
+msgid "Tard."
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:94
 msgid "Teachers and lessons in group"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:95
+#: templates/alsijil/print/full_register.html:99
 #: templates/alsijil/week_view.html:40
 msgid "Subject"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:97
+#: templates/alsijil/print/full_register.html:101
 msgid "Lesson start"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:98
+#: templates/alsijil/print/full_register.html:102
 msgid "Lesson end"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:99
+#: templates/alsijil/print/full_register.html:103
 msgid "Per week"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:119
+#: templates/alsijil/print/full_register.html:123
 msgid "Lesson documentation for calendar week"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:125
+#: templates/alsijil/print/full_register.html:129
 msgid "Pe."
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:126
+#: templates/alsijil/print/full_register.html:130
 msgid "Subj."
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:127
+#: templates/alsijil/print/full_register.html:131
 msgid "Subs."
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:130
+#: templates/alsijil/print/full_register.html:134
 msgid "Notes"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:131
+#: templates/alsijil/print/full_register.html:135
 msgid "Te."
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:158
+#: templates/alsijil/print/full_register.html:162
 msgid "Lesson cancelled"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:171
-#: templates/alsijil/print/full_register.html:181
+#: templates/alsijil/print/full_register.html:175
+#: templates/alsijil/print/full_register.html:185
 msgid "e"
 msgstr ""
 
@@ -237,18 +249,18 @@ msgstr ""
 #: templates/alsijil/week_view.html:117
 msgid ""
 "\n"
-"            You must select a group, a teacher or a room to see the week "
-"summary.\n"
+"            There are no lessons for the selected group, teacher, room or "
+"time.\n"
 "          "
 msgstr ""
 
-#: views.py:39
+#: views.py:36
 msgid ""
 "You either selected an invalid lesson or there is currently no lesson in "
 "progress."
 msgstr ""
 
-#: views.py:42
+#: views.py:39
 msgid ""
 "You are not allowed to create a lesson documentation for a lesson in the "
 "future."

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-09-30 22:14+0200\n"
+"POT-Creation-Date: 2019-11-03 20:09+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"
@@ -21,7 +21,7 @@ msgstr ""
 msgid "Group"
 msgstr ""
 
-#: forms.py:40 templates/alsijil/print/full_register.html:96
+#: forms.py:40 templates/alsijil/print/full_register.html:100
 msgid "Teacher"
 msgstr ""
 
@@ -29,7 +29,7 @@ msgstr ""
 msgid "Room"
 msgstr ""
 
-#: menus.py:6 templates/alsijil/print/full_register.html:17
+#: menus.py:6 templates/alsijil/print/full_register.html:15
 msgid "Class register"
 msgstr ""
 
@@ -41,11 +41,11 @@ msgstr ""
 msgid "Current week"
 msgstr ""
 
-#: models.py:30 templates/alsijil/print/full_register.html:128
+#: models.py:30 templates/alsijil/print/full_register.html:132
 msgid "Lesson topic"
 msgstr ""
 
-#: models.py:31 templates/alsijil/print/full_register.html:129
+#: models.py:31 templates/alsijil/print/full_register.html:133
 msgid "Homework"
 msgstr ""
 
@@ -85,16 +85,16 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:23
-#: templates/alsijil/print/full_register.html:55
+#: templates/alsijil/print/full_register.html:21
+#: templates/alsijil/print/full_register.html:53
 msgid "Owners"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:27
+#: templates/alsijil/print/full_register.html:25
 msgid "Printed on"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:35
+#: templates/alsijil/print/full_register.html:33
 msgid ""
 "\n"
 "            This printout is intended for archival purposes. The main copy "
@@ -104,7 +104,7 @@ msgid ""
 "          "
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:42
+#: templates/alsijil/print/full_register.html:40
 msgid ""
 "\n"
 "            Copies of the class register, both digital and as printout, "
@@ -115,7 +115,7 @@ msgid ""
 "          "
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:49
+#: templates/alsijil/print/full_register.html:47
 msgid ""
 "\n"
 "            The owner of the group and the headteacher confirm the above, "
@@ -124,85 +124,97 @@ msgid ""
 "          "
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:56
+#: templates/alsijil/print/full_register.html:54
 msgid "Headteacher"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:62
+#: templates/alsijil/print/full_register.html:60
 msgid "Persons in group"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:67
+#: templates/alsijil/print/full_register.html:65
 msgid "No."
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:68
+#: templates/alsijil/print/full_register.html:66
 msgid "Last name"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:69
+#: templates/alsijil/print/full_register.html:67
 msgid "First name"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:70
+#: templates/alsijil/print/full_register.html:68
 msgid "Sex"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:71
+#: templates/alsijil/print/full_register.html:69
 msgid "Date of birth"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:90
+#: templates/alsijil/print/full_register.html:70
+msgid "Absences"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:71
+msgid "Unexcused"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:72
+msgid "Tard."
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:94
 msgid "Teachers and lessons in group"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:95
+#: templates/alsijil/print/full_register.html:99
 #: templates/alsijil/week_view.html:40
 msgid "Subject"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:97
+#: templates/alsijil/print/full_register.html:101
 msgid "Lesson start"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:98
+#: templates/alsijil/print/full_register.html:102
 msgid "Lesson end"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:99
+#: templates/alsijil/print/full_register.html:103
 msgid "Per week"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:119
+#: templates/alsijil/print/full_register.html:123
 msgid "Lesson documentation for calendar week"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:125
+#: templates/alsijil/print/full_register.html:129
 msgid "Pe."
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:126
+#: templates/alsijil/print/full_register.html:130
 msgid "Subj."
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:127
+#: templates/alsijil/print/full_register.html:131
 msgid "Subs."
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:130
+#: templates/alsijil/print/full_register.html:134
 msgid "Notes"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:131
+#: templates/alsijil/print/full_register.html:135
 msgid "Te."
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:158
+#: templates/alsijil/print/full_register.html:162
 msgid "Lesson cancelled"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:171
-#: templates/alsijil/print/full_register.html:181
+#: templates/alsijil/print/full_register.html:175
+#: templates/alsijil/print/full_register.html:185
 msgid "e"
 msgstr ""
 
@@ -237,18 +249,18 @@ msgstr ""
 #: templates/alsijil/week_view.html:117
 msgid ""
 "\n"
-"            You must select a group, a teacher or a room to see the week "
-"summary.\n"
+"            There are no lessons for the selected group, teacher, room or "
+"time.\n"
 "          "
 msgstr ""
 
-#: views.py:39
+#: views.py:36
 msgid ""
 "You either selected an invalid lesson or there is currently no lesson in "
 "progress."
 msgstr ""
 
-#: views.py:42
+#: views.py:39
 msgid ""
 "You are not allowed to create a lesson documentation for a lesson in the "
 "future."

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

@@ -129,22 +129,21 @@ th.lessons-day-head {
   transform: rotate(-180deg);
 }
 
-tr.lesson-substituted {
-  background-color: #ffc107;
-}
-
-tr.lesson-cancelled {
-  background-color: #dc3545;
+tr.lesson-cancelled td.subj {
+  text-decoration: line-through;
 }
 
 tr.lesson-cancelled td {
-  text-decoration: line-through:
+  background-color: #dc3545;
 }
-
 tr.lesson-substituted td.lesson-subj {
   text-decoration: line-through;
 }
 
+tr.lesson-substituted td {
+  background-color: #ffc107;
+}
+
 td.lesson-notes {
   font-size: 80%;
 }

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

@@ -5,8 +5,6 @@
   <head>
     <meta charset="utf-8" />
 
-    <link rel="stylesheet"
-      href="https://raw.githubusercontent.com/cognitom/paper-css/master/paper.min.css" />
     <link rel="stylesheet"
       href="{% static 'css/alsijil/full_register.css' %}" />
   </head>
@@ -69,17 +67,23 @@
             <th>{% trans 'First name' %}</th>
             <th>{% trans 'Sex' %}</th>
             <th>{% trans 'Date of birth' %}</th>
+            <th>{% trans 'Absences' %}</th>
+            <th>{% trans 'Unexcused' %}</th>
+            <th>{% trans 'Tard.' %}</th>
           </tr>
         </thead>
 
         <tbody>
-          {% for person in group.members.all %}
+          {% for person in persons %}
             <tr>
               <td>{{ forloop.counter }}</td>
               <td>{{ person.last_name }}</td>
               <td>{{ person.first_name }}</td>
               <td>{{ person.get_sex_display }}</td>
               <td>{{ person.date_of_birth }}</td>
+              <td>{{ person.absences}}</td>
+              <td>{{ person.unexcused }}</td>
+              <td>{{ person.tardiness }}</td>
             </tr>
           {% endfor %}
         </tbody>

biscuit/apps/alsijil/templates/alsijil/week_view.html

@@ -22,7 +22,7 @@
     {% endif %}
   </div>
 
-  {% if group or teacher or room %}
+  {% if lesson_periods.count %}
     <div class="row">
       <div class="col-md-7">
         <div class="card">
@@ -115,7 +115,7 @@
       <div class="card-body">
         <p>
           {% blocktrans %}
-            You must select a group, a teacher or a room to see the week summary.
+            There are no lessons for the selected group, teacher, room or time.
           {% endblocktrans %}
         </p>
       </div>

biscuit/apps/alsijil/views.py

-from collections import OrderedDict
-from datetime import date, datetime, timedelta
+from datetime import date, datetime
 from typing import Optional
 
 from django.contrib.auth.decorators import login_required
 from django.core.exceptions import PermissionDenied
-from django.db.models import Count, Exists, F, OuterRef, Q, Sum
+from django.db.models import Count, Exists, OuterRef, Q, Sum
 from django.http import Http404, HttpRequest, HttpResponse
 from django.shortcuts import get_object_or_404, redirect, render
 from django.urls import reverse
 from django.utils.translation import ugettext as _
-from django.views.decorators.cache import cache_page
 
-from biscuit.apps.chronos.models import LessonPeriod, Room, TimePeriod
-from biscuit.apps.chronos.util import CalendarWeek, current_lesson_periods
+from biscuit.apps.chronos.models import LessonPeriod
+from biscuit.apps.chronos.util import CalendarWeek
 from biscuit.core.models import Group, Person
 
 from .forms import LessonDocumentationForm, PersonalNoteFormSet, SelectForm
@@ -29,8 +27,7 @@ def lesson(request: HttpRequest, year: Optional[int] = None, week: Optional[int]
         wanted_week = CalendarWeek(year=year, week=week)
     else:
         # Determine current lesson by current date and time
-        lesson_period = current_lesson_periods().filter(
-            Q(substitutions__teachers=request.user.person) | Q(lesson__teachers=request.user.person)).first()
+        lesson_period = LessonPeriod.objects.at_time().filter_teacher(request.user.person).first()
         wanted_week = CalendarWeek()
 
         if lesson_period:
@@ -38,7 +35,7 @@ def lesson(request: HttpRequest, year: Optional[int] = None, week: Optional[int]
         else:
             raise Http404(_('You either selected an invalid lesson or there is currently no lesson in progress.'))
 
-    if datetime.combine(wanted_week[lesson_period.period.weekday - 1], lesson_period.period.time_start) > datetime.now():
+    if datetime.combine(wanted_week[lesson_period.period.weekday - 1], lesson_period.period.time_start) > datetime.now() and not request.user.is_superuser:
         raise PermissionDenied(_('You are not allowed to create a lesson documentation for a lesson in the future.'))
 
     context['lesson_period'] = lesson_period
@@ -104,39 +101,14 @@ def week_view(request: HttpRequest, year: Optional[int] = None, week: Optional[i
                 lesson_period=OuterRef('pk'),
                 week=wanted_week.week
             ))
-        ).filter(
-            lesson__date_start__lte=wanted_week[0] + timedelta(days=1) * (F('period__weekday') - 1),
-            lesson__date_end__gte=wanted_week[0] + timedelta(days=1) * (F('period__weekday') - 1)
-        ).select_related(
-            'lesson', 'lesson__subject', 'period', 'room'
-        ).prefetch_related(
-            'lesson__groups', 'lesson__teachers', 'substitutions'
-        ).extra(
-            select={'_week': wanted_week.week}
-        )
-
-    teacher = None
-    group = None
-    room = None
+        ).in_week(wanted_week)
 
+    group = None  # FIXME workaround for #38
     if request.GET.get('group', None) or request.GET.get('teacher', None) or request.GET.get('room', None):
-        # Incrementally filter lesson periods by GET parameters
-        if 'group' in request.GET and request.GET['group']:
-            group = Group.objects.get(pk=request.GET['group'])
-            lesson_periods = lesson_periods.filter(
-                Q(lesson__groups__pk=int(request.GET['group'])) | Q(lesson__groups__parent_groups__pk=int(request.GET['group'])))
-        if 'teacher' in request.GET and request.GET['teacher']:
-            teacher = Person.objects.get(pk=request.GET['teacher'])
-            lesson_periods = lesson_periods.filter(
-                Q(substitutions__teachers__pk=int(request.GET['teacher']), substitutions__week=wanted_week.week) | Q(lesson__teachers__pk=int(request.GET['teacher'])))
-        if 'room' in request.GET and request.GET['room']:
-            room = Room.objects.get(pk=request.GET['room'])
-            lesson_periods = lesson_periods.filter(
-                room__pk=int(request.GET['room']))
+        lesson_periods = lesson_periods.filter_from_query(request.GET)
     elif hasattr(request, 'user') and hasattr(request.user, 'person'):
         group = request.user.person.owner_of.first()
-        lesson_periods = lesson_periods.filter(
-            Q(lesson__groups=group) | Q(lesson__groups__parent_groups=group))
+        lesson_periods = lesson_periods.filter_group(group)
     else:
         lesson_periods = None
 
@@ -173,9 +145,6 @@ def week_view(request: HttpRequest, year: Optional[int] = None, week: Optional[i
 
     context['current_head'] = str(wanted_week)
     context['week'] = wanted_week
-    context['group'] = group
-    context['teacher'] = teacher
-    context['room'] = room
     context['lesson_periods'] = lesson_periods
     context['persons'] = persons
     context['select_form'] = select_form
@@ -195,21 +164,10 @@ def full_register_group(request: HttpRequest, id_: int) -> HttpResponse:
     group = get_object_or_404(Group, pk=id_)
 
     # Get all lesson periods for the selected group
-    lesson_periods = LessonPeriod.objects.annotate(
-        has_documentation=Exists(LessonDocumentation.objects.filter(
-            ~Q(topic__exact=''),
-            lesson_period=OuterRef('pk'),
-        ))
-    ).filter(
-        lesson__date_start__gte=group.school.current_term.date_start,
-        lesson__date_end__lte=group.school.current_term.date_end
-    ).select_related(
-        'lesson', 'lesson__subject', 'period', 'room'
-    ).prefetch_related(
-        'lesson__groups', 'lesson__teachers', 'substitutions', 'documentations'
-    ).filter(
-        Q(lesson__groups=group) | Q(lesson__groups__parent_groups=group)
-    ).distinct()
+    lesson_periods = LessonPeriod.objects.within_dates(
+        group.school.current_term.date_start,
+        group.school.current_term.date_end
+    ).filter_group(group).distinct()
 
     weeks = CalendarWeek.weeks_within(group.school.current_term.date_start, group.school.current_term.date_end)
     periods_by_day = {}
@@ -224,6 +182,18 @@ def full_register_group(request: HttpRequest, id_: int) -> HttpResponse:
 
                 periods_by_day.setdefault(day, []).append((lesson_period, documentations, notes, substitution))
 
+    persons = group.members.annotate(
+            absences=Count('personal_notes__absent', filter=Q(
+                personal_notes__absent=True
+            )),
+            unexcused=Count('personal_notes__absent', filter=Q(
+                personal_notes__absent=True,
+                personal_notes__excused=False
+            )),
+            tardiness=Sum('personal_notes__late')
+        )
+
+    context['persons'] = persons
     context['group'] = group
     context['weeks'] = weeks
     context['periods_by_day'] = periods_by_day