From d312a7044d957175ac8d7c2ea6e4e8cac187aa9a Mon Sep 17 00:00:00 2001
From: George Katsikas <giorgakis.katsikas@gmail.com>
Date: Wed, 21 Feb 2024 16:09:45 +0100
Subject: [PATCH] fix bugs on fellowship monitor, comments of #163
---
scipost_django/colleges/forms.py | 6 +++++-
scipost_django/colleges/views/fellowships_monitor.py | 9 ++++++++-
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/scipost_django/colleges/forms.py b/scipost_django/colleges/forms.py
index 6dd25ecd1..7705205a9 100644
--- a/scipost_django/colleges/forms.py
+++ b/scipost_django/colleges/forms.py
@@ -1342,12 +1342,16 @@ class FellowshipsMonitorSearchForm(forms.Form):
orderby = forms.ChoiceField(
label="Order by",
choices=[
+ ("", "-----"),
+ ("contributor__profile__last_name", "Fellow"),
("nr_in_pool", "# in pool"),
("nr_appraised", "# appraised"),
("nr_assignments_completed", "# completed"),
+ ("nr_assignments_ongoing", "# ongoing"),
("start_date", "Start date"),
("until_date", "End date"),
],
+ initial="",
required=False,
)
ordering = forms.ChoiceField(
@@ -1627,7 +1631,7 @@ class FellowshipsMonitorSearchForm(forms.Form):
if not self.cleaned_data.get("has_guest"):
fellowships = fellowships.exclude(status=Fellowship.STATUS_GUEST)
if not self.cleaned_data.get("show_expired"):
- fellowships = fellowships.filter(until_date__gte=timezone.now())
+ fellowships = fellowships.exclude(until_date__lt=date.today())
# Ordering of nominations
# Only order if both fields are set
diff --git a/scipost_django/colleges/views/fellowships_monitor.py b/scipost_django/colleges/views/fellowships_monitor.py
index 4145c71c9..f400d30f6 100644
--- a/scipost_django/colleges/views/fellowships_monitor.py
+++ b/scipost_django/colleges/views/fellowships_monitor.py
@@ -54,7 +54,14 @@ def _hx_search_form(request, filter_set: str):
)
if filter_set == "empty":
- form.apply_filter_set({}, none_on_empty=True)
+ form.apply_filter_set(
+ {
+ "has_regular": True,
+ "has_senior": True,
+ "has_guest": True,
+ },
+ none_on_empty=True,
+ )
elif m := re.match(f"^from_({DATE_REGEX})_to_({DATE_REGEX})$", filter_set):
date_from = date.fromisoformat(m.group(1))
date_to = date.fromisoformat(m.group(2))
--
GitLab