From da7fafa60ffeb15cf0dfeb84688730d33a1596bc Mon Sep 17 00:00:00 2001
From: Lloyd Meins <git@lloydmeins.de>
Date: Fri, 14 May 2021 17:50:33 +0200
Subject: [PATCH] Show in my overview for teachers the missing entries as a
default
---
aleksis/apps/alsijil/forms.py | 6 ++++--
aleksis/apps/alsijil/views.py | 4 ++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/aleksis/apps/alsijil/forms.py b/aleksis/apps/alsijil/forms.py
index 72d3d2027..ec3d51503 100644
--- a/aleksis/apps/alsijil/forms.py
+++ b/aleksis/apps/alsijil/forms.py
@@ -275,13 +275,14 @@ class FilterRegisterObjectForm(forms.Form):
date_end = forms.DateField(label=_("End date"))
@classmethod
- def get_initial(cls):
+ def get_initial(cls, has_documentation=None):
date_end = timezone.now().date()
date_start = date_end - timedelta(days=30)
return {
"school_term": SchoolTerm.current,
"date_start": date_start,
"date_end": date_end,
+ "has_documentation": has_documentation,
}
def __init__(
@@ -289,13 +290,14 @@ class FilterRegisterObjectForm(forms.Form):
request: HttpRequest,
*args,
for_person: bool = True,
+ default_documentation: Optional[bool] = None,
groups: Optional[Sequence[Group]] = None,
**kwargs
):
self.request = request
person = self.request.user.person
- kwargs["initial"] = self.get_initial()
+ kwargs["initial"] = self.get_initial(has_documentation=default_documentation)
super().__init__(*args, **kwargs)
self.fields["school_term"].queryset = SchoolTerm.objects.all()
diff --git a/aleksis/apps/alsijil/views.py b/aleksis/apps/alsijil/views.py
index ebcea7fde..82a40c334 100644
--- a/aleksis/apps/alsijil/views.py
+++ b/aleksis/apps/alsijil/views.py
@@ -946,8 +946,8 @@ def overview_person(request: HttpRequest, id_: Optional[int] = None) -> HttpResp
context["extra_marks"] = extra_marks
# 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_dict = filter_form.cleaned_data if filter_form.is_valid() else {}
+ 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 {"has_documentation": False}
filter_dict["person"] = person
context["filter_form"] = filter_form
--
GitLab