Skip to content
Snippets Groups Projects
Commit ab77b8a8 authored by Jonathan Weth's avatar Jonathan Weth :keyboard:
Browse files

Revert "Merge branch 'fix/rename-late-tardiness' into 'master'"

This reverts merge request !308
parent 9769c31e
No related branches found
No related tags found
1 merge request!309Revert "Merge branch 'fix/rename-late-tardiness' into 'master'"
Pipeline #96674 passed with warnings
...@@ -27,20 +27,20 @@ class PersonalNoteFilter(FilterSet): ...@@ -27,20 +27,20 @@ class PersonalNoteFilter(FilterSet):
data[name] = initial data[name] = initial
super().__init__(data, *args, **kwargs) super().__init__(data, *args, **kwargs)
self.form.fields["tardiness__lt"].label = _("Tardiness is lower than") self.form.fields["late__lt"].label = _("Tardiness is lower than")
self.form.fields["tardiness__gt"].label = _("Tardiness is bigger than") self.form.fields["late__gt"].label = _("Tardiness is bigger than")
self.form.layout = Layout( self.form.layout = Layout(
Row("subject"), Row("subject"),
Row("day_start", "day_end"), Row("day_start", "day_end"),
Row("absent", "excused", "excuse_type"), Row("absent", "excused", "excuse_type"),
Row("tardiness__gt", "tardiness__lt", "extra_marks"), Row("late__gt", "late__lt", "extra_marks"),
) )
class Meta: class Meta:
model = PersonalNote model = PersonalNote
fields = { fields = {
"excused": ["exact"], "excused": ["exact"],
"tardiness": ["lt", "gt"], "late": ["lt", "gt"],
"absent": ["exact"], "absent": ["exact"],
"excuse_type": ["exact"], "excuse_type": ["exact"],
"extra_marks": ["exact"], "extra_marks": ["exact"],
......
...@@ -75,7 +75,7 @@ class LessonDocumentationForm(forms.ModelForm): ...@@ -75,7 +75,7 @@ class LessonDocumentationForm(forms.ModelForm):
class PersonalNoteForm(forms.ModelForm): class PersonalNoteForm(forms.ModelForm):
class Meta: class Meta:
model = PersonalNote model = PersonalNote
fields = ["absent", "tardiness", "excused", "excuse_type", "extra_marks", "remarks"] fields = ["absent", "late", "excused", "excuse_type", "extra_marks", "remarks"]
person_name = forms.CharField(disabled=True) person_name = forms.CharField(disabled=True)
......
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