Skip to content
Snippets Groups Projects
Verified Commit c03c7e0f authored by Nik | Klampfradler's avatar Nik | Klampfradler
Browse files

[autopep8] Fix coding style.

parent 6f0c9a19
No related branches found
No related tags found
No related merge requests found
...@@ -22,7 +22,8 @@ class PersonalNoteForm(forms.ModelForm): ...@@ -22,7 +22,8 @@ class PersonalNoteForm(forms.ModelForm):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super().__init__(*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: try:
self.fields['person_name'].initial = str(self.instance.person) self.fields['person_name'].initial = str(self.instance.person)
except: except:
......
...@@ -18,15 +18,18 @@ class Migration(migrations.Migration): ...@@ -18,15 +18,18 @@ class Migration(migrations.Migration):
migrations.CreateModel( migrations.CreateModel(
name='PersonalNote', name='PersonalNote',
fields=[ 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()), ('week', models.IntegerField()),
('absent', models.BooleanField(default=False)), ('absent', models.BooleanField(default=False)),
('late', models.IntegerField(default=0)), ('late', models.IntegerField(default=0)),
('excused', models.BooleanField(default=False)), ('excused', models.BooleanField(default=False)),
('remarks', models.CharField(blank=True, max_length=200)), ('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')), ('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={ options={
'unique_together': {('school', 'lesson_period', 'week', 'person')}, 'unique_together': {('school', 'lesson_period', 'week', 'person')},
...@@ -35,12 +38,15 @@ class Migration(migrations.Migration): ...@@ -35,12 +38,15 @@ class Migration(migrations.Migration):
migrations.CreateModel( migrations.CreateModel(
name='LessonDocumentation', name='LessonDocumentation',
fields=[ 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()), ('week', models.IntegerField()),
('topic', models.CharField(blank=True, max_length=200, verbose_name='Lesson topic')), ('topic', models.CharField(blank=True, max_length=200, verbose_name='Lesson topic')),
('homework', models.CharField(blank=True, max_length=200, verbose_name='Homework')), ('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')), ('lesson_period', models.ForeignKey(
('school', models.ForeignKey(default=biscuit.core.util.core_helpers.get_current_school, on_delete=django.db.models.deletion.CASCADE, to='core.School')), 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={ options={
'unique_together': {('school', 'lesson_period', 'week')}, 'unique_together': {('school', 'lesson_period', 'week')},
......
...@@ -18,16 +18,19 @@ class PersonalNote(SchoolRelated): ...@@ -18,16 +18,19 @@ class PersonalNote(SchoolRelated):
class Meta: class Meta:
unique_together = [['school', 'lesson_period', 'week', 'person']] 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): class LessonDocumentation(SchoolRelated):
week = models.IntegerField() 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) topic = models.CharField(verbose_name=_('Lesson topic'), max_length=200, blank=True)
homework = models.CharField(verbose_name=_('Homework'), max_length=200, blank=True) homework = models.CharField(verbose_name=_('Homework'), max_length=200, blank=True)
class Meta: class Meta:
unique_together = [['school', 'lesson_period', 'week']] 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']
...@@ -36,7 +36,8 @@ def lesson(request: HttpRequest, week: Optional[int] = None, period_id: Optional ...@@ -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 # Create or get lesson documentation object; can be empty when first opening lesson
lesson_documentation, created = LessonDocumentation.objects.get_or_create( lesson_documentation, created = LessonDocumentation.objects.get_or_create(
lesson_period=lesson_period, week=wanted_week) 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 # Create all missing personal notes about members of all groups in lesson
for group in lesson_period.lesson.groups.all(): for group in lesson_period.lesson.groups.all():
...@@ -47,7 +48,8 @@ def lesson(request: HttpRequest, week: Optional[int] = None, period_id: Optional ...@@ -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 # Create a formset that holds all personal notes for all persons in this lesson
persons_qs = PersonalNote.objects.filter( persons_qs = PersonalNote.objects.filter(
lesson_period=lesson_period, week=wanted_week) 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 request.method == 'POST':
if lesson_documentation_form.is_valid(): if lesson_documentation_form.is_valid():
...@@ -87,7 +89,8 @@ def group_week(request: HttpRequest, week: Optional[int] = None) -> HttpResponse ...@@ -87,7 +89,8 @@ def group_week(request: HttpRequest, week: Optional[int] = None) -> HttpResponse
periods_by_day = OrderedDict() periods_by_day = OrderedDict()
for weekday, periods in sorted(periods_by_day_unsorted.items()): 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 # Add a form to filter the view
select_form = SelectForm(request.GET or None) select_form = SelectForm(request.GET or None)
......
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