Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • AlekSIS/official/AlekSIS-App-Alsijil
  • sunweaver/AlekSIS-App-Alsijil
  • 8tincsoVluke/AlekSIS-App-Alsijil
  • perfreicpo/AlekSIS-App-Alsijil
  • noifobarep/AlekSIS-App-Alsijil
  • 7ingannisdo/AlekSIS-App-Alsijil
  • unmruntartpa/AlekSIS-App-Alsijil
  • balrorebta/AlekSIS-App-Alsijil
  • comliFdifwa/AlekSIS-App-Alsijil
  • 3ranaadza/AlekSIS-App-Alsijil
10 results
Show changes
Commits on Source (17)
Hide whitespace changes
Inline Side-by-side
Showing
with 305 additions and 249 deletions
CHANGELOG.rst
View file @ 466b9fb9
Changelog 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`_ `1.0a1`_
-------- --------
...@@ -25,3 +43,4 @@ Minor changes ...@@ -25,3 +43,4 @@ Minor changes
* Use bootstrap buttons everywhere * Use bootstrap buttons everywhere
_`1.0a1`: https://edugit.org/Teckids/BiscuIT/BiscuIT-App-Alsijil/-/tags/1.0a1 _`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
View file @ 466b9fb9
...@@ -8,7 +8,7 @@ msgid "" ...@@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
...@@ -23,7 +23,7 @@ msgstr "" ...@@ -23,7 +23,7 @@ msgstr ""
msgid "Group" msgid "Group"
msgstr "" msgstr ""
#: forms.py:40 templates/alsijil/print/full_register.html:96 #: forms.py:40 templates/alsijil/print/full_register.html:100
msgid "Teacher" msgid "Teacher"
msgstr "" msgstr ""
...@@ -31,7 +31,7 @@ msgstr "" ...@@ -31,7 +31,7 @@ msgstr ""
msgid "Room" msgid "Room"
msgstr "" msgstr ""
#: menus.py:6 templates/alsijil/print/full_register.html:17 #: menus.py:6 templates/alsijil/print/full_register.html:15
msgid "Class register" msgid "Class register"
msgstr "" msgstr ""
...@@ -43,11 +43,11 @@ msgstr "" ...@@ -43,11 +43,11 @@ msgstr ""
msgid "Current week" msgid "Current week"
msgstr "" msgstr ""
#: models.py:30 templates/alsijil/print/full_register.html:128 #: models.py:30 templates/alsijil/print/full_register.html:132
msgid "Lesson topic" msgid "Lesson topic"
msgstr "" msgstr ""
#: models.py:31 templates/alsijil/print/full_register.html:129 #: models.py:31 templates/alsijil/print/full_register.html:133
msgid "Homework" msgid "Homework"
msgstr "" msgstr ""
...@@ -87,16 +87,16 @@ msgstr "" ...@@ -87,16 +87,16 @@ msgstr ""
msgid "Save" msgid "Save"
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:23 #: templates/alsijil/print/full_register.html:21
#: templates/alsijil/print/full_register.html:55 #: templates/alsijil/print/full_register.html:53
msgid "Owners" msgid "Owners"
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:27 #: templates/alsijil/print/full_register.html:25
msgid "Printed on" msgid "Printed on"
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:35 #: templates/alsijil/print/full_register.html:33
msgid "" msgid ""
"\n" "\n"
" This printout is intended for archival purposes. The main copy " " This printout is intended for archival purposes. The main copy "
...@@ -106,7 +106,7 @@ msgid "" ...@@ -106,7 +106,7 @@ msgid ""
" " " "
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:42 #: templates/alsijil/print/full_register.html:40
msgid "" msgid ""
"\n" "\n"
" Copies of the class register, both digital and as printout, " " Copies of the class register, both digital and as printout, "
...@@ -117,7 +117,7 @@ msgid "" ...@@ -117,7 +117,7 @@ msgid ""
" " " "
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:49 #: templates/alsijil/print/full_register.html:47
msgid "" msgid ""
"\n" "\n"
" The owner of the group and the headteacher confirm the above, " " The owner of the group and the headteacher confirm the above, "
...@@ -126,85 +126,97 @@ msgid "" ...@@ -126,85 +126,97 @@ msgid ""
" " " "
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:56 #: templates/alsijil/print/full_register.html:54
msgid "Headteacher" msgid "Headteacher"
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:62 #: templates/alsijil/print/full_register.html:60
msgid "Persons in group" msgid "Persons in group"
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:67 #: templates/alsijil/print/full_register.html:65
msgid "No." msgid "No."
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:68 #: templates/alsijil/print/full_register.html:66
msgid "Last name" msgid "Last name"
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:69 #: templates/alsijil/print/full_register.html:67
msgid "First name" msgid "First name"
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:70 #: templates/alsijil/print/full_register.html:68
msgid "Sex" msgid "Sex"
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:71 #: templates/alsijil/print/full_register.html:69
msgid "Date of birth" msgid "Date of birth"
msgstr "" 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" msgid "Teachers and lessons in group"
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:95 #: templates/alsijil/print/full_register.html:99
#: templates/alsijil/week_view.html:40 #: templates/alsijil/week_view.html:40
msgid "Subject" msgid "Subject"
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:97 #: templates/alsijil/print/full_register.html:101
msgid "Lesson start" msgid "Lesson start"
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:98 #: templates/alsijil/print/full_register.html:102
msgid "Lesson end" msgid "Lesson end"
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:99 #: templates/alsijil/print/full_register.html:103
msgid "Per week" msgid "Per week"
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:119 #: templates/alsijil/print/full_register.html:123
msgid "Lesson documentation for calendar week" msgid "Lesson documentation for calendar week"
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:125 #: templates/alsijil/print/full_register.html:129
msgid "Pe." msgid "Pe."
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:126 #: templates/alsijil/print/full_register.html:130
msgid "Subj." msgid "Subj."
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:127 #: templates/alsijil/print/full_register.html:131
msgid "Subs." msgid "Subs."
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:130 #: templates/alsijil/print/full_register.html:134
msgid "Notes" msgid "Notes"
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:131 #: templates/alsijil/print/full_register.html:135
msgid "Te." msgid "Te."
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:158 #: templates/alsijil/print/full_register.html:162
msgid "Lesson cancelled" msgid "Lesson cancelled"
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:171 #: templates/alsijil/print/full_register.html:175
#: templates/alsijil/print/full_register.html:181 #: templates/alsijil/print/full_register.html:185
msgid "e" msgid "e"
msgstr "" msgstr ""
...@@ -239,18 +251,18 @@ msgstr "" ...@@ -239,18 +251,18 @@ msgstr ""
#: templates/alsijil/week_view.html:117 #: templates/alsijil/week_view.html:117
msgid "" msgid ""
"\n" "\n"
" You must select a group, a teacher or a room to see the week " " There are no lessons for the selected group, teacher, room or "
"summary.\n" "time.\n"
" " " "
msgstr "" msgstr ""
#: views.py:39 #: views.py:36
msgid "" msgid ""
"You either selected an invalid lesson or there is currently no lesson in " "You either selected an invalid lesson or there is currently no lesson in "
"progress." "progress."
msgstr "" msgstr ""
#: views.py:42 #: views.py:39
msgid "" msgid ""
"You are not allowed to create a lesson documentation for a lesson in the " "You are not allowed to create a lesson documentation for a lesson in the "
"future." "future."
......
biscuit/apps/alsijil/locale/de_DE/LC_MESSAGES/django.po
View file @ 466b9fb9
...@@ -7,7 +7,7 @@ msgid "" ...@@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: 2019-09-17 19:44+0000\n"
"Last-Translator: Tom Teichler <tom.teichler@teckids.org>\n" "Last-Translator: Tom Teichler <tom.teichler@teckids.org>\n"
"Language-Team: German <https://translate.edugit.org/projects/biscuit-sis/" "Language-Team: German <https://translate.edugit.org/projects/biscuit-sis/"
...@@ -23,7 +23,7 @@ msgstr "" ...@@ -23,7 +23,7 @@ msgstr ""
msgid "Group" msgid "Group"
msgstr "Gruppe" msgstr "Gruppe"
#: forms.py:40 templates/alsijil/print/full_register.html:96 #: forms.py:40 templates/alsijil/print/full_register.html:100
msgid "Teacher" msgid "Teacher"
msgstr "Lehrkraft" msgstr "Lehrkraft"
...@@ -31,7 +31,7 @@ msgstr "Lehrkraft" ...@@ -31,7 +31,7 @@ msgstr "Lehrkraft"
msgid "Room" msgid "Room"
msgstr "" msgstr ""
#: menus.py:6 templates/alsijil/print/full_register.html:17 #: menus.py:6 templates/alsijil/print/full_register.html:15
msgid "Class register" msgid "Class register"
msgstr "Klassenbuch" msgstr "Klassenbuch"
...@@ -43,11 +43,11 @@ msgstr "Aktuelle Unterrichtsstunde" ...@@ -43,11 +43,11 @@ msgstr "Aktuelle Unterrichtsstunde"
msgid "Current week" msgid "Current week"
msgstr "Aktuelle Woche" 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" msgid "Lesson topic"
msgstr "Stundenthema" msgstr "Stundenthema"
#: models.py:31 templates/alsijil/print/full_register.html:129 #: models.py:31 templates/alsijil/print/full_register.html:133
msgid "Homework" msgid "Homework"
msgstr "Hausaufgaben" msgstr "Hausaufgaben"
...@@ -87,16 +87,16 @@ msgstr "Bemerkungen" ...@@ -87,16 +87,16 @@ msgstr "Bemerkungen"
msgid "Save" msgid "Save"
msgstr "Speichern" msgstr "Speichern"
#: templates/alsijil/print/full_register.html:23 #: templates/alsijil/print/full_register.html:21
#: templates/alsijil/print/full_register.html:55 #: templates/alsijil/print/full_register.html:53
msgid "Owners" msgid "Owners"
msgstr "Leiter/-innen" msgstr "Leiter/-innen"
#: templates/alsijil/print/full_register.html:27 #: templates/alsijil/print/full_register.html:25
msgid "Printed on" msgid "Printed on"
msgstr "Gedruckt am" msgstr "Gedruckt am"
#: templates/alsijil/print/full_register.html:35 #: templates/alsijil/print/full_register.html:33
msgid "" msgid ""
"\n" "\n"
" This printout is intended for archival purposes. The main copy " " This printout is intended for archival purposes. The main copy "
...@@ -112,7 +112,7 @@ msgstr "" ...@@ -112,7 +112,7 @@ msgstr ""
"gespeichert.\n" "gespeichert.\n"
" " " "
#: templates/alsijil/print/full_register.html:42 #: templates/alsijil/print/full_register.html:40
msgid "" msgid ""
"\n" "\n"
" Copies of the class register, both digital and as printout, " " Copies of the class register, both digital and as printout, "
...@@ -130,7 +130,7 @@ msgstr "" ...@@ -130,7 +130,7 @@ msgstr ""
" gespeichert werden.\n" " gespeichert werden.\n"
" " " "
#: templates/alsijil/print/full_register.html:49 #: templates/alsijil/print/full_register.html:47
msgid "" msgid ""
"\n" "\n"
" The owner of the group and the headteacher confirm the above, " " The owner of the group and the headteacher confirm the above, "
...@@ -144,85 +144,101 @@ msgstr "" ...@@ -144,85 +144,101 @@ msgstr ""
" die Richtigkeit des Ausdrucks.\n" " die Richtigkeit des Ausdrucks.\n"
" " " "
#: templates/alsijil/print/full_register.html:56 #: templates/alsijil/print/full_register.html:54
msgid "Headteacher" msgid "Headteacher"
msgstr "Schulleitung" msgstr "Schulleitung"
#: templates/alsijil/print/full_register.html:62 #: templates/alsijil/print/full_register.html:60
msgid "Persons in group" msgid "Persons in group"
msgstr "Personen in der Gruppe" msgstr "Personen in der Gruppe"
#: templates/alsijil/print/full_register.html:67 #: templates/alsijil/print/full_register.html:65
msgid "No." msgid "No."
msgstr "Nr." msgstr "Nr."
#: templates/alsijil/print/full_register.html:68 #: templates/alsijil/print/full_register.html:66
msgid "Last name" msgid "Last name"
msgstr "Nachname" msgstr "Nachname"
#: templates/alsijil/print/full_register.html:69 #: templates/alsijil/print/full_register.html:67
msgid "First name" msgid "First name"
msgstr "Vorname" msgstr "Vorname"
#: templates/alsijil/print/full_register.html:70 #: templates/alsijil/print/full_register.html:68
msgid "Sex" msgid "Sex"
msgstr "Geschlecht" msgstr "Geschlecht"
#: templates/alsijil/print/full_register.html:71 #: templates/alsijil/print/full_register.html:69
msgid "Date of birth" msgid "Date of birth"
msgstr "Geburtsdatum" 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" msgid "Teachers and lessons in group"
msgstr "Lehrkräfte und Fächer der Gruppe" 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 #: templates/alsijil/week_view.html:40
msgid "Subject" msgid "Subject"
msgstr "Fach" msgstr "Fach"
#: templates/alsijil/print/full_register.html:97 #: templates/alsijil/print/full_register.html:101
msgid "Lesson start" msgid "Lesson start"
msgstr "Unterrichtsbeginn" msgstr "Unterrichtsbeginn"
#: templates/alsijil/print/full_register.html:98 #: templates/alsijil/print/full_register.html:102
msgid "Lesson end" msgid "Lesson end"
msgstr "Unterrichtsende" msgstr "Unterrichtsende"
#: templates/alsijil/print/full_register.html:99 #: templates/alsijil/print/full_register.html:103
msgid "Per week" msgid "Per week"
msgstr "Pro Woche" msgstr "Pro Woche"
#: templates/alsijil/print/full_register.html:119 #: templates/alsijil/print/full_register.html:123
msgid "Lesson documentation for calendar week" msgid "Lesson documentation for calendar week"
msgstr "Unterrichtsdokumentation für Kalenderwoche" msgstr "Unterrichtsdokumentation für Kalenderwoche"
#: templates/alsijil/print/full_register.html:125 #: templates/alsijil/print/full_register.html:129
msgid "Pe." msgid "Pe."
msgstr "Std." msgstr "Std."
#: templates/alsijil/print/full_register.html:126 #: templates/alsijil/print/full_register.html:130
msgid "Subj." msgid "Subj."
msgstr "Fa." msgstr "Fa."
#: templates/alsijil/print/full_register.html:127 #: templates/alsijil/print/full_register.html:131
msgid "Subs." msgid "Subs."
msgstr "Vertr." msgstr "Vertr."
#: templates/alsijil/print/full_register.html:130 #: templates/alsijil/print/full_register.html:134
msgid "Notes" msgid "Notes"
msgstr "Notizen" msgstr "Notizen"
#: templates/alsijil/print/full_register.html:131 #: templates/alsijil/print/full_register.html:135
msgid "Te." msgid "Te."
msgstr "Lk." msgstr "Lk."
#: templates/alsijil/print/full_register.html:158 #: templates/alsijil/print/full_register.html:162
msgid "Lesson cancelled" msgid "Lesson cancelled"
msgstr "Stunde ist ausgefallen" msgstr "Stunde ist ausgefallen"
#: templates/alsijil/print/full_register.html:171 #: templates/alsijil/print/full_register.html:175
#: templates/alsijil/print/full_register.html:181 #: templates/alsijil/print/full_register.html:185
msgid "e" msgid "e"
msgstr "e" msgstr "e"
...@@ -262,8 +278,8 @@ msgstr "Keine Gruppe ausgewählt" ...@@ -262,8 +278,8 @@ msgstr "Keine Gruppe ausgewählt"
#| " " #| " "
msgid "" msgid ""
"\n" "\n"
" You must select a group, a teacher or a room to see the week " " There are no lessons for the selected group, teacher, room or "
"summary.\n" "time.\n"
" " " "
msgstr "" msgstr ""
"\n" "\n"
...@@ -271,7 +287,7 @@ msgstr "" ...@@ -271,7 +287,7 @@ msgstr ""
"sehen.\n" "sehen.\n"
" " " "
#: views.py:39 #: views.py:36
msgid "" msgid ""
"You either selected an invalid lesson or there is currently no lesson in " "You either selected an invalid lesson or there is currently no lesson in "
"progress." "progress."
...@@ -279,7 +295,7 @@ msgstr "" ...@@ -279,7 +295,7 @@ msgstr ""
"Sie haben eine ungültige Stunde ausgewählt oder es\n" "Sie haben eine ungültige Stunde ausgewählt oder es\n"
" läuft momentan keine Stunde." " läuft momentan keine Stunde."
#: views.py:42 #: views.py:39
msgid "" msgid ""
"You are not allowed to create a lesson documentation for a lesson in the " "You are not allowed to create a lesson documentation for a lesson in the "
"future." "future."
......
biscuit/apps/alsijil/locale/fr/LC_MESSAGES/django.po
View file @ 466b9fb9
...@@ -8,7 +8,7 @@ msgid "" ...@@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
...@@ -22,7 +22,7 @@ msgstr "" ...@@ -22,7 +22,7 @@ msgstr ""
msgid "Group" msgid "Group"
msgstr "" msgstr ""
#: forms.py:40 templates/alsijil/print/full_register.html:96 #: forms.py:40 templates/alsijil/print/full_register.html:100
msgid "Teacher" msgid "Teacher"
msgstr "" msgstr ""
...@@ -30,7 +30,7 @@ msgstr "" ...@@ -30,7 +30,7 @@ msgstr ""
msgid "Room" msgid "Room"
msgstr "" msgstr ""
#: menus.py:6 templates/alsijil/print/full_register.html:17 #: menus.py:6 templates/alsijil/print/full_register.html:15
msgid "Class register" msgid "Class register"
msgstr "" msgstr ""
...@@ -42,11 +42,11 @@ msgstr "" ...@@ -42,11 +42,11 @@ msgstr ""
msgid "Current week" msgid "Current week"
msgstr "" msgstr ""
#: models.py:30 templates/alsijil/print/full_register.html:128 #: models.py:30 templates/alsijil/print/full_register.html:132
msgid "Lesson topic" msgid "Lesson topic"
msgstr "" msgstr ""
#: models.py:31 templates/alsijil/print/full_register.html:129 #: models.py:31 templates/alsijil/print/full_register.html:133
msgid "Homework" msgid "Homework"
msgstr "" msgstr ""
...@@ -86,16 +86,16 @@ msgstr "" ...@@ -86,16 +86,16 @@ msgstr ""
msgid "Save" msgid "Save"
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:23 #: templates/alsijil/print/full_register.html:21
#: templates/alsijil/print/full_register.html:55 #: templates/alsijil/print/full_register.html:53
msgid "Owners" msgid "Owners"
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:27 #: templates/alsijil/print/full_register.html:25
msgid "Printed on" msgid "Printed on"
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:35 #: templates/alsijil/print/full_register.html:33
msgid "" msgid ""
"\n" "\n"
" This printout is intended for archival purposes. The main copy " " This printout is intended for archival purposes. The main copy "
...@@ -105,7 +105,7 @@ msgid "" ...@@ -105,7 +105,7 @@ msgid ""
" " " "
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:42 #: templates/alsijil/print/full_register.html:40
msgid "" msgid ""
"\n" "\n"
" Copies of the class register, both digital and as printout, " " Copies of the class register, both digital and as printout, "
...@@ -116,7 +116,7 @@ msgid "" ...@@ -116,7 +116,7 @@ msgid ""
" " " "
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:49 #: templates/alsijil/print/full_register.html:47
msgid "" msgid ""
"\n" "\n"
" The owner of the group and the headteacher confirm the above, " " The owner of the group and the headteacher confirm the above, "
...@@ -125,85 +125,97 @@ msgid "" ...@@ -125,85 +125,97 @@ msgid ""
" " " "
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:56 #: templates/alsijil/print/full_register.html:54
msgid "Headteacher" msgid "Headteacher"
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:62 #: templates/alsijil/print/full_register.html:60
msgid "Persons in group" msgid "Persons in group"
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:67 #: templates/alsijil/print/full_register.html:65
msgid "No." msgid "No."
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:68 #: templates/alsijil/print/full_register.html:66
msgid "Last name" msgid "Last name"
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:69 #: templates/alsijil/print/full_register.html:67
msgid "First name" msgid "First name"
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:70 #: templates/alsijil/print/full_register.html:68
msgid "Sex" msgid "Sex"
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:71 #: templates/alsijil/print/full_register.html:69
msgid "Date of birth" msgid "Date of birth"
msgstr "" 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" msgid "Teachers and lessons in group"
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:95 #: templates/alsijil/print/full_register.html:99
#: templates/alsijil/week_view.html:40 #: templates/alsijil/week_view.html:40
msgid "Subject" msgid "Subject"
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:97 #: templates/alsijil/print/full_register.html:101
msgid "Lesson start" msgid "Lesson start"
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:98 #: templates/alsijil/print/full_register.html:102
msgid "Lesson end" msgid "Lesson end"
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:99 #: templates/alsijil/print/full_register.html:103
msgid "Per week" msgid "Per week"
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:119 #: templates/alsijil/print/full_register.html:123
msgid "Lesson documentation for calendar week" msgid "Lesson documentation for calendar week"
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:125 #: templates/alsijil/print/full_register.html:129
msgid "Pe." msgid "Pe."
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:126 #: templates/alsijil/print/full_register.html:130
msgid "Subj." msgid "Subj."
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:127 #: templates/alsijil/print/full_register.html:131
msgid "Subs." msgid "Subs."
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:130 #: templates/alsijil/print/full_register.html:134
msgid "Notes" msgid "Notes"
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:131 #: templates/alsijil/print/full_register.html:135
msgid "Te." msgid "Te."
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:158 #: templates/alsijil/print/full_register.html:162
msgid "Lesson cancelled" msgid "Lesson cancelled"
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:171 #: templates/alsijil/print/full_register.html:175
#: templates/alsijil/print/full_register.html:181 #: templates/alsijil/print/full_register.html:185
msgid "e" msgid "e"
msgstr "" msgstr ""
...@@ -238,18 +250,18 @@ msgstr "" ...@@ -238,18 +250,18 @@ msgstr ""
#: templates/alsijil/week_view.html:117 #: templates/alsijil/week_view.html:117
msgid "" msgid ""
"\n" "\n"
" You must select a group, a teacher or a room to see the week " " There are no lessons for the selected group, teacher, room or "
"summary.\n" "time.\n"
" " " "
msgstr "" msgstr ""
#: views.py:39 #: views.py:36
msgid "" msgid ""
"You either selected an invalid lesson or there is currently no lesson in " "You either selected an invalid lesson or there is currently no lesson in "
"progress." "progress."
msgstr "" msgstr ""
#: views.py:42 #: views.py:39
msgid "" msgid ""
"You are not allowed to create a lesson documentation for a lesson in the " "You are not allowed to create a lesson documentation for a lesson in the "
"future." "future."
......
biscuit/apps/alsijil/locale/nb_NO/LC_MESSAGES/django.po
View file @ 466b9fb9
...@@ -8,7 +8,7 @@ msgid "" ...@@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
...@@ -21,7 +21,7 @@ msgstr "" ...@@ -21,7 +21,7 @@ msgstr ""
msgid "Group" msgid "Group"
msgstr "" msgstr ""
#: forms.py:40 templates/alsijil/print/full_register.html:96 #: forms.py:40 templates/alsijil/print/full_register.html:100
msgid "Teacher" msgid "Teacher"
msgstr "" msgstr ""
...@@ -29,7 +29,7 @@ msgstr "" ...@@ -29,7 +29,7 @@ msgstr ""
msgid "Room" msgid "Room"
msgstr "" msgstr ""
#: menus.py:6 templates/alsijil/print/full_register.html:17 #: menus.py:6 templates/alsijil/print/full_register.html:15
msgid "Class register" msgid "Class register"
msgstr "" msgstr ""
...@@ -41,11 +41,11 @@ msgstr "" ...@@ -41,11 +41,11 @@ msgstr ""
msgid "Current week" msgid "Current week"
msgstr "" msgstr ""
#: models.py:30 templates/alsijil/print/full_register.html:128 #: models.py:30 templates/alsijil/print/full_register.html:132
msgid "Lesson topic" msgid "Lesson topic"
msgstr "" msgstr ""
#: models.py:31 templates/alsijil/print/full_register.html:129 #: models.py:31 templates/alsijil/print/full_register.html:133
msgid "Homework" msgid "Homework"
msgstr "" msgstr ""
...@@ -85,16 +85,16 @@ msgstr "" ...@@ -85,16 +85,16 @@ msgstr ""
msgid "Save" msgid "Save"
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:23 #: templates/alsijil/print/full_register.html:21
#: templates/alsijil/print/full_register.html:55 #: templates/alsijil/print/full_register.html:53
msgid "Owners" msgid "Owners"
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:27 #: templates/alsijil/print/full_register.html:25
msgid "Printed on" msgid "Printed on"
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:35 #: templates/alsijil/print/full_register.html:33
msgid "" msgid ""
"\n" "\n"
" This printout is intended for archival purposes. The main copy " " This printout is intended for archival purposes. The main copy "
...@@ -104,7 +104,7 @@ msgid "" ...@@ -104,7 +104,7 @@ msgid ""
" " " "
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:42 #: templates/alsijil/print/full_register.html:40
msgid "" msgid ""
"\n" "\n"
" Copies of the class register, both digital and as printout, " " Copies of the class register, both digital and as printout, "
...@@ -115,7 +115,7 @@ msgid "" ...@@ -115,7 +115,7 @@ msgid ""
" " " "
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:49 #: templates/alsijil/print/full_register.html:47
msgid "" msgid ""
"\n" "\n"
" The owner of the group and the headteacher confirm the above, " " The owner of the group and the headteacher confirm the above, "
...@@ -124,85 +124,97 @@ msgid "" ...@@ -124,85 +124,97 @@ msgid ""
" " " "
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:56 #: templates/alsijil/print/full_register.html:54
msgid "Headteacher" msgid "Headteacher"
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:62 #: templates/alsijil/print/full_register.html:60
msgid "Persons in group" msgid "Persons in group"
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:67 #: templates/alsijil/print/full_register.html:65
msgid "No." msgid "No."
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:68 #: templates/alsijil/print/full_register.html:66
msgid "Last name" msgid "Last name"
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:69 #: templates/alsijil/print/full_register.html:67
msgid "First name" msgid "First name"
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:70 #: templates/alsijil/print/full_register.html:68
msgid "Sex" msgid "Sex"
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:71 #: templates/alsijil/print/full_register.html:69
msgid "Date of birth" msgid "Date of birth"
msgstr "" 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" msgid "Teachers and lessons in group"
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:95 #: templates/alsijil/print/full_register.html:99
#: templates/alsijil/week_view.html:40 #: templates/alsijil/week_view.html:40
msgid "Subject" msgid "Subject"
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:97 #: templates/alsijil/print/full_register.html:101
msgid "Lesson start" msgid "Lesson start"
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:98 #: templates/alsijil/print/full_register.html:102
msgid "Lesson end" msgid "Lesson end"
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:99 #: templates/alsijil/print/full_register.html:103
msgid "Per week" msgid "Per week"
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:119 #: templates/alsijil/print/full_register.html:123
msgid "Lesson documentation for calendar week" msgid "Lesson documentation for calendar week"
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:125 #: templates/alsijil/print/full_register.html:129
msgid "Pe." msgid "Pe."
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:126 #: templates/alsijil/print/full_register.html:130
msgid "Subj." msgid "Subj."
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:127 #: templates/alsijil/print/full_register.html:131
msgid "Subs." msgid "Subs."
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:130 #: templates/alsijil/print/full_register.html:134
msgid "Notes" msgid "Notes"
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:131 #: templates/alsijil/print/full_register.html:135
msgid "Te." msgid "Te."
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:158 #: templates/alsijil/print/full_register.html:162
msgid "Lesson cancelled" msgid "Lesson cancelled"
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:171 #: templates/alsijil/print/full_register.html:175
#: templates/alsijil/print/full_register.html:181 #: templates/alsijil/print/full_register.html:185
msgid "e" msgid "e"
msgstr "" msgstr ""
...@@ -237,18 +249,18 @@ msgstr "" ...@@ -237,18 +249,18 @@ msgstr ""
#: templates/alsijil/week_view.html:117 #: templates/alsijil/week_view.html:117
msgid "" msgid ""
"\n" "\n"
" You must select a group, a teacher or a room to see the week " " There are no lessons for the selected group, teacher, room or "
"summary.\n" "time.\n"
" " " "
msgstr "" msgstr ""
#: views.py:39 #: views.py:36
msgid "" msgid ""
"You either selected an invalid lesson or there is currently no lesson in " "You either selected an invalid lesson or there is currently no lesson in "
"progress." "progress."
msgstr "" msgstr ""
#: views.py:42 #: views.py:39
msgid "" msgid ""
"You are not allowed to create a lesson documentation for a lesson in the " "You are not allowed to create a lesson documentation for a lesson in the "
"future." "future."
......
biscuit/apps/alsijil/locale/tr_TR/LC_MESSAGES/django.po
View file @ 466b9fb9
...@@ -8,7 +8,7 @@ msgid "" ...@@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
...@@ -21,7 +21,7 @@ msgstr "" ...@@ -21,7 +21,7 @@ msgstr ""
msgid "Group" msgid "Group"
msgstr "" msgstr ""
#: forms.py:40 templates/alsijil/print/full_register.html:96 #: forms.py:40 templates/alsijil/print/full_register.html:100
msgid "Teacher" msgid "Teacher"
msgstr "" msgstr ""
...@@ -29,7 +29,7 @@ msgstr "" ...@@ -29,7 +29,7 @@ msgstr ""
msgid "Room" msgid "Room"
msgstr "" msgstr ""
#: menus.py:6 templates/alsijil/print/full_register.html:17 #: menus.py:6 templates/alsijil/print/full_register.html:15
msgid "Class register" msgid "Class register"
msgstr "" msgstr ""
...@@ -41,11 +41,11 @@ msgstr "" ...@@ -41,11 +41,11 @@ msgstr ""
msgid "Current week" msgid "Current week"
msgstr "" msgstr ""
#: models.py:30 templates/alsijil/print/full_register.html:128 #: models.py:30 templates/alsijil/print/full_register.html:132
msgid "Lesson topic" msgid "Lesson topic"
msgstr "" msgstr ""
#: models.py:31 templates/alsijil/print/full_register.html:129 #: models.py:31 templates/alsijil/print/full_register.html:133
msgid "Homework" msgid "Homework"
msgstr "" msgstr ""
...@@ -85,16 +85,16 @@ msgstr "" ...@@ -85,16 +85,16 @@ msgstr ""
msgid "Save" msgid "Save"
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:23 #: templates/alsijil/print/full_register.html:21
#: templates/alsijil/print/full_register.html:55 #: templates/alsijil/print/full_register.html:53
msgid "Owners" msgid "Owners"
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:27 #: templates/alsijil/print/full_register.html:25
msgid "Printed on" msgid "Printed on"
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:35 #: templates/alsijil/print/full_register.html:33
msgid "" msgid ""
"\n" "\n"
" This printout is intended for archival purposes. The main copy " " This printout is intended for archival purposes. The main copy "
...@@ -104,7 +104,7 @@ msgid "" ...@@ -104,7 +104,7 @@ msgid ""
" " " "
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:42 #: templates/alsijil/print/full_register.html:40
msgid "" msgid ""
"\n" "\n"
" Copies of the class register, both digital and as printout, " " Copies of the class register, both digital and as printout, "
...@@ -115,7 +115,7 @@ msgid "" ...@@ -115,7 +115,7 @@ msgid ""
" " " "
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:49 #: templates/alsijil/print/full_register.html:47
msgid "" msgid ""
"\n" "\n"
" The owner of the group and the headteacher confirm the above, " " The owner of the group and the headteacher confirm the above, "
...@@ -124,85 +124,97 @@ msgid "" ...@@ -124,85 +124,97 @@ msgid ""
" " " "
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:56 #: templates/alsijil/print/full_register.html:54
msgid "Headteacher" msgid "Headteacher"
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:62 #: templates/alsijil/print/full_register.html:60
msgid "Persons in group" msgid "Persons in group"
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:67 #: templates/alsijil/print/full_register.html:65
msgid "No." msgid "No."
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:68 #: templates/alsijil/print/full_register.html:66
msgid "Last name" msgid "Last name"
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:69 #: templates/alsijil/print/full_register.html:67
msgid "First name" msgid "First name"
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:70 #: templates/alsijil/print/full_register.html:68
msgid "Sex" msgid "Sex"
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:71 #: templates/alsijil/print/full_register.html:69
msgid "Date of birth" msgid "Date of birth"
msgstr "" 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" msgid "Teachers and lessons in group"
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:95 #: templates/alsijil/print/full_register.html:99
#: templates/alsijil/week_view.html:40 #: templates/alsijil/week_view.html:40
msgid "Subject" msgid "Subject"
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:97 #: templates/alsijil/print/full_register.html:101
msgid "Lesson start" msgid "Lesson start"
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:98 #: templates/alsijil/print/full_register.html:102
msgid "Lesson end" msgid "Lesson end"
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:99 #: templates/alsijil/print/full_register.html:103
msgid "Per week" msgid "Per week"
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:119 #: templates/alsijil/print/full_register.html:123
msgid "Lesson documentation for calendar week" msgid "Lesson documentation for calendar week"
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:125 #: templates/alsijil/print/full_register.html:129
msgid "Pe." msgid "Pe."
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:126 #: templates/alsijil/print/full_register.html:130
msgid "Subj." msgid "Subj."
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:127 #: templates/alsijil/print/full_register.html:131
msgid "Subs." msgid "Subs."
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:130 #: templates/alsijil/print/full_register.html:134
msgid "Notes" msgid "Notes"
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:131 #: templates/alsijil/print/full_register.html:135
msgid "Te." msgid "Te."
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:158 #: templates/alsijil/print/full_register.html:162
msgid "Lesson cancelled" msgid "Lesson cancelled"
msgstr "" msgstr ""
#: templates/alsijil/print/full_register.html:171 #: templates/alsijil/print/full_register.html:175
#: templates/alsijil/print/full_register.html:181 #: templates/alsijil/print/full_register.html:185
msgid "e" msgid "e"
msgstr "" msgstr ""
...@@ -237,18 +249,18 @@ msgstr "" ...@@ -237,18 +249,18 @@ msgstr ""
#: templates/alsijil/week_view.html:117 #: templates/alsijil/week_view.html:117
msgid "" msgid ""
"\n" "\n"
" You must select a group, a teacher or a room to see the week " " There are no lessons for the selected group, teacher, room or "
"summary.\n" "time.\n"
" " " "
msgstr "" msgstr ""
#: views.py:39 #: views.py:36
msgid "" msgid ""
"You either selected an invalid lesson or there is currently no lesson in " "You either selected an invalid lesson or there is currently no lesson in "
"progress." "progress."
msgstr "" msgstr ""
#: views.py:42 #: views.py:39
msgid "" msgid ""
"You are not allowed to create a lesson documentation for a lesson in the " "You are not allowed to create a lesson documentation for a lesson in the "
"future." "future."
......
biscuit/apps/alsijil/static/css/alsijil/full_register.css
View file @ 466b9fb9
...@@ -129,22 +129,21 @@ th.lessons-day-head { ...@@ -129,22 +129,21 @@ th.lessons-day-head {
transform: rotate(-180deg); transform: rotate(-180deg);
} }
tr.lesson-substituted { tr.lesson-cancelled td.subj {
background-color: #ffc107; text-decoration: line-through;
}
tr.lesson-cancelled {
background-color: #dc3545;
} }
tr.lesson-cancelled td { tr.lesson-cancelled td {
text-decoration: line-through: background-color: #dc3545;
} }
tr.lesson-substituted td.lesson-subj { tr.lesson-substituted td.lesson-subj {
text-decoration: line-through; text-decoration: line-through;
} }
tr.lesson-substituted td {
background-color: #ffc107;
}
td.lesson-notes { td.lesson-notes {
font-size: 80%; font-size: 80%;
} }
......
biscuit/apps/alsijil/templates/alsijil/print/full_register.html
View file @ 466b9fb9
...@@ -5,8 +5,6 @@ ...@@ -5,8 +5,6 @@
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<link rel="stylesheet"
href="https://raw.githubusercontent.com/cognitom/paper-css/master/paper.min.css" />
<link rel="stylesheet" <link rel="stylesheet"
href="{% static 'css/alsijil/full_register.css' %}" /> href="{% static 'css/alsijil/full_register.css' %}" />
</head> </head>
...@@ -69,17 +67,23 @@ ...@@ -69,17 +67,23 @@
<th>{% trans 'First name' %}</th> <th>{% trans 'First name' %}</th>
<th>{% trans 'Sex' %}</th> <th>{% trans 'Sex' %}</th>
<th>{% trans 'Date of birth' %}</th> <th>{% trans 'Date of birth' %}</th>
<th>{% trans 'Absences' %}</th>
<th>{% trans 'Unexcused' %}</th>
<th>{% trans 'Tard.' %}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{% for person in group.members.all %} {% for person in persons %}
<tr> <tr>
<td>{{ forloop.counter }}</td> <td>{{ forloop.counter }}</td>
<td>{{ person.last_name }}</td> <td>{{ person.last_name }}</td>
<td>{{ person.first_name }}</td> <td>{{ person.first_name }}</td>
<td>{{ person.get_sex_display }}</td> <td>{{ person.get_sex_display }}</td>
<td>{{ person.date_of_birth }}</td> <td>{{ person.date_of_birth }}</td>
<td>{{ person.absences}}</td>
<td>{{ person.unexcused }}</td>
<td>{{ person.tardiness }}</td>
</tr> </tr>
{% endfor %} {% endfor %}
</tbody> </tbody>
......
biscuit/apps/alsijil/templates/alsijil/week_view.html
View file @ 466b9fb9
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
{% endif %} {% endif %}
</div> </div>
{% if group or teacher or room %} {% if lesson_periods.count %}
<div class="row"> <div class="row">
<div class="col-md-7"> <div class="col-md-7">
<div class="card"> <div class="card">
...@@ -115,7 +115,7 @@ ...@@ -115,7 +115,7 @@
<div class="card-body"> <div class="card-body">
<p> <p>
{% blocktrans %} {% 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 %} {% endblocktrans %}
</p> </p>
</div> </div>
......
biscuit/apps/alsijil/views.py
View file @ 466b9fb9
from collections import OrderedDict from datetime import date, datetime
from datetime import date, datetime, timedelta
from typing import Optional from typing import Optional
from django.contrib.auth.decorators import login_required from django.contrib.auth.decorators import login_required
from django.core.exceptions import PermissionDenied 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.http import Http404, HttpRequest, HttpResponse
from django.shortcuts import get_object_or_404, redirect, render from django.shortcuts import get_object_or_404, redirect, render
from django.urls import reverse from django.urls import reverse
from django.utils.translation import ugettext as _ 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.models import LessonPeriod
from biscuit.apps.chronos.util import CalendarWeek, current_lesson_periods from biscuit.apps.chronos.util import CalendarWeek
from biscuit.core.models import Group, Person from biscuit.core.models import Group, Person
from .forms import LessonDocumentationForm, PersonalNoteFormSet, SelectForm from .forms import LessonDocumentationForm, PersonalNoteFormSet, SelectForm
...@@ -29,8 +27,7 @@ def lesson(request: HttpRequest, year: Optional[int] = None, week: Optional[int] ...@@ -29,8 +27,7 @@ def lesson(request: HttpRequest, year: Optional[int] = None, week: Optional[int]
wanted_week = CalendarWeek(year=year, week=week) wanted_week = CalendarWeek(year=year, week=week)
else: else:
# Determine current lesson by current date and time # Determine current lesson by current date and time
lesson_period = current_lesson_periods().filter( lesson_period = LessonPeriod.objects.at_time().filter_teacher(request.user.person).first()
Q(substitutions__teachers=request.user.person) | Q(lesson__teachers=request.user.person)).first()
wanted_week = CalendarWeek() wanted_week = CalendarWeek()
if lesson_period: if lesson_period:
...@@ -38,7 +35,7 @@ def lesson(request: HttpRequest, year: Optional[int] = None, week: Optional[int] ...@@ -38,7 +35,7 @@ def lesson(request: HttpRequest, year: Optional[int] = None, week: Optional[int]
else: else:
raise Http404(_('You either selected an invalid lesson or there is currently no lesson in progress.')) 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.')) raise PermissionDenied(_('You are not allowed to create a lesson documentation for a lesson in the future.'))
context['lesson_period'] = lesson_period context['lesson_period'] = lesson_period
...@@ -104,39 +101,14 @@ def week_view(request: HttpRequest, year: Optional[int] = None, week: Optional[i ...@@ -104,39 +101,14 @@ def week_view(request: HttpRequest, year: Optional[int] = None, week: Optional[i
lesson_period=OuterRef('pk'), lesson_period=OuterRef('pk'),
week=wanted_week.week week=wanted_week.week
)) ))
).filter( ).in_week(wanted_week)
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
group = None # FIXME workaround for #38
if request.GET.get('group', None) or request.GET.get('teacher', None) or request.GET.get('room', None): 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 lesson_periods = lesson_periods.filter_from_query(request.GET)
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']))
elif hasattr(request, 'user') and hasattr(request.user, 'person'): elif hasattr(request, 'user') and hasattr(request.user, 'person'):
group = request.user.person.owner_of.first() group = request.user.person.owner_of.first()
lesson_periods = lesson_periods.filter( lesson_periods = lesson_periods.filter_group(group)
Q(lesson__groups=group) | Q(lesson__groups__parent_groups=group))
else: else:
lesson_periods = None lesson_periods = None
...@@ -173,9 +145,6 @@ def week_view(request: HttpRequest, year: Optional[int] = None, week: Optional[i ...@@ -173,9 +145,6 @@ def week_view(request: HttpRequest, year: Optional[int] = None, week: Optional[i
context['current_head'] = str(wanted_week) context['current_head'] = str(wanted_week)
context['week'] = wanted_week context['week'] = wanted_week
context['group'] = group
context['teacher'] = teacher
context['room'] = room
context['lesson_periods'] = lesson_periods context['lesson_periods'] = lesson_periods
context['persons'] = persons context['persons'] = persons
context['select_form'] = select_form context['select_form'] = select_form
...@@ -195,21 +164,10 @@ def full_register_group(request: HttpRequest, id_: int) -> HttpResponse: ...@@ -195,21 +164,10 @@ def full_register_group(request: HttpRequest, id_: int) -> HttpResponse:
group = get_object_or_404(Group, pk=id_) group = get_object_or_404(Group, pk=id_)
# Get all lesson periods for the selected group # Get all lesson periods for the selected group
lesson_periods = LessonPeriod.objects.annotate( lesson_periods = LessonPeriod.objects.within_dates(
has_documentation=Exists(LessonDocumentation.objects.filter( group.school.current_term.date_start,
~Q(topic__exact=''), group.school.current_term.date_end
lesson_period=OuterRef('pk'), ).filter_group(group).distinct()
))
).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()
weeks = CalendarWeek.weeks_within(group.school.current_term.date_start, group.school.current_term.date_end) weeks = CalendarWeek.weeks_within(group.school.current_term.date_start, group.school.current_term.date_end)
periods_by_day = {} periods_by_day = {}
...@@ -224,6 +182,18 @@ def full_register_group(request: HttpRequest, id_: int) -> HttpResponse: ...@@ -224,6 +182,18 @@ def full_register_group(request: HttpRequest, id_: int) -> HttpResponse:
periods_by_day.setdefault(day, []).append((lesson_period, documentations, notes, substitution)) 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['group'] = group
context['weeks'] = weeks context['weeks'] = weeks
context['periods_by_day'] = periods_by_day context['periods_by_day'] = periods_by_day
......