Allow reviewers to see all submissions on dashboard

hypha/apply/dashboard/templates/dashboard/reviewer_dashboard.html

@@ -35,7 +35,7 @@
 
                 {% if my_reviewed.display_more %}
                     <div class="all-submissions-table__more">
-                        <a href="{{ my_reviewed.url }}?reviewers={{ request.user.pk }}">{% trans "Show all" %}</a>
+                        <a href="{{ my_reviewed.url }}">{% trans "Show all" %}</a>
                     </div>
                 {% endif %}
             </div>
@@ -77,6 +77,20 @@ <h2 class="text-xl mb-2">
                 {% render_table my_inactive_submissions %}
             </div>
         {% endif %}
+
+        {% if all_submissions.table.data %}
+            <div class="wrapper wrapper--bottom-space">
+
+                <h4 class="heading heading--normal">{% trans "All Submissions" %}</h4>
+                {% render_table all_submissions.table %}
+
+                {% if all_submissions.display_more %}
+                    <div class="all-submissions-table__more">
+                        <a href="{{ all_submissions.url }}">{% trans "Show all" %}</a>
+                    </div>
+                {% endif %}
+            </div>
+        {% endif %}
     </div>
 
 {% endblock %}

hypha/apply/dashboard/views.py

@@ -1,4 +1,5 @@
 from django.conf import settings
+from django.db.models import F
 from django.http import HttpResponseForbidden, HttpResponseRedirect
 from django.shortcuts import render
 from django.urls import reverse, reverse_lazy
@@ -317,11 +318,22 @@ def get_context_data(self, **kwargs):
                 "awaiting_reviews": self.awaiting_reviews(submissions),
                 "my_reviewed": self.my_reviewed(submissions),
                 "my_flagged": self.my_flagged(submissions),
+                "all_submissions": self.all_submissions(submissions),
             }
         )
 
         return context
 
+    def all_submissions(self, submissions):
+        limit = 5
+        submissions = submissions.order_by(F("last_update").desc(nulls_last=True))
+
+        return {
+            "table": ReviewerSubmissionsTable(submissions[:limit], prefix="my-review-"),
+            "display_more": submissions.count() > limit,
+            "url": reverse("funds:submissions:list"),
+        }
+
     def awaiting_reviews(self, submissions):
         submissions = submissions.in_review_for(self.request.user).order_by(
             "-submit_time"
@@ -354,7 +366,7 @@ def my_reviewed(self, submissions):
             ),
             "table": ReviewerSubmissionsTable(submissions[:limit], prefix="my-review-"),
             "display_more": submissions.count() > limit,
-            "url": reverse("funds:submissions:list"),
+            "url": reverse("funds:submissions:my_reviewed"),
         }
 
 

hypha/apply/funds/templates/funds/submissions.html

@@ -8,7 +8,12 @@
 
     {% adminbar %}
         {% slot header %}
-            {% trans "All Submissions" %}<span class="submissions-count"> ({{ table.rows|length }})</span>
+            {% if page_heading %}
+                {{ page_heading }}
+            {% else %}
+                {% trans "All Submissions" %}
+            {% endif %}
+            <span class="submissions-count"> ({{ table.rows|length }})</span>
         {% endslot %}
         {% slot sub_heading %}{% trans "Search and filter all submissions" %}{% endslot %}
 

hypha/apply/funds/urls.py

@@ -8,6 +8,7 @@
     AwaitingReviewSubmissionsListView,
     ExportSubmissionsByRound,
     GroupingApplicationsListView,
+    MyReviewedSubmissionListView,
     ReminderDeleteView,
     ReviewerLeaderboard,
     ReviewerLeaderboardDetail,
@@ -167,6 +168,9 @@
             AwaitingReviewSubmissionsListView.as_view(),
             name="awaiting_review",
         ),
+        path(
+            "my_reviewed/", MyReviewedSubmissionListView.as_view(), name="my_reviewed"
+        ),
         path(
             "assignments/",
             include(

hypha/apply/funds/views.py

@@ -404,11 +404,6 @@ class BaseReviewerSubmissionsTable(BaseAdminSubmissionsTable):
     filterset_class = SubmissionReviewerFilterAndSearch
 
     def get_queryset(self):
-        """
-        If use_settings variable is set for ReviewerSettings use settings
-        parameters to filter submissions or return only reviewed_by as it
-        was by default.
-        """
         reviewer_settings = ReviewerSettings.for_request(self.request)
         if reviewer_settings.use_settings:
             return (
@@ -419,6 +414,9 @@ def get_queryset(self):
             )
         return super().get_queryset().reviewed_by(self.request.user)
 
+    def get_context_data(self, **kwargs):
+        return super().get_context_data(page_heading="My Reviewed", **kwargs)
+
 
 @method_decorator(login_required, name="dispatch")
 class AwaitingReviewSubmissionsListView(SingleTableMixin, ListView):
@@ -581,13 +579,13 @@ class GroupingApplicationsListView(TemplateView):
     template_name = "funds/grouped_application_list.html"
 
 
-class SubmissionReviewerListView(BaseReviewerSubmissionsTable):
+class MyReviewedSubmissionListView(BaseReviewerSubmissionsTable):
     template_name = "funds/submissions.html"
 
 
 class SubmissionListView(ViewDispatcher):
     admin_view = SubmissionAdminListView
-    reviewer_view = SubmissionReviewerListView
+    reviewer_view = SubmissionAdminListView
 
 
 @method_decorator(staff_required, name="dispatch")