From c03c7e0f3618d6a3814f1c10521e8bcf764d8aa8 Mon Sep 17 00:00:00 2001
From: Dominik George <dominik.george@teckids.org>
Date: Mon, 2 Sep 2019 16:43:26 +0200
Subject: [PATCH] [autopep8] Fix coding style.
---
biscuit/apps/alsijil/forms.py | 3 ++-
.../apps/alsijil/migrations/0001_initial.py | 18 ++++++++++++------
biscuit/apps/alsijil/models.py | 9 ++++++---
biscuit/apps/alsijil/views.py | 9 ++++++---
4 files changed, 26 insertions(+), 13 deletions(-)
diff --git a/biscuit/apps/alsijil/forms.py b/biscuit/apps/alsijil/forms.py
index badfb0f87..88b9d9a0a 100644
--- a/biscuit/apps/alsijil/forms.py
+++ b/biscuit/apps/alsijil/forms.py
@@ -22,7 +22,8 @@ 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'})
+ self.fields['person_name'].widget.attrs.update(
+ {'class': 'alsijil-lesson-personal-note-name'})
try:
self.fields['person_name'].initial = str(self.instance.person)
except:
diff --git a/biscuit/apps/alsijil/migrations/0001_initial.py b/biscuit/apps/alsijil/migrations/0001_initial.py
index 183219e96..7cc52bfa1 100644
--- a/biscuit/apps/alsijil/migrations/0001_initial.py
+++ b/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')},
diff --git a/biscuit/apps/alsijil/models.py b/biscuit/apps/alsijil/models.py
index e862e6bbf..d6c86073d 100644
--- a/biscuit/apps/alsijil/models.py
+++ b/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']
diff --git a/biscuit/apps/alsijil/views.py b/biscuit/apps/alsijil/views.py
index 2553d44d1..d145d5fe5 100644
--- a/biscuit/apps/alsijil/views.py
+++ b/biscuit/apps/alsijil/views.py
@@ -36,7 +36,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 +48,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 +89,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)
--
GitLab