From 965cf9f93f1dfb2228f11a083e95e93a634b44a9 Mon Sep 17 00:00:00 2001
From: Fredrik Jonsson <frjo@xdeb.org>
Date: Tue, 12 May 2020 15:44:08 +0200
Subject: [PATCH] Add a LeaderboardDetailTable view.
---
hypha/apply/funds/tables.py | 23 ++++++++++++++--
.../templates/funds/review_leaderboard.html | 12 +++++----
.../funds/review_leaderboard_detail.html | 27 +++++++++++++++++++
.../templates/funds/submissions_overview.html | 2 ++
.../templates/funds/submissions_result.html | 16 ++++-------
hypha/apply/funds/urls.py | 6 ++++-
hypha/apply/funds/views.py | 16 +++++++++++
7 files changed, 83 insertions(+), 19 deletions(-)
create mode 100644 hypha/apply/funds/templates/funds/review_leaderboard_detail.html
diff --git a/hypha/apply/funds/tables.py b/hypha/apply/funds/tables.py
index c65ac1c4b..b2d7d546a 100644
--- a/hypha/apply/funds/tables.py
+++ b/hypha/apply/funds/tables.py
@@ -52,7 +52,11 @@ def render_actions(table, record):
def render_title(record):
- return textwrap.shorten(record.title, width=30, placeholder="...")
+ try:
+ title = record.title
+ except AttributeError:
+ title = record.submission.title
+ return textwrap.shorten(title, width=30, placeholder="...")
class SubmissionsTable(tables.Table):
@@ -381,6 +385,8 @@ class LeaderboardFilterForm(forms.ModelForm):
class LeaderboardFilter(filters.FilterSet):
+ query = filters.CharFilter(field_name='full_name', lookup_expr="icontains", widget=forms.HiddenInput)
+
reviewer = Select2ModelMultipleChoiceFilter(
field_name='pk',
label='Reviewers',
@@ -408,7 +414,7 @@ class LeaderboardFilter(filters.FilterSet):
class LeaderboardTable(tables.Table):
- full_name = tables.Column(verbose_name="Reviewer")
+ full_name = tables.LinkColumn('funds:submissions:leaderboard_detail', args=[A('pk')], orderable=True, verbose_name="Reviewer")
class Meta:
fields = [
@@ -420,3 +426,16 @@ class LeaderboardTable(tables.Table):
]
model = User
order_by = ('-total',)
+
+
+class LeaderboardDetailTable(tables.Table):
+ title = tables.LinkColumn('funds:submissions:reviews:review', text=render_title, args=[A('submission_id'), A('pk')], orderable=True, verbose_name="Submission")
+
+ class Meta:
+ fields = [
+ 'title',
+ 'recommendation',
+ 'created_at',
+ ]
+ model = Review
+ order_by = ('-created_at',)
diff --git a/hypha/apply/funds/templates/funds/review_leaderboard.html b/hypha/apply/funds/templates/funds/review_leaderboard.html
index 620bbeb76..a4b345da1 100644
--- a/hypha/apply/funds/templates/funds/review_leaderboard.html
+++ b/hypha/apply/funds/templates/funds/review_leaderboard.html
@@ -1,9 +1,8 @@
-{% extends "funds/base_submissions_table.html" %}
-
+{% extends "funds/submissions_overview.html" %}
{% load static %}
{% load render_table from django_tables2 %}
-{% block title %}Submissions{% endblock %}
+{% block title %}Reviews{% endblock %}
{% block content %}
<div class="admin-bar">
@@ -11,15 +10,18 @@
{% block page_header %}
<div>
<h1 class="gamma heading heading--no-margin heading--bold">Reviewer Leaderboard</h1>
- <h5>TAG LINE</h5>
+ <h5>Track and explore the reviews</h5>
</div>
{% endblock %}
+ {% block page_header_tabs %}
+ {{ block.super }}
+ {% endblock %}
</div>
</div>
<div class="wrapper wrapper--large wrapper--inner-space-medium">
{% block table %}
- {% include "funds/includes/table_filter_and_search.html" with filter_form=filter_form search_term=search_term use_search=True filter_action=filter_action use_batch_actions=False heading="All reviewers" %}
+ {% include "funds/includes/table_filter_and_search.html" with filter_form=filter_form search_term=search_term search_placeholder="reviewers" use_search=True filter_action=filter_action use_batch_actions=False heading="All reviewers" %}
{% render_table table %}
{% endblock %}
diff --git a/hypha/apply/funds/templates/funds/review_leaderboard_detail.html b/hypha/apply/funds/templates/funds/review_leaderboard_detail.html
new file mode 100644
index 000000000..6753028ba
--- /dev/null
+++ b/hypha/apply/funds/templates/funds/review_leaderboard_detail.html
@@ -0,0 +1,27 @@
+{% extends "funds/submissions_overview.html" %}
+{% load static %}
+{% load render_table from django_tables2 %}
+
+{% block title %}Reviews{% endblock %}
+
+{% block content %}
+<div class="admin-bar">
+ <div class="admin-bar__inner wrapper--search">
+ {% block page_header %}
+ <div>
+ <h1 class="gamma heading heading--no-margin heading--bold">Reviewer Leaderboard</h1>
+ <h5>Track and explore the reviews</h5>
+ </div>
+ {% endblock %}
+ {% block page_header_tabs %}
+ {{ block.super }}
+ {% endblock %}
+ </div>
+</div>
+
+<div class="wrapper wrapper--large wrapper--inner-space-medium">
+ {% block table %}
+ {% render_table table %}
+ {% endblock %}
+</div>
+{% endblock %}
diff --git a/hypha/apply/funds/templates/funds/submissions_overview.html b/hypha/apply/funds/templates/funds/submissions_overview.html
index d954386f0..b055a0593 100644
--- a/hypha/apply/funds/templates/funds/submissions_overview.html
+++ b/hypha/apply/funds/templates/funds/submissions_overview.html
@@ -10,6 +10,8 @@
<h1 class="gamma heading heading--no-margin heading--bold">Submissions</h1>
<h5>Track and explore recent submissions</h5>
</div>
+ {% endblock %}
+ {% block page_header_tabs %}
{% if request.user.is_apply_staff %}
<div class="tabs">
<div class="tabs__container">
diff --git a/hypha/apply/funds/templates/funds/submissions_result.html b/hypha/apply/funds/templates/funds/submissions_result.html
index 6510c3a8d..8b5afd483 100644
--- a/hypha/apply/funds/templates/funds/submissions_result.html
+++ b/hypha/apply/funds/templates/funds/submissions_result.html
@@ -1,19 +1,19 @@
-{% extends "base-apply.html" %}
+{% extends "funds/submissions_overview.html" %}
{% load static %}
{% block title %}Submissions results{% endblock %}
-{% block extra_css %}
-{{ filter.form.media.css }}
-{% endblock %}
-
{% block content %}
<div class="admin-bar">
<div class="admin-bar__inner wrapper--search">
{% block page_header %}
<div>
<h1 class="gamma heading heading--no-margin heading--bold">Submissions results</h1>
+ <h5>Track and explore the results</h5>
</div>
{% endblock %}
+ {% block page_header_tabs %}
+ {{ block.super }}
+ {% endblock %}
</div>
</div>
@@ -27,9 +27,3 @@
</div>
</div>
{% endblock %}
-
-{% block extra_js %}
- {{ filter.form.media.js }}
- <script src="https://cdnjs.cloudflare.com/ajax/libs/url-search-params/1.1.0/url-search-params.js"></script>
- <script src="{% static 'js/apply/submission-filters.js' %}"></script>
-{% endblock %}
diff --git a/hypha/apply/funds/urls.py b/hypha/apply/funds/urls.py
index da28bd33e..d96747af8 100644
--- a/hypha/apply/funds/urls.py
+++ b/hypha/apply/funds/urls.py
@@ -5,6 +5,7 @@ from hypha.apply.projects import urls as projects_urls
from .views import (
ReminderDeleteView,
ReviewLeaderboard,
+ ReviewLeaderboardDetail,
RevisionCompareView,
RevisionListView,
RoundListView,
@@ -44,7 +45,10 @@ submission_urls = ([
path('', SubmissionUserFlaggedView.as_view(), name="flagged"),
path('staff/', SubmissionStaffFlaggedView.as_view(), name="staff_flagged"),
])),
- path('reviews/', ReviewLeaderboard.as_view(), name="leaderboard"),
+ path('reviews/', include([
+ path('', ReviewLeaderboard.as_view(), name="leaderboard"),
+ path('<int:pk>/', ReviewLeaderboardDetail.as_view(), name="leaderboard_detail"),
+ ])),
path('<int:pk>/', include([
path('', SubmissionDetailView.as_view(), name="detail"),
path('edit/', SubmissionEditView.as_view(), name="edit"),
diff --git a/hypha/apply/funds/views.py b/hypha/apply/funds/views.py
index fd393579c..6e84a809c 100644
--- a/hypha/apply/funds/views.py
+++ b/hypha/apply/funds/views.py
@@ -81,6 +81,7 @@ from .tables import (
AdminSubmissionsTable,
LeaderboardFilter,
LeaderboardTable,
+ LeaderboardDetailTable,
ReviewerSubmissionsTable,
RoundsFilter,
RoundsTable,
@@ -1206,3 +1207,18 @@ class ReviewLeaderboard(UserPassesTestMixin, SingleTableMixin, FilterView):
def test_func(self):
return self.request.user.is_apply_staff or self.request.user.is_reviewer
+
+
+@method_decorator(login_required, name='dispatch')
+class ReviewLeaderboardDetail(UserPassesTestMixin, SingleTableMixin, ListView):
+ model = Review
+ table_class = LeaderboardDetailTable
+ paginator_class = LazyPaginator
+ table_pagination = {'per_page': 25}
+ template_name = 'funds/review_leaderboard_detail.html'
+
+ def get_table_data(self):
+ return super().get_table_data().filter(author__reviewer_id=self.kwargs.get('pk')).select_related('submission')
+
+ def test_func(self):
+ return self.request.user.is_apply_staff or self.request.user.is_reviewer
--
GitLab