Skip to content
Snippets Groups Projects
Verified Commit da7fafa6 authored by Lloyd Meins's avatar Lloyd Meins :thought_balloon:
Browse files

Show in my overview for teachers the missing entries as a default

parent 50a89067
No related branches found
No related tags found
1 merge request!183Resolve "Add page "Missing entries""
Pipeline #10042 failed
...@@ -275,13 +275,14 @@ class FilterRegisterObjectForm(forms.Form): ...@@ -275,13 +275,14 @@ class FilterRegisterObjectForm(forms.Form):
date_end = forms.DateField(label=_("End date")) date_end = forms.DateField(label=_("End date"))
@classmethod @classmethod
def get_initial(cls): def get_initial(cls, has_documentation=None):
date_end = timezone.now().date() date_end = timezone.now().date()
date_start = date_end - timedelta(days=30) date_start = date_end - timedelta(days=30)
return { return {
"school_term": SchoolTerm.current, "school_term": SchoolTerm.current,
"date_start": date_start, "date_start": date_start,
"date_end": date_end, "date_end": date_end,
"has_documentation": has_documentation,
} }
def __init__( def __init__(
...@@ -289,13 +290,14 @@ class FilterRegisterObjectForm(forms.Form): ...@@ -289,13 +290,14 @@ class FilterRegisterObjectForm(forms.Form):
request: HttpRequest, request: HttpRequest,
*args, *args,
for_person: bool = True, for_person: bool = True,
default_documentation: Optional[bool] = None,
groups: Optional[Sequence[Group]] = None, groups: Optional[Sequence[Group]] = None,
**kwargs **kwargs
): ):
self.request = request self.request = request
person = self.request.user.person person = self.request.user.person
kwargs["initial"] = self.get_initial() kwargs["initial"] = self.get_initial(has_documentation=default_documentation)
super().__init__(*args, **kwargs) super().__init__(*args, **kwargs)
self.fields["school_term"].queryset = SchoolTerm.objects.all() self.fields["school_term"].queryset = SchoolTerm.objects.all()
......
...@@ -946,8 +946,8 @@ def overview_person(request: HttpRequest, id_: Optional[int] = None) -> HttpResp ...@@ -946,8 +946,8 @@ def overview_person(request: HttpRequest, id_: Optional[int] = None) -> HttpResp
context["extra_marks"] = extra_marks context["extra_marks"] = extra_marks
# Build filter with own form and logic as django-filter can't work with different models # Build filter with own form and logic as django-filter can't work with different models
filter_form = FilterRegisterObjectForm(request, request.GET or None, for_person=True) filter_form = FilterRegisterObjectForm(request, request.GET or None, for_person=True, default_documentation=False)
filter_dict = filter_form.cleaned_data if filter_form.is_valid() else {} filter_dict = filter_form.cleaned_data if filter_form.is_valid() else {"has_documentation": False}
filter_dict["person"] = person filter_dict["person"] = person
context["filter_form"] = filter_form context["filter_form"] = filter_form
......
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