biscuit/apps/alsijil/forms.py

@@ -22,11 +22,11 @@ class PersonalNoteForm(forms.ModelForm):
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        self.fields['person_name'].widget.attrs.update({'class':'alsijil-lesson-personal-note-name'})
-        try:
+        self.fields['person_name'].widget.attrs.update(
+            {'class': 'alsijil-lesson-personal-note-name'})
+
+        if self.instance and getattr(self.instance, 'person', None):
             self.fields['person_name'].initial = str(self.instance.person)
-        except:
-            pass
 
 
 class SelectForm(forms.Form):

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

@@ -8,14 +8,16 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-09-02 13:14+0000\n"
-"PO-Revision-Date: 2019-08-26 11:59+0200\n"
-"Last-Translator: Tom Teichler <tom.teichler@teckids.org>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2019-09-02 14:11+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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.2.3\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 3.8\n"
 
 #: apps.py:7
 msgid "BiscuIT - Alsijil (Class register)"
@@ -23,7 +25,7 @@ msgstr "BiscuIT - Alsijil (Klassenbuch)"
 
 #: forms.py:35
 msgid "Group"
-msgstr ""
+msgstr "Gruppe"
 
 #: menus.py:6
 msgid "Class register"
@@ -34,10 +36,8 @@ msgid "Current lesson"
 msgstr "Aktuelle Unterrichtsstunde"
 
 #: menus.py:17 templates/alsijil/group_week.html:6
-#, fuzzy
-#| msgid "Current lesson"
 msgid "Current week"
-msgstr "Aktuelle Unterrichtsstunde"
+msgstr "Aktuelle Woche"
 
 #: models.py:28
 msgid "Lesson topic"
@@ -49,19 +49,19 @@ msgstr "Hausaufgaben"
 
 #: templates/alsijil/group_week.html:23
 msgid "Week"
-msgstr ""
+msgstr "Woche"
 
 #: templates/alsijil/group_week.html:34
 msgid "Period"
-msgstr ""
+msgstr "Stunde"
 
 #: templates/alsijil/group_week.html:35
 msgid "Subject"
-msgstr ""
+msgstr "Fach"
 
 #: templates/alsijil/group_week.html:36
 msgid "Teachers"
-msgstr ""
+msgstr "Lehrkräfte"
 
 #: templates/alsijil/group_week.html:60 templates/alsijil/lesson.html:39
 msgid "Personal notes"
@@ -69,7 +69,7 @@ msgstr "Persönliche Notizen"
 
 #: templates/alsijil/group_week.html:71
 msgid "No group selected"
-msgstr ""
+msgstr "Keine Gruppe ausgewählt"
 
 #: templates/alsijil/group_week.html:75
 msgid ""
@@ -77,10 +77,13 @@ msgid ""
 "      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"
+"     "
 
 #: templates/alsijil/lesson.html:11
 msgid "Lesson documentation"
-msgstr "Unterrichtsstundenbeschreibung"
+msgstr "Stunden-Dokumentation"
 
 #: templates/alsijil/lesson.html:46
 msgid "Person"
@@ -104,11 +107,11 @@ msgstr "Bemerkungen"
 
 #: templates/alsijil/lesson.html:65
 msgid "Save"
-msgstr ""
+msgstr "Speichern"
 
 #: templates/alsijil/lesson.html:70
 msgid "No lesson found"
-msgstr ""
+msgstr "Keine Stunde gefunden"
 
 #: templates/alsijil/lesson.html:74
 msgid ""
@@ -117,6 +120,10 @@ msgid ""
 "      is currently no lesson in progress.\n"
 "     "
 msgstr ""
+"\n"
+"      Sie haben eine ungültige Stunde ausgewählt oder es\n"
+"      läuft momentan keine Stunde.\n"
+"     "
 
 #~ msgid "Lesson"
 #~ msgstr "Unterrichtsstunde"

biscuit/apps/alsijil/migrations/0001_initial.py

@@ -18,15 +18,18 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='PersonalNote',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('id', models.AutoField(auto_created=True,
+                                        primary_key=True, serialize=False, verbose_name='ID')),
                 ('week', models.IntegerField()),
                 ('absent', models.BooleanField(default=False)),
                 ('late', models.IntegerField(default=0)),
                 ('excused', models.BooleanField(default=False)),
                 ('remarks', models.CharField(blank=True, max_length=200)),
-                ('lesson_period', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='chronos.LessonPeriod')),
+                ('lesson_period', models.ForeignKey(
+                    on_delete=django.db.models.deletion.CASCADE, to='chronos.LessonPeriod')),
                 ('person', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Person')),
-                ('school', models.ForeignKey(default=biscuit.core.util.core_helpers.get_current_school, on_delete=django.db.models.deletion.CASCADE, to='core.School')),
+                ('school', models.ForeignKey(default=biscuit.core.util.core_helpers.get_current_school,
+                                             on_delete=django.db.models.deletion.CASCADE, to='core.School')),
             ],
             options={
                 'unique_together': {('school', 'lesson_period', 'week', 'person')},
@@ -35,12 +38,15 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='LessonDocumentation',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('id', models.AutoField(auto_created=True,
+                                        primary_key=True, serialize=False, verbose_name='ID')),
                 ('week', models.IntegerField()),
                 ('topic', models.CharField(blank=True, max_length=200, verbose_name='Lesson topic')),
                 ('homework', models.CharField(blank=True, max_length=200, verbose_name='Homework')),
-                ('lesson_period', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='chronos.LessonPeriod')),
-                ('school', models.ForeignKey(default=biscuit.core.util.core_helpers.get_current_school, on_delete=django.db.models.deletion.CASCADE, to='core.School')),
+                ('lesson_period', models.ForeignKey(
+                    on_delete=django.db.models.deletion.CASCADE, to='chronos.LessonPeriod')),
+                ('school', models.ForeignKey(default=biscuit.core.util.core_helpers.get_current_school,
+                                             on_delete=django.db.models.deletion.CASCADE, to='core.School')),
             ],
             options={
                 'unique_together': {('school', 'lesson_period', 'week')},

biscuit/apps/alsijil/models.py

@@ -18,16 +18,19 @@ class PersonalNote(SchoolRelated):
 
     class Meta:
         unique_together = [['school', 'lesson_period', 'week', 'person']]
-        ordering = ['lesson_period__lesson__date_start', 'week', 'lesson_period__period__weekday', 'lesson_period__period__period', 'person__last_name', 'person__first_name']
+        ordering = ['lesson_period__lesson__date_start', 'week', 'lesson_period__period__weekday',
+                    'lesson_period__period__period', 'person__last_name', 'person__first_name']
 
 
 class LessonDocumentation(SchoolRelated):
     week = models.IntegerField()
-    lesson_period = models.ForeignKey('chronos.LessonPeriod', models.CASCADE, related_name='documentations')
+    lesson_period = models.ForeignKey(
+        'chronos.LessonPeriod', models.CASCADE, related_name='documentations')
 
     topic = models.CharField(verbose_name=_('Lesson topic'), max_length=200, blank=True)
     homework = models.CharField(verbose_name=_('Homework'), max_length=200, blank=True)
 
     class Meta:
         unique_together = [['school', 'lesson_period', 'week']]
-        ordering = ['lesson_period__lesson__date_start', 'week', 'lesson_period__period__weekday', 'lesson_period__period__period']
+        ordering = ['lesson_period__lesson__date_start', 'week',
+                    'lesson_period__period__weekday', 'lesson_period__period__period']

biscuit/apps/alsijil/views.py

@@ -2,12 +2,11 @@ from collections import OrderedDict
 from typing import Optional
 
 from django.contrib.auth.decorators import login_required
-from django.db.models import Count, Q
+from django.db.models import Q
 from django.http import HttpRequest, HttpResponse
 from django.shortcuts import render
-from django.utils.translation import ugettext as _
 
-from biscuit.apps.chronos.models import Lesson, LessonPeriod, TimePeriod
+from biscuit.apps.chronos.models import LessonPeriod, TimePeriod
 from biscuit.apps.chronos.util import current_lesson_periods, current_week, week_days
 from biscuit.core.models import Group
 
@@ -36,7 +35,8 @@ def lesson(request: HttpRequest, week: Optional[int] = None, period_id: Optional
         # Create or get lesson documentation object; can be empty when first opening lesson
         lesson_documentation, created = LessonDocumentation.objects.get_or_create(
             lesson_period=lesson_period, week=wanted_week)
-        lesson_documentation_form = LessonDocumentationForm(request.POST or None, instance=lesson_documentation, prefix='leson_documentation')
+        lesson_documentation_form = LessonDocumentationForm(
+            request.POST or None, instance=lesson_documentation, prefix='leson_documentation')
 
         # Create all missing personal notes about members of all groups in lesson
         for group in lesson_period.lesson.groups.all():
@@ -47,7 +47,8 @@ def lesson(request: HttpRequest, week: Optional[int] = None, period_id: Optional
         # Create a formset that holds all personal notes for all persons in this lesson
         persons_qs = PersonalNote.objects.filter(
             lesson_period=lesson_period, week=wanted_week)
-        personal_note_formset = PersonalNoteFormSet(request.POST or None, queryset=persons_qs, prefix='personal_notes')
+        personal_note_formset = PersonalNoteFormSet(
+            request.POST or None, queryset=persons_qs, prefix='personal_notes')
 
         if request.method == 'POST':
             if lesson_documentation_form.is_valid():
@@ -87,7 +88,8 @@ def group_week(request: HttpRequest, week: Optional[int] = None) -> HttpResponse
 
     periods_by_day = OrderedDict()
     for weekday, periods in sorted(periods_by_day_unsorted.items()):
-        periods_by_day[dict(TimePeriod.WEEKDAY_CHOICES)[weekday]] = sorted(periods, key=lambda p: p.period.period)
+        periods_by_day[dict(TimePeriod.WEEKDAY_CHOICES)[weekday]] = sorted(
+            periods, key=lambda p: p.period.period)
 
     # Add a form to filter the view
     select_form = SelectForm(request.GET or None)