Skip to content
Snippets Groups Projects
Verified Commit c903c34e authored by Tom Teichler's avatar Tom Teichler :beers:
Browse files

Merge branch 'master' into 30-prevent-lesson-edition-in-the-future

parents 59c427ef 51b82950
No related branches found
No related tags found
1 merge request!13Disallow creating lesson documentation for lessons in the future. Close #30.
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-09-07 23:31+0200\n"
"POT-Creation-Date: 2019-09-16 12:07+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -16,14 +16,13 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
#: forms.py:35
msgid "Group"
msgstr ""
#: menus.py:6
#: menus.py:6 templates/alsijil/print/full_register.html:17
msgid "Class register"
msgstr ""
......@@ -35,59 +34,56 @@ msgstr ""
msgid "Current week"
msgstr ""
#: models.py:30
#: models.py:30 templates/alsijil/print/full_register.html:131
msgid "Lesson topic"
msgstr ""
#: models.py:31
#: models.py:31 templates/alsijil/print/full_register.html:132
msgid "Homework"
msgstr ""
#: templates/alsijil/group_week.html:9
msgid "Week"
msgstr ""
#: templates/alsijil/group_week.html:18
#: templates/alsijil/group_week.html:14
msgid "Select"
msgstr ""
#: templates/alsijil/group_week.html:27
#: templates/alsijil/group_week.html:23
msgid "Lessons"
msgstr ""
#: templates/alsijil/group_week.html:44
#: templates/alsijil/group_week.html:32
msgid "Period"
msgstr ""
#: templates/alsijil/group_week.html:45
#: templates/alsijil/group_week.html:33
#: templates/alsijil/print/full_register.html:95
msgid "Subject"
msgstr ""
#: templates/alsijil/group_week.html:46
#: templates/alsijil/group_week.html:34
msgid "Teachers"
msgstr ""
#: templates/alsijil/group_week.html:80 templates/alsijil/lesson.html:54
#: templates/alsijil/group_week.html:75 templates/alsijil/lesson.html:54
msgid "Personal notes"
msgstr ""
#: templates/alsijil/group_week.html:86 templates/alsijil/lesson.html:62
#: templates/alsijil/group_week.html:81 templates/alsijil/lesson.html:62
msgid "Absent"
msgstr ""
#: templates/alsijil/group_week.html:87
#: templates/alsijil/group_week.html:82
msgid "unexcused"
msgstr ""
#: templates/alsijil/group_week.html:90
#: templates/alsijil/group_week.html:85
msgid "Summed up tardiness"
msgstr ""
#: templates/alsijil/group_week.html:111
#: templates/alsijil/group_week.html:106
msgid "No group selected"
msgstr ""
#: templates/alsijil/group_week.html:115
#: templates/alsijil/group_week.html:110
msgid ""
"\n"
" You must select a group to see the week summary.\n"
......@@ -122,8 +118,113 @@ msgstr ""
msgid "Save"
msgstr ""
#: views.py:34
#: templates/alsijil/print/full_register.html:23
#: templates/alsijil/print/full_register.html:55
msgid "Owners"
msgstr ""
#: templates/alsijil/print/full_register.html:27
msgid "Printed on"
msgstr ""
#: templates/alsijil/print/full_register.html:35
msgid ""
"\n"
" This printout is intended for archival purposes. The main copy of\n"
" the class register is stored in the BiscuIT School Information\n"
" System.\n"
" "
msgstr ""
#: templates/alsijil/print/full_register.html:42
msgid ""
"\n"
" Copies of the class register, both digital and as printout, must\n"
" only be kept inside the school and/or on devices authorised by the\n"
" school.\n"
" "
msgstr ""
#: templates/alsijil/print/full_register.html:49
msgid ""
"You either selected an invalid lesson or there is currently no lesson in "
"progress."
"\n"
" The owner of the group and the headteacher confirm the above, as\n"
" well as the correctness of this printout.\n"
" "
msgstr ""
#: templates/alsijil/print/full_register.html:56
msgid "Headteacher"
msgstr ""
#: templates/alsijil/print/full_register.html:62
msgid "Persons in group"
msgstr ""
#: templates/alsijil/print/full_register.html:67
msgid "No."
msgstr ""
#: templates/alsijil/print/full_register.html:68
msgid "Last name"
msgstr ""
#: templates/alsijil/print/full_register.html:69
msgid "First name"
msgstr ""
#: templates/alsijil/print/full_register.html:70
msgid "Sex"
msgstr ""
#: templates/alsijil/print/full_register.html:71
msgid "Date of birth"
msgstr ""
#: templates/alsijil/print/full_register.html:90
msgid "Teachers and lessons in group"
msgstr ""
#: templates/alsijil/print/full_register.html:96
msgid "Teacher"
msgstr ""
#: templates/alsijil/print/full_register.html:97
msgid "Lesson start"
msgstr ""
#: templates/alsijil/print/full_register.html:98
msgid "Lesson end"
msgstr ""
#: templates/alsijil/print/full_register.html:99
msgid "Per week"
msgstr ""
#: templates/alsijil/print/full_register.html:119
msgid "Lesson documentation for calendar week"
msgstr ""
#: templates/alsijil/print/full_register.html:128
msgid "Pe."
msgstr ""
#: templates/alsijil/print/full_register.html:129
msgid "Subj."
msgstr ""
#: templates/alsijil/print/full_register.html:130
msgid "Subs."
msgstr ""
#: templates/alsijil/print/full_register.html:133
msgid "Te."
msgstr ""
#: templates/alsijil/print/full_register.html:152
msgid "Lesson cancelled"
msgstr ""
#: views.py:36
msgid "You either selected an invalid lesson or there is currently no lesson in progress."
msgstr ""
......@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-09-07 23:31+0200\n"
"PO-Revision-Date: 2019-09-07 22:03+0000\n"
"Last-Translator: Tom Teichler <tom.teichler@teckids.org>\n"
"POT-Creation-Date: 2019-09-16 12:07+0000\n"
"PO-Revision-Date: 2019-09-16 12:17+0000\n"
"Last-Translator: Dominik George <dominik.george@teckids.org>\n"
"Language-Team: German <https://translate.edugit.org/projects/biscuit-sis/"
"biscuit-app-alsijil/de/>\n"
"Language: de_DE\n"
......@@ -23,7 +23,7 @@ msgstr ""
msgid "Group"
msgstr "Gruppe"
#: menus.py:6
#: menus.py:6 templates/alsijil/print/full_register.html:17
msgid "Class register"
msgstr "Klassenbuch"
......@@ -35,67 +35,63 @@ msgstr "Aktuelle Unterrichtsstunde"
msgid "Current week"
msgstr "Aktuelle Woche"
#: models.py:30
#: models.py:30 templates/alsijil/print/full_register.html:131
msgid "Lesson topic"
msgstr "Stundenthema"
#: models.py:31
#: models.py:31 templates/alsijil/print/full_register.html:132
msgid "Homework"
msgstr "Hausaufgaben"
#: templates/alsijil/group_week.html:9
msgid "Week"
msgstr "Woche"
#: templates/alsijil/group_week.html:18
#: templates/alsijil/group_week.html:14
msgid "Select"
msgstr "Auswählen"
#: templates/alsijil/group_week.html:27
#: templates/alsijil/group_week.html:23
msgid "Lessons"
msgstr "Unterrichtsstunden"
#: templates/alsijil/group_week.html:44
#: templates/alsijil/group_week.html:32
msgid "Period"
msgstr "Stunde"
#: templates/alsijil/group_week.html:45
#: templates/alsijil/group_week.html:33
#: templates/alsijil/print/full_register.html:95
msgid "Subject"
msgstr "Fach"
#: templates/alsijil/group_week.html:46
#: templates/alsijil/group_week.html:34
msgid "Teachers"
msgstr "Lehrkräfte"
#: templates/alsijil/group_week.html:80 templates/alsijil/lesson.html:54
#: templates/alsijil/group_week.html:75 templates/alsijil/lesson.html:54
msgid "Personal notes"
msgstr "Persönliche Notizen"
#: templates/alsijil/group_week.html:86 templates/alsijil/lesson.html:62
#: templates/alsijil/group_week.html:81 templates/alsijil/lesson.html:62
msgid "Absent"
msgstr "Abwesend"
#: templates/alsijil/group_week.html:87
#: templates/alsijil/group_week.html:82
msgid "unexcused"
msgstr "unentschuldigt"
#: templates/alsijil/group_week.html:90
#: templates/alsijil/group_week.html:85
msgid "Summed up tardiness"
msgstr "Summierte Verspätung"
#: templates/alsijil/group_week.html:111
#: templates/alsijil/group_week.html:106
msgid "No group selected"
msgstr "Keine Gruppe ausgewählt"
#: templates/alsijil/group_week.html:115
#: templates/alsijil/group_week.html:110
msgid ""
"\n"
" You must select a group to see the week summary.\n"
" "
msgstr ""
"\n"
" Sie müssen eien Gruppe auswählen, um die Wochenübersicht zu "
"sehen.\n"
" Sie müssen eien Gruppe auswählen, um die Wochenübersicht zu sehen.\n"
" "
#: templates/alsijil/lesson.html:10 templates/alsijil/lesson.html:34
......@@ -126,14 +122,140 @@ msgstr "Bemerkungen"
msgid "Save"
msgstr "Speichern"
#: views.py:34
#: templates/alsijil/print/full_register.html:23
#: templates/alsijil/print/full_register.html:55
msgid "Owners"
msgstr "Leiter/-innen"
#: templates/alsijil/print/full_register.html:27
msgid "Printed on"
msgstr "Gedruckt am"
#: templates/alsijil/print/full_register.html:35
msgid ""
"You either selected an invalid lesson or there is currently no lesson in "
"progress."
"\n"
" This printout is intended for archival purposes. The main copy of\n"
" the class register is stored in the BiscuIT School Information\n"
" System.\n"
" "
msgstr ""
"\n"
" Dieser Ausdruck ist für Archivierungszwecke gedacht. Die "
"Hauptkopie\n"
" des Klassenbusches ist im BiscuIT-Schul-Informations-System "
"gespeichert.\n"
" "
#: templates/alsijil/print/full_register.html:42
msgid ""
"\n"
" Copies of the class register, both digital and as printout, must\n"
" only be kept inside the school and/or on devices authorised by the\n"
" school.\n"
" "
msgstr ""
"\n"
" Kopien des Klassenbuches, sowohl digital als auch als Ausdruck, "
"dürfen\n"
" ausschließlich in der Schule und/oder auf vonder Schule "
"autorisierten Geräten\n"
" gespeichert werden.\n"
" "
#: templates/alsijil/print/full_register.html:49
msgid ""
"\n"
" The owner of the group and the headteacher confirm the above, as\n"
" well as the correctness of this printout.\n"
" "
msgstr ""
"\n"
" Die Leitung der Gruppe sowie die Schulleitung bestätigen die "
"obigen Hinweise sowie\n"
" die Richtigkeit des Ausdrucks.\n"
" "
#: templates/alsijil/print/full_register.html:56
msgid "Headteacher"
msgstr "Schulleitung"
#: templates/alsijil/print/full_register.html:62
msgid "Persons in group"
msgstr "Personen in der Gruppe"
#: templates/alsijil/print/full_register.html:67
msgid "No."
msgstr "Nr."
#: templates/alsijil/print/full_register.html:68
msgid "Last name"
msgstr "Nachname"
#: templates/alsijil/print/full_register.html:69
msgid "First name"
msgstr "Vorname"
#: templates/alsijil/print/full_register.html:70
msgid "Sex"
msgstr "Geschlecht"
#: templates/alsijil/print/full_register.html:71
msgid "Date of birth"
msgstr "Geburtsdatum"
#: templates/alsijil/print/full_register.html:90
msgid "Teachers and lessons in group"
msgstr "Lehrkräfte und Fächer der Gruppe"
#: templates/alsijil/print/full_register.html:96
msgid "Teacher"
msgstr "Lehrkraft"
#: templates/alsijil/print/full_register.html:97
msgid "Lesson start"
msgstr "Unterrichtsbeginn"
#: templates/alsijil/print/full_register.html:98
msgid "Lesson end"
msgstr "Unterrichtsende"
#: templates/alsijil/print/full_register.html:99
msgid "Per week"
msgstr "Pro Woche"
#: templates/alsijil/print/full_register.html:119
msgid "Lesson documentation for calendar week"
msgstr "Unterrichtsdokumentation für Kalenderwoche"
#: templates/alsijil/print/full_register.html:128
msgid "Pe."
msgstr "Std."
#: templates/alsijil/print/full_register.html:129
msgid "Subj."
msgstr "Fa."
#: templates/alsijil/print/full_register.html:130
msgid "Subs."
msgstr "Vertr."
#: templates/alsijil/print/full_register.html:133
msgid "Te."
msgstr "Lk."
#: templates/alsijil/print/full_register.html:152
msgid "Lesson cancelled"
msgstr "Stunde ist ausgefallen"
#: views.py:36
msgid "You either selected an invalid lesson or there is currently no lesson in progress."
msgstr ""
"Sie haben eine ungültige Stunde ausgewählt oder es\n"
" läuft momentan keine Stunde."
#~ msgid "Week"
#~ msgstr "Woche"
#~ msgid "BiscuIT - Alsijil (Class register)"
#~ msgstr "BiscuIT - Alsijil (Klassenbuch)"
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-09-07 23:31+0200\n"
"POT-Creation-Date: 2019-09-16 12:07+0000\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 ""
#: menus.py:6
#: menus.py:6 templates/alsijil/print/full_register.html:17
msgid "Class register"
msgstr ""
......@@ -34,59 +34,56 @@ msgstr ""
msgid "Current week"
msgstr ""
#: models.py:30
#: models.py:30 templates/alsijil/print/full_register.html:131
msgid "Lesson topic"
msgstr ""
#: models.py:31
#: models.py:31 templates/alsijil/print/full_register.html:132
msgid "Homework"
msgstr ""
#: templates/alsijil/group_week.html:9
msgid "Week"
msgstr ""
#: templates/alsijil/group_week.html:18
#: templates/alsijil/group_week.html:14
msgid "Select"
msgstr ""
#: templates/alsijil/group_week.html:27
#: templates/alsijil/group_week.html:23
msgid "Lessons"
msgstr ""
#: templates/alsijil/group_week.html:44
#: templates/alsijil/group_week.html:32
msgid "Period"
msgstr ""
#: templates/alsijil/group_week.html:45
#: templates/alsijil/group_week.html:33
#: templates/alsijil/print/full_register.html:95
msgid "Subject"
msgstr ""
#: templates/alsijil/group_week.html:46
#: templates/alsijil/group_week.html:34
msgid "Teachers"
msgstr ""
#: templates/alsijil/group_week.html:80 templates/alsijil/lesson.html:54
#: templates/alsijil/group_week.html:75 templates/alsijil/lesson.html:54
msgid "Personal notes"
msgstr ""
#: templates/alsijil/group_week.html:86 templates/alsijil/lesson.html:62
#: templates/alsijil/group_week.html:81 templates/alsijil/lesson.html:62
msgid "Absent"
msgstr ""
#: templates/alsijil/group_week.html:87
#: templates/alsijil/group_week.html:82
msgid "unexcused"
msgstr ""
#: templates/alsijil/group_week.html:90
#: templates/alsijil/group_week.html:85
msgid "Summed up tardiness"
msgstr ""
#: templates/alsijil/group_week.html:111
#: templates/alsijil/group_week.html:106
msgid "No group selected"
msgstr ""
#: templates/alsijil/group_week.html:115
#: templates/alsijil/group_week.html:110
msgid ""
"\n"
" You must select a group to see the week summary.\n"
......@@ -121,8 +118,113 @@ msgstr ""
msgid "Save"
msgstr ""
#: views.py:34
#: templates/alsijil/print/full_register.html:23
#: templates/alsijil/print/full_register.html:55
msgid "Owners"
msgstr ""
#: templates/alsijil/print/full_register.html:27
msgid "Printed on"
msgstr ""
#: templates/alsijil/print/full_register.html:35
msgid ""
"\n"
" This printout is intended for archival purposes. The main copy of\n"
" the class register is stored in the BiscuIT School Information\n"
" System.\n"
" "
msgstr ""
#: templates/alsijil/print/full_register.html:42
msgid ""
"\n"
" Copies of the class register, both digital and as printout, must\n"
" only be kept inside the school and/or on devices authorised by the\n"
" school.\n"
" "
msgstr ""
#: templates/alsijil/print/full_register.html:49
msgid ""
"You either selected an invalid lesson or there is currently no lesson in "
"progress."
"\n"
" The owner of the group and the headteacher confirm the above, as\n"
" well as the correctness of this printout.\n"
" "
msgstr ""
#: templates/alsijil/print/full_register.html:56
msgid "Headteacher"
msgstr ""
#: templates/alsijil/print/full_register.html:62
msgid "Persons in group"
msgstr ""
#: templates/alsijil/print/full_register.html:67
msgid "No."
msgstr ""
#: templates/alsijil/print/full_register.html:68
msgid "Last name"
msgstr ""
#: templates/alsijil/print/full_register.html:69
msgid "First name"
msgstr ""
#: templates/alsijil/print/full_register.html:70
msgid "Sex"
msgstr ""
#: templates/alsijil/print/full_register.html:71
msgid "Date of birth"
msgstr ""
#: templates/alsijil/print/full_register.html:90
msgid "Teachers and lessons in group"
msgstr ""
#: templates/alsijil/print/full_register.html:96
msgid "Teacher"
msgstr ""
#: templates/alsijil/print/full_register.html:97
msgid "Lesson start"
msgstr ""
#: templates/alsijil/print/full_register.html:98
msgid "Lesson end"
msgstr ""
#: templates/alsijil/print/full_register.html:99
msgid "Per week"
msgstr ""
#: templates/alsijil/print/full_register.html:119
msgid "Lesson documentation for calendar week"
msgstr ""
#: templates/alsijil/print/full_register.html:128
msgid "Pe."
msgstr ""
#: templates/alsijil/print/full_register.html:129
msgid "Subj."
msgstr ""
#: templates/alsijil/print/full_register.html:130
msgid "Subs."
msgstr ""
#: templates/alsijil/print/full_register.html:133
msgid "Te."
msgstr ""
#: templates/alsijil/print/full_register.html:152
msgid "Lesson cancelled"
msgstr ""
#: views.py:36
msgid "You either selected an invalid lesson or there is currently no lesson in progress."
msgstr ""
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-09-07 23:31+0200\n"
"POT-Creation-Date: 2019-09-16 12:07+0000\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 ""
#: menus.py:6
#: menus.py:6 templates/alsijil/print/full_register.html:17
msgid "Class register"
msgstr ""
......@@ -33,59 +33,56 @@ msgstr ""
msgid "Current week"
msgstr ""
#: models.py:30
#: models.py:30 templates/alsijil/print/full_register.html:131
msgid "Lesson topic"
msgstr ""
#: models.py:31
#: models.py:31 templates/alsijil/print/full_register.html:132
msgid "Homework"
msgstr ""
#: templates/alsijil/group_week.html:9
msgid "Week"
msgstr ""
#: templates/alsijil/group_week.html:18
#: templates/alsijil/group_week.html:14
msgid "Select"
msgstr ""
#: templates/alsijil/group_week.html:27
#: templates/alsijil/group_week.html:23
msgid "Lessons"
msgstr ""
#: templates/alsijil/group_week.html:44
#: templates/alsijil/group_week.html:32
msgid "Period"
msgstr ""
#: templates/alsijil/group_week.html:45
#: templates/alsijil/group_week.html:33
#: templates/alsijil/print/full_register.html:95
msgid "Subject"
msgstr ""
#: templates/alsijil/group_week.html:46
#: templates/alsijil/group_week.html:34
msgid "Teachers"
msgstr ""
#: templates/alsijil/group_week.html:80 templates/alsijil/lesson.html:54
#: templates/alsijil/group_week.html:75 templates/alsijil/lesson.html:54
msgid "Personal notes"
msgstr ""
#: templates/alsijil/group_week.html:86 templates/alsijil/lesson.html:62
#: templates/alsijil/group_week.html:81 templates/alsijil/lesson.html:62
msgid "Absent"
msgstr ""
#: templates/alsijil/group_week.html:87
#: templates/alsijil/group_week.html:82
msgid "unexcused"
msgstr ""
#: templates/alsijil/group_week.html:90
#: templates/alsijil/group_week.html:85
msgid "Summed up tardiness"
msgstr ""
#: templates/alsijil/group_week.html:111
#: templates/alsijil/group_week.html:106
msgid "No group selected"
msgstr ""
#: templates/alsijil/group_week.html:115
#: templates/alsijil/group_week.html:110
msgid ""
"\n"
" You must select a group to see the week summary.\n"
......@@ -120,8 +117,113 @@ msgstr ""
msgid "Save"
msgstr ""
#: views.py:34
#: templates/alsijil/print/full_register.html:23
#: templates/alsijil/print/full_register.html:55
msgid "Owners"
msgstr ""
#: templates/alsijil/print/full_register.html:27
msgid "Printed on"
msgstr ""
#: templates/alsijil/print/full_register.html:35
msgid ""
"\n"
" This printout is intended for archival purposes. The main copy of\n"
" the class register is stored in the BiscuIT School Information\n"
" System.\n"
" "
msgstr ""
#: templates/alsijil/print/full_register.html:42
msgid ""
"\n"
" Copies of the class register, both digital and as printout, must\n"
" only be kept inside the school and/or on devices authorised by the\n"
" school.\n"
" "
msgstr ""
#: templates/alsijil/print/full_register.html:49
msgid ""
"You either selected an invalid lesson or there is currently no lesson in "
"progress."
"\n"
" The owner of the group and the headteacher confirm the above, as\n"
" well as the correctness of this printout.\n"
" "
msgstr ""
#: templates/alsijil/print/full_register.html:56
msgid "Headteacher"
msgstr ""
#: templates/alsijil/print/full_register.html:62
msgid "Persons in group"
msgstr ""
#: templates/alsijil/print/full_register.html:67
msgid "No."
msgstr ""
#: templates/alsijil/print/full_register.html:68
msgid "Last name"
msgstr ""
#: templates/alsijil/print/full_register.html:69
msgid "First name"
msgstr ""
#: templates/alsijil/print/full_register.html:70
msgid "Sex"
msgstr ""
#: templates/alsijil/print/full_register.html:71
msgid "Date of birth"
msgstr ""
#: templates/alsijil/print/full_register.html:90
msgid "Teachers and lessons in group"
msgstr ""
#: templates/alsijil/print/full_register.html:96
msgid "Teacher"
msgstr ""
#: templates/alsijil/print/full_register.html:97
msgid "Lesson start"
msgstr ""
#: templates/alsijil/print/full_register.html:98
msgid "Lesson end"
msgstr ""
#: templates/alsijil/print/full_register.html:99
msgid "Per week"
msgstr ""
#: templates/alsijil/print/full_register.html:119
msgid "Lesson documentation for calendar week"
msgstr ""
#: templates/alsijil/print/full_register.html:128
msgid "Pe."
msgstr ""
#: templates/alsijil/print/full_register.html:129
msgid "Subj."
msgstr ""
#: templates/alsijil/print/full_register.html:130
msgid "Subs."
msgstr ""
#: templates/alsijil/print/full_register.html:133
msgid "Te."
msgstr ""
#: templates/alsijil/print/full_register.html:152
msgid "Lesson cancelled"
msgstr ""
#: views.py:36
msgid "You either selected an invalid lesson or there is currently no lesson in progress."
msgstr ""
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-09-07 23:31+0200\n"
"POT-Creation-Date: 2019-09-16 12:07+0000\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 ""
#: menus.py:6
#: menus.py:6 templates/alsijil/print/full_register.html:17
msgid "Class register"
msgstr ""
......@@ -33,59 +33,56 @@ msgstr ""
msgid "Current week"
msgstr ""
#: models.py:30
#: models.py:30 templates/alsijil/print/full_register.html:131
msgid "Lesson topic"
msgstr ""
#: models.py:31
#: models.py:31 templates/alsijil/print/full_register.html:132
msgid "Homework"
msgstr ""
#: templates/alsijil/group_week.html:9
msgid "Week"
msgstr ""
#: templates/alsijil/group_week.html:18
#: templates/alsijil/group_week.html:14
msgid "Select"
msgstr ""
#: templates/alsijil/group_week.html:27
#: templates/alsijil/group_week.html:23
msgid "Lessons"
msgstr ""
#: templates/alsijil/group_week.html:44
#: templates/alsijil/group_week.html:32
msgid "Period"
msgstr ""
#: templates/alsijil/group_week.html:45
#: templates/alsijil/group_week.html:33
#: templates/alsijil/print/full_register.html:95
msgid "Subject"
msgstr ""
#: templates/alsijil/group_week.html:46
#: templates/alsijil/group_week.html:34
msgid "Teachers"
msgstr ""
#: templates/alsijil/group_week.html:80 templates/alsijil/lesson.html:54
#: templates/alsijil/group_week.html:75 templates/alsijil/lesson.html:54
msgid "Personal notes"
msgstr ""
#: templates/alsijil/group_week.html:86 templates/alsijil/lesson.html:62
#: templates/alsijil/group_week.html:81 templates/alsijil/lesson.html:62
msgid "Absent"
msgstr ""
#: templates/alsijil/group_week.html:87
#: templates/alsijil/group_week.html:82
msgid "unexcused"
msgstr ""
#: templates/alsijil/group_week.html:90
#: templates/alsijil/group_week.html:85
msgid "Summed up tardiness"
msgstr ""
#: templates/alsijil/group_week.html:111
#: templates/alsijil/group_week.html:106
msgid "No group selected"
msgstr ""
#: templates/alsijil/group_week.html:115
#: templates/alsijil/group_week.html:110
msgid ""
"\n"
" You must select a group to see the week summary.\n"
......@@ -120,8 +117,113 @@ msgstr ""
msgid "Save"
msgstr ""
#: views.py:34
#: templates/alsijil/print/full_register.html:23
#: templates/alsijil/print/full_register.html:55
msgid "Owners"
msgstr ""
#: templates/alsijil/print/full_register.html:27
msgid "Printed on"
msgstr ""
#: templates/alsijil/print/full_register.html:35
msgid ""
"\n"
" This printout is intended for archival purposes. The main copy of\n"
" the class register is stored in the BiscuIT School Information\n"
" System.\n"
" "
msgstr ""
#: templates/alsijil/print/full_register.html:42
msgid ""
"\n"
" Copies of the class register, both digital and as printout, must\n"
" only be kept inside the school and/or on devices authorised by the\n"
" school.\n"
" "
msgstr ""
#: templates/alsijil/print/full_register.html:49
msgid ""
"You either selected an invalid lesson or there is currently no lesson in "
"progress."
"\n"
" The owner of the group and the headteacher confirm the above, as\n"
" well as the correctness of this printout.\n"
" "
msgstr ""
#: templates/alsijil/print/full_register.html:56
msgid "Headteacher"
msgstr ""
#: templates/alsijil/print/full_register.html:62
msgid "Persons in group"
msgstr ""
#: templates/alsijil/print/full_register.html:67
msgid "No."
msgstr ""
#: templates/alsijil/print/full_register.html:68
msgid "Last name"
msgstr ""
#: templates/alsijil/print/full_register.html:69
msgid "First name"
msgstr ""
#: templates/alsijil/print/full_register.html:70
msgid "Sex"
msgstr ""
#: templates/alsijil/print/full_register.html:71
msgid "Date of birth"
msgstr ""
#: templates/alsijil/print/full_register.html:90
msgid "Teachers and lessons in group"
msgstr ""
#: templates/alsijil/print/full_register.html:96
msgid "Teacher"
msgstr ""
#: templates/alsijil/print/full_register.html:97
msgid "Lesson start"
msgstr ""
#: templates/alsijil/print/full_register.html:98
msgid "Lesson end"
msgstr ""
#: templates/alsijil/print/full_register.html:99
msgid "Per week"
msgstr ""
#: templates/alsijil/print/full_register.html:119
msgid "Lesson documentation for calendar week"
msgstr ""
#: templates/alsijil/print/full_register.html:128
msgid "Pe."
msgstr ""
#: templates/alsijil/print/full_register.html:129
msgid "Subj."
msgstr ""
#: templates/alsijil/print/full_register.html:130
msgid "Subs."
msgstr ""
#: templates/alsijil/print/full_register.html:133
msgid "Te."
msgstr ""
#: templates/alsijil/print/full_register.html:152
msgid "Lesson cancelled"
msgstr ""
#: views.py:36
msgid "You either selected an invalid lesson or there is currently no lesson in progress."
msgstr ""
......@@ -53,7 +53,27 @@ body.legal.landscape .sheet { width: 357mm; height: 215mm }
body {
font-family: Arial, Helvetica, san-serif;
font-size: 11pt;
font-size: 10pt;
}
section.sheet.smallprint {
font-size: 8pt;
}
section.sheet.bigprint {
font-size: 12pt;
}
span.signature-line {
display: inline-block;
width: 10em;
border-bottom: 1px solid;
}
#titlepage {
display: flex;
flex-direction: column;
justify-content: space-around;
}
#titlepage h1 {
......@@ -73,11 +93,19 @@ body {
text-align: center;
}
#titlepage p#printed-info {
text-align: center;
}
#titlepage p#group-owners {
font-size: 130%;
text-align: center;
}
#titlepage p#signatures {
padding-top: 2em;
}
table {
width: 100%;
border: 1px solid black;
......@@ -91,3 +119,19 @@ th, td {
tr:nth-child(even) {
background-color: #f2f2f2;
}
tr.lesson-substituted {
background-color: #ffc107;
}
tr.lesson-cancelled {
background-color: #dc3545;
}
tr.lesson-cancelled td {
text-decoration: line-through:
}
tr.lesson-substituted td.lesson-subj {
text-decoration: line-through;
}
......@@ -12,15 +12,50 @@
</head>
<body class="A4">
<section class="sheet padding-10mm" id="titlepage">
<h1>{% trans 'Class register' %}</h1>
<img src="{% cropped_thumbnail group.school 'logo_cropping' max_size='600x600' %}" id="school-logo" />
<p id="group-desc">
{{ group.name }}
</p>
<p id="group-owners">
{{ group.owners.all|join:', ' }}
</p>
<section class="sheet padding-10mm bigprint" id="titlepage">
<div>
<h1>{% trans 'Class register' %}</h1>
<img src="{% cropped_thumbnail group.school 'logo_cropping' max_size='600x600' %}" id="school-logo" />
<p id="group-desc">
{{ group.name }}
</p>
<p id="group-owners">
{% trans 'Owners' %}:
{{ group.owners.all|join:', ' }}
</p>
<p id="printed-info">
{% trans 'Printed on' %} {{ today }}
</p>
</div>
<div>
<hr />
</div>
<div>
<p>
{% blocktrans %}
This printout is intended for archival purposes. The main copy of
the class register is stored in the BiscuIT School Information
System.
{% endblocktrans %}
</p>
<p>
{% blocktrans %}
Copies of the class register, both digital and as printout, must
only be kept inside the school and/or on devices authorised by the
school.
{% endblocktrans %}
</p>
<p>
{% blocktrans %}
The owner of the group and the headteacher confirm the above, as
well as the correctness of this printout.
{% endblocktrans %}
</p>
<p id="signatures">
<span class="signature-line"></span> ({% trans 'Owners' %}),
<span class="signature-line"></span> ({% trans 'Headteacher' %})
</p>
</div>
</section>
<section class="sheet padding-10mm" id="persons-overview">
......@@ -80,12 +115,56 @@
</section>
{% for week in weeks %}
<section class="sheet padding-10mm">
<h2>{% trans 'Lesson documentation for week' %} {{ week }}</h2>
<section class="sheet padding-10mm smallprint">
<h2>{% trans 'Lesson documentation for calendar week' %} {{ week.week }}</h2>
{% for day in week %}
<h3>{{ day }}</h3>
{{ periods_by_day|get_dict:day }}
{% if periods_by_day|get_dict:day %}
<h3>{{ day }}</h3>
<table>
<thead>
<tr>
<th>{% trans 'Pe.' %}</th>
<th>{% trans 'Subj.' %}</th>
<th>{% trans 'Subs.' %}</th>
<th>{% trans 'Lesson topic' %}</th>
<th>{% trans 'Homework' %}</th>
<th>{% trans 'Te.' %}</th>
</tr>
</thead>
<tbody>
{% for period, documentations, substitution in periods_by_day|get_dict:day %}
<tr class="
{% if substitution %}
{% if substitution.cancelled %}
lesson-cancelled
{% else %}
lesson-substituted
{% endif %}
{% endif %}
">
<td class="lesson-pe">{{ period.period.period }}</td>
<td class="lesson-subj">{{ period.lesson.subject.abbrev }}</td>
<td class="lesson-subs">{{ substitution.subject.abbrev }}</td>
<td class="lesson-topic">
{% if substitution.cancelled %}
{% trans 'Lesson cancelled' %}
{% else %}
{{ documentations.0.topic }}
{% endif %}
</td>
<td class="lesson-homework">{{ documentations.0.homework }}</td>
<td class="lesson-te">
{% if documentations.0.topic %}
{{ substitution.teachers.first.short_name|default:period.lesson.teachers.first.short_name }}
{% endif %}
</td>
</tr>
{% endfor %}
</tbody>
</table>
{% endif %}
{% endfor %}
</section>
{% endfor %}
......
from collections import OrderedDict
from datetime import datetime, timedelta
from datetime import date, datetime, timedelta
from typing import Optional
from django.contrib.auth.decorators import login_required
......@@ -192,7 +192,7 @@ def full_register_group(request: HttpRequest, id_: int) -> HttpResponse:
).select_related(
'lesson', 'lesson__subject', 'period', 'room'
).prefetch_related(
'lesson__groups', 'lesson__teachers', 'substitutions'
'lesson__groups', 'lesson__teachers', 'substitutions', 'documentations'
).filter(
Q(lesson__groups=group) | Q(lesson__groups__parent_groups=group)
).distinct()
......@@ -221,16 +221,21 @@ def full_register_group(request: HttpRequest, id_: int) -> HttpResponse:
weeks = CalendarWeek.weeks_within(group.school.current_term.date_start, group.school.current_term.date_end)
periods_by_day = {}
for week in weeks:
for day in week:
periods_by_day[day] = lesson_periods.filter(
period__weekday=day.isoweekday()
)
for lesson_period in lesson_periods:
for week in weeks:
day = week[lesson_period.period.weekday - 1]
if lesson_period.lesson.date_start <= day and lesson_period.lesson.date_end >= day:
documentations = list(filter(lambda d: d.week == week.week, lesson_period.documentations.all()))
substitution = lesson_period.get_substitution(week.week)
periods_by_day.setdefault(day, []).append((lesson_period, documentations, substitution))
context['group'] = group
context['weeks'] = weeks
context['lesson_periods'] = lesson_periods
context['periods_by_day'] = periods_by_day
context['persons'] = persons
context['today'] = date.today()
return render(request, 'alsijil/print/full_register.html', context)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment