Filter review dashboard by question answers

Author: rixx

doc/changelog.rst

@@ -3,6 +3,7 @@
 Release Notes
 =============
 
+- :feature:`-` The review dashboard can now be filtered by question answers, just like the submission list.
 - :feature:`-` New anonymisation indicator in proposal list.
 - :feature:`1418` Speaker availabilities are now limited to the sum of all room availabilites.
 - :feature:`1440` The list of team members is now always sorted by name.

src/pretalx/orga/templates/orga/review/dashboard.html

@@ -132,6 +132,18 @@
                 </details>
             </div>
         </form>
+        {% if filter_form.is_valid and filter_form.cleaned_data.question %}
+            <p class="text-muted ml-2">
+                <span class="fa fa-filter"></span>
+                {% blocktranslate trimmed with question=filter_form.cleaned_data.question.question %}
+                    List filtered by answers to question "{{ question }}".
+                {% endblocktranslate %}
+                <a href="?{% url_replace request 'question' '' 'answer' '' 'answer__options' '' %}" class="text-muted">
+                    <span class="fa fa-times"></span>
+                    {% translate "Remove filter" %}
+                </a>
+            </p>
+        {% endif %}
     </div>
 
     <form method="post">{% csrf_token %}

src/pretalx/orga/views/review.py

@@ -28,45 +28,21 @@
     TagsForm,
 )
 from pretalx.orga.forms.submission import SubmissionStateChangeForm
-from pretalx.orga.views.submission import ReviewerSubmissionFilter
+from pretalx.orga.views.submission import BaseSubmissionList
 from pretalx.person.models import User
 from pretalx.submission.forms import QuestionsForm, SubmissionFilterForm
 from pretalx.submission.models import Review, Submission, SubmissionStates
 
 
-class ReviewDashboard(
-    EventPermissionRequired, Filterable, ReviewerSubmissionFilter, ListView
-):
+class ReviewDashboard(EventPermissionRequired, BaseSubmissionList):
     template_name = "orga/review/dashboard.html"
-    paginate_by = None
-    context_object_name = "submissions"
     permission_required = "orga.view_review_dashboard"
-    filter_fields = (
-        "state",
-        "submission_type",
-        "tags",
-        "track",
-        "content_locale",
-        "pending_state",
-        "pending_state__isnull",
-    )
-    default_filters = (
-        "code__icontains",
-        "speakers__name__icontains",
-        "title__icontains",
-    )
-
-    def get_filter_form(self):
-        return SubmissionFilterForm(
-            data=self.request.GET,
-            event=self.request.event,
-            usable_states=[
-                SubmissionStates.SUBMITTED,
-                SubmissionStates.ACCEPTED,
-                SubmissionStates.REJECTED,
-                SubmissionStates.CONFIRMED,
-            ],
-            limit_tracks=self.limit_tracks,
+    paginate_by = None
+    usable_states=(
+        SubmissionStates.SUBMITTED,
+        SubmissionStates.ACCEPTED,
+        SubmissionStates.REJECTED,
+        SubmissionStates.CONFIRMED,
         )
 
     def filter_range(self, queryset):
@@ -95,16 +71,8 @@ def get_queryset(self):
             else (statistics.fmean if hasattr(statistics, "fmean") else statistics.mean)
         )
         queryset = (
-            super()
-            .get_queryset(for_review=True)
-            .filter(
-                state__in=[
-                    SubmissionStates.SUBMITTED,
-                    SubmissionStates.ACCEPTED,
-                    SubmissionStates.REJECTED,
-                    SubmissionStates.CONFIRMED,
-                ]
-            )
+            self._get_base_queryset(for_review=True)
+            .filter(state__in=self.usable_states)
         )
         queryset = self.filter_queryset(queryset).annotate(
             review_count=Count("reviews", distinct=True),

src/pretalx/orga/views/submission.py

@@ -517,12 +517,9 @@ def get_form_kwargs(self):
         return kwargs
 
 
-class SubmissionList(
-    EventPermissionRequired, Sortable, Filterable, ReviewerSubmissionFilter, ListView
-):
+class BaseSubmissionList(Sortable, Filterable, ReviewerSubmissionFilter, ListView):
     model = Submission
     context_object_name = "submissions"
-    template_name = "orga/submission/list.html"
     filter_fields = (
         "submission_type",
         "state",
@@ -533,14 +530,13 @@ class SubmissionList(
         "pending_state__isnull",
     )
     sortable_fields = ("code", "title", "state", "is_featured")
-    secondary_sort = {"state": ("pending_state",)}
-    permission_required = "orga.view_submissions"
-    paginate_by = 25
+    usable_states = None
 
     def get_filter_form(self):
         return SubmissionFilterForm(
             data=self.request.GET,
             event=self.request.event,
+            usable_states=self.usable_states,
             limit_tracks=self.limit_tracks,
         )
 
@@ -550,28 +546,10 @@ def get_default_filters(self, *args, **kwargs):
             default_filters.add("speakers__name__icontains")
         return default_filters
 
-    @context
-    def show_submission_types(self):
-        return self.request.event.submission_types.all().count() > 1
-
-    @context
-    @cached_property
-    def pending_changes(self):
-        return self.request.event.submissions.filter(
-            pending_state__isnull=False
-        ).count()
-
-    @context
-    def show_tracks(self):
-        if self.request.event.feature_flags["use_tracks"]:
-            if self.limit_tracks:
-                return len(self.limit_tracks) > 1
-            return self.request.event.tracks.all().count() > 1
-
-    def get_queryset(self):
+    def _get_base_queryset(self, for_review=False):
         # If somebody has *only* reviewer permissions for this event, they can only
         # see the proposals they can review.
-        qs = super().get_queryset().order_by("-id")
+        qs = super().get_queryset(for_review=for_review).order_by("-id")
         qs = self.filter_queryset(qs)
         question = self.request.GET.get("question")
         unanswered = self.request.GET.get("unanswered")
@@ -598,8 +576,35 @@ def get_queryset(self):
             qs = qs.annotate(has_answer=Exists(answers)).filter(has_answer=False)
         if "state" not in self.request.GET:
             qs = qs.exclude(state="deleted")
-        qs = self.sort_queryset(qs)
-        return qs.distinct()
+        return qs
+
+    def get_queryset(self):
+        return self.sort_queryset(self._get_base_queryset()).distinct()
+
+
+class SubmissionList(EventPermissionRequired, BaseSubmissionList):
+    template_name = "orga/submission/list.html"
+    permission_required = "orga.view_submissions"
+    paginate_by = 25
+    secondary_sort = {"state": ("pending_state",)}
+
+    @context
+    def show_submission_types(self):
+        return self.request.event.submission_types.all().count() > 1
+
+    @context
+    @cached_property
+    def pending_changes(self):
+        return self.request.event.submissions.filter(
+            pending_state__isnull=False
+        ).count()
+
+    @context
+    def show_tracks(self):
+        if self.request.event.feature_flags["use_tracks"]:
+            if self.limit_tracks:
+                return len(self.limit_tracks) > 1
+            return self.request.event.tracks.all().count() > 1
 
 
 class FeedbackList(SubmissionViewMixin, ListView):