Add filters to the Leaderboard table

hypha/apply/funds/tables.py

@@ -23,7 +23,6 @@ from hypha.images.models import CustomImage
 
 from .widgets import Select2MultiCheckboxesWidget
 
-
 User = get_user_model()
 
 
@@ -363,6 +362,51 @@ class RoundsFilter(filters.FilterSet):
     round_state = OpenRoundFilter(label='Open')
 
 
+class LeaderboardFilterForm(forms.ModelForm):
+    """
+    Form to "clean" a list of User objects to their PKs.
+
+    The Leaderboard table is a list of User objects, however we also want the
+    ability to filter down to N Users (reviewers).  Django filter is converting
+    the selected PKs to User objects, however we can't filter a User QuerySet
+    with User objects.  So this form converts back to a list of User PKs using
+    the clean_reviewer method.
+    """
+    class Meta:
+        fields = ["id"]
+        model = User
+
+    def clean_reviewer(self):
+        return [u.id for u in self.cleaned_data['reviewer']]
+
+
+class LeaderboardFilter(filters.FilterSet):
+    reviewer = Select2ModelMultipleChoiceFilter(
+        field_name='pk',
+        label='Reviewers',
+        queryset=get_reviewers,
+    )
+    funds = Select2ModelMultipleChoiceFilter(
+        field_name='submission__page',
+        label='Funds',
+        queryset=get_used_funds,
+    )
+    rounds = Select2ModelMultipleChoiceFilter(
+        field_name='submission__round',
+        label='Rounds',
+        queryset=get_used_rounds,
+    )
+
+    class Meta:
+        fields = [
+            'reviewer',
+            'funds',
+            'rounds',
+        ]
+        form = LeaderboardFilterForm
+        model = User
+
+
 class LeaderboardTable(tables.Table):
     full_name = tables.Column(verbose_name="Reviewer")
     most_recent = tables.Column(orderable=False)

hypha/apply/funds/views.py

@@ -79,6 +79,7 @@ from .models import (
 from .permissions import is_user_has_access_to_view_submission
 from .tables import (
     AdminSubmissionsTable,
+    LeaderboardFilter,
     LeaderboardTable,
     ReviewerSubmissionsTable,
     RoundsFilter,
@@ -1187,6 +1188,7 @@ class SubmissionResultView(FilterView):
 
 @method_decorator(login_required, name='dispatch')
 class ReviewLeaderboard(SingleTableMixin, FilterView):
+    filterset_class = LeaderboardFilter
     table_class = LeaderboardTable
     table_pagination = False
     template_name = 'funds/review_leaderboard.html'

hypha/apply/users/tests/factories.py

@@ -11,7 +11,7 @@ from ..groups import (
     COMMUNITY_REVIEWER_GROUP_NAME,
     PARTNER_GROUP_NAME,
     REVIEWER_GROUP_NAME,
-    STAFF_GROUP_NAME
+    STAFF_GROUP_NAME,
 )