Skip to content
Snippets Groups Projects
Verified Commit ff3776c2 authored by Hangzhi Yu's avatar Hangzhi Yu Committed by Jonathan Weth
Browse files

Set start date of current SchoolTerm as default value for personal note filter

parent 9f7b46b4
No related branches found
No related tags found
1 merge request!260Resolve "Show only personal notes from current term"
Pipeline #49493 passed
......@@ -9,6 +9,11 @@ and this project adheres to `Semantic Versioning`_.
Unreleased
----------
Changed
~~~~~~~
* Use start date of current SchoolTerm as default value for PersonalNote filter in overview.
`2.0rc7` - 2021-12-25
---------------------
......
......@@ -3,16 +3,27 @@ from django.utils.translation import gettext as _
from django_filters import CharFilter, DateFilter, FilterSet
from material import Layout, Row
from aleksis.core.models import SchoolTerm
from .models import PersonalNote
class PersonalNoteFilter(FilterSet):
day_start = DateFilter(lookup_expr="gte", label=_("After"))
day_start = DateFilter(
lookup_expr="gte", label=_("After"), initial=SchoolTerm.current.date_start
)
day_end = DateFilter(lookup_expr="lte", label=_("Before"))
subject = CharFilter(lookup_expr="icontains", label=_("Subject"))
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
def __init__(self, data=None, *args, **kwargs):
if data is not None:
data = data.copy()
for name, f in self.base_filters.items():
initial = f.extra.get("initial")
if not data.get(name) and initial:
data[name] = initial
super().__init__(data, *args, **kwargs)
self.form.fields["late__lt"].label = _("Tardiness is lower than")
self.form.fields["late__gt"].label = _("Tardiness is bigger than")
self.form.layout = Layout(
......
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