Fix/improve workload overview #552
Conversation
reviews/views.py
Outdated
| class CommitteeMembersWorkloadView( | ||
| GroupRequiredMixin, CommitteeMixin, generic.FormView | ||
| ): | ||
| template_name = "reviews/committee_members_workload.html" | ||
| group_required = [settings.GROUP_SECRETARY] | ||
|
|
||
| form_class = StartEndDateForm | ||
|
|
||
| def __init__(self, **kwargs): | ||
| super().__init__(**kwargs) | ||
| self.today = date.today() | ||
| self.one_year_ago = self.today - timedelta(days=365) | ||
|
|
||
| def get_initial(self): | ||
| initial = super().get_initial() | ||
|
|
||
| if "start_date" in self.request.GET and "end_date" in self.request.GET: | ||
| initial["start_date"] = self.request.GET.get("start_date") | ||
| initial["end_date"] = self.request.GET.get("end_date") | ||
| else: | ||
| initial["start_date"] = self.one_year_ago.strftime("%Y-%m-%d") | ||
| initial["end_date"] = self.today.strftime("%Y-%m-%d") | ||
|
|
||
| return initial |
There was a problem hiding this comment.
The way you're using the form here doesn't really make sense. It's basically a way to only display the form, which would probably be better done with just plain HTML at that point.
It works... But you're leaving a lot functionality on the table, most importantly validation.
I would suggest actually using the form-processing; This is done by making the form use 'post', and then overriding the 'post()' method of this View to retrieve the validated and cleaned data. For example:
def __init__(self, **kwargs):
super().__init__(**kwargs)
self.today = date.today()
self.start_date = self.today - timedelta(days=365)
self.end_date = self.today
def post(self, request, *args, **kwargs):
form = self.get_form()
if form.is_valid():
self.start_date = form.cleaned_data['start_date']
self.end_date = form.cleaned_data['end_date']
else:
return self.form_invalid(form)
return self.get(request, *args, **kwargs)
def get_initial(self):
initial = super().get_initial()
# You don't actually have to cast these to strings btw, DateField can handle date(time)s
initial["start_date"] = self.start_date
initial["end_date"] = self.end_date
return initialThen, use self.start_date and self.end_date in your querysets
|
Thanks, Ty. That does look a lot smoother. I still struggle with comprehending forms ;p One thing I ran into, is that on my system, if I don't add the string formatting of the initial dates, when I load the page in Dutch, the initial value of the dates defaults to (literally) "mm / dd / yyyy" instead of "10 / 23 / 2023" for example. It works fine when I load the page in English without the |
There was a problem hiding this comment.
It's a bug in DSC
I can fix it there quite easily, but it will be a while before it can be used here. So, for now, your workaround is fine I guess?
I would like the comment above it to indicate it's a workaround for a bug. It's an approve for me, granted you do change it.
I've made improvements to the workload overview of committee members, according to Desiree's wishes.
The queryset for get all open decisions had to be updated, because it was letting in the wrong things.
Also, to get all reviewers of a chamber, the code now finds all decisions in a chamber first and then looks at all associated reviewers. The old way also showed Michael for instance ...
The period for the second table can now also be customized, using two datepickers. This was a request of Desiree.
I've also incorporated a fix for issue #540, because it was a minor fix.