Skip to content
Snippets Groups Projects
Commit 124861fb authored by Erin Mullaney's avatar Erin Mullaney
Browse files

Merge branch 'feature/937-dashboard-waiting-review' into feature/938-dash-previous-reviews

parents e78041da a7f04548
No related branches found
No related tags found
No related merge requests found
...@@ -19,6 +19,30 @@ ...@@ -19,6 +19,30 @@
<div class="wrapper wrapper--large wrapper--inner-space-medium"> <div class="wrapper wrapper--large wrapper--inner-space-medium">
<div class="wrapper wrapper--large wrapper--inner-space-medium"> <div class="wrapper wrapper--large wrapper--inner-space-medium">
<h4 class="heading heading--normal">
Waiting for your review <span class="heading heading--submission-count">{{ in_review_count }}</span>
</h4>
{% if my_review.data %}
{% render_table my_review %}
{% if display_more %}
<div class="all-submissions-table__more">
<a href="{% url 'apply:submissions:list' %}?reviewers={{ request.user.pk }}">Show all</a>
</div>
{% endif %}
{% else %}
<div class="grid grid--seventy-thirty wrapper wrapper--large ">
<div class="reviewer-dash-box">
<h5 class="reviewer-dash-box__title">Nice! You're all caught up.</h5>
<a class="button button--primary" href="{% url 'apply:submissions:list' %}">Find new applications to review</a>
</div>
{# TODO Fill in data and update styles in future ticket #}
<div>{# Since you last logged in #}</div>
</div>
{% endif %}
{% if closed_rounds or open_rounds %} {% if closed_rounds or open_rounds %}
{% include "funds/includes/round-block.html" with closed_rounds=closed_rounds open_rounds=open_rounds title=rounds_title %} {% include "funds/includes/round-block.html" with closed_rounds=closed_rounds open_rounds=open_rounds title=rounds_title %}
{% endif %} {% endif %}
......
...@@ -28,6 +28,10 @@ class AdminDashboardView(TemplateView): ...@@ -28,6 +28,10 @@ class AdminDashboardView(TemplateView):
closed_query = '?round_state=closed' closed_query = '?round_state=closed'
rounds_title = 'Your rounds and labs' rounds_title = 'Your rounds and labs'
my_review_qs = qs.in_review_for(request.user).order_by('-submit_time')
my_review = SummarySubmissionsTable(my_review_qs[:5], prefix='my-review-')
display_more = (my_review_qs.count() > 5)
return render(request, 'dashboard/dashboard.html', { return render(request, 'dashboard/dashboard.html', {
'in_review': in_review, 'in_review': in_review,
'open_rounds': open_rounds, 'open_rounds': open_rounds,
...@@ -35,6 +39,9 @@ class AdminDashboardView(TemplateView): ...@@ -35,6 +39,9 @@ class AdminDashboardView(TemplateView):
'closed_rounds': closed_rounds, 'closed_rounds': closed_rounds,
'closed_query': closed_query, 'closed_query': closed_query,
'rounds_title': rounds_title, 'rounds_title': rounds_title,
'my_review': my_review,
'in_review_count': my_review_qs.count(),
'display_more': display_more,
}) })
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment