Skip to content
Snippets Groups Projects
Commit 7134a4d5 authored by Fredrik Jonsson's avatar Fredrik Jonsson
Browse files

Spell out Submissions waiting for your review.

parent 46e671d3
No related branches found
No related tags found
No related merge requests found
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
</div> </div>
<div id="submissions-awaiting-review" class="wrapper wrapper--bottom-space"> <div id="submissions-awaiting-review" class="wrapper wrapper--bottom-space">
{% include "dashboard/includes/waiting-for-review.html" with in_review_count=awaiting_reviews.count my_review=awaiting_reviews.table display_more=awaiting_reviews.display_more active_statuses_filter=awaiting_reviews.active_statuses_filter %} {% include "dashboard/includes/submissions-waiting-for-review.html" with in_review_count=awaiting_reviews.count my_review=awaiting_reviews.table display_more=awaiting_reviews.display_more active_statuses_filter=awaiting_reviews.active_statuses_filter %}
</div> </div>
{% if my_flagged.table.data %} {% if my_flagged.table.data %}
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
{% load i18n %} {% load i18n %}
<h4 class="heading heading--normal"> <h4 class="heading heading--normal">
{% trans "Waiting for your review" %} <span class="heading heading--submission-count">{{ in_review_count }}</span> {% trans "Submissions waiting for your review" %} <span class="heading heading--submission-count">{{ in_review_count }}</span>
</h4> </h4>
{% if my_review.data %} {% if my_review.data %}
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<div class="wrapper wrapper--large wrapper--inner-space-medium"> <div class="wrapper wrapper--large wrapper--inner-space-medium">
<div class="wrapper wrapper--bottom-space"> <div class="wrapper wrapper--bottom-space">
{% include "dashboard/includes/waiting-for-review.html" with in_review_count=awaiting_reviews.count my_review=awaiting_reviews.table display_more=awaiting_reviews.display_more active_statuses_filter=awaiting_reviews.active_statuses_filter %} {% include "dashboard/includes/submissions-waiting-for-review.html" with in_review_count=awaiting_reviews.count my_review=awaiting_reviews.table display_more=awaiting_reviews.display_more active_statuses_filter=awaiting_reviews.active_statuses_filter %}
</div> </div>
{% if my_flagged.table.data %} {% if my_flagged.table.data %}
......
...@@ -84,7 +84,7 @@ class TestStaffDashboard(BaseViewTestCase): ...@@ -84,7 +84,7 @@ class TestStaffDashboard(BaseViewTestCase):
def test_waiting_for_review_with_count(self): def test_waiting_for_review_with_count(self):
submission = ApplicationSubmissionFactory(status='external_review', workflow_stages=2, reviewers=[self.user]) submission = ApplicationSubmissionFactory(status='external_review', workflow_stages=2, reviewers=[self.user])
response = self.get_page() response = self.get_page()
self.assertContains(response, 'Waiting for your review') self.assertContains(response, 'Submissions waiting for your review')
self.assertContains(response, submission.title) self.assertContains(response, submission.title)
self.assertEqual(response.context['awaiting_reviews']['count'], 1) self.assertEqual(response.context['awaiting_reviews']['count'], 1)
...@@ -94,7 +94,7 @@ class TestStaffDashboard(BaseViewTestCase): ...@@ -94,7 +94,7 @@ class TestStaffDashboard(BaseViewTestCase):
review = ReviewFactory(submission=submission, author__reviewer=staff, author__staff=True, recommendation_yes=True) review = ReviewFactory(submission=submission, author__reviewer=staff, author__staff=True, recommendation_yes=True)
ReviewOpinionFactory(review=review, author__reviewer=self.user, opinion_agree=True) ReviewOpinionFactory(review=review, author__reviewer=self.user, opinion_agree=True)
response = self.get_page() response = self.get_page()
self.assertContains(response, 'Waiting for your review') self.assertContains(response, 'Submissions waiting for your review')
self.assertContains(response, "Nice! You're all caught up.") self.assertContains(response, "Nice! You're all caught up.")
self.assertEqual(response.context['awaiting_reviews']['count'], 0) self.assertEqual(response.context['awaiting_reviews']['count'], 0)
...@@ -179,7 +179,7 @@ class TestReviewerDashboard(BaseViewTestCase): ...@@ -179,7 +179,7 @@ class TestReviewerDashboard(BaseViewTestCase):
def test_waiting_for_review_with_count(self): def test_waiting_for_review_with_count(self):
submission = ApplicationSubmissionFactory(status='external_review', workflow_stages=2, reviewers=[self.user]) submission = ApplicationSubmissionFactory(status='external_review', workflow_stages=2, reviewers=[self.user])
response = self.get_page() response = self.get_page()
self.assertContains(response, 'Waiting for your review') self.assertContains(response, 'Submissions waiting for your review')
self.assertContains(response, submission.title) self.assertContains(response, submission.title)
self.assertEqual(response.context['in_review_count'], 1) self.assertEqual(response.context['in_review_count'], 1)
......
...@@ -2,13 +2,13 @@ ...@@ -2,13 +2,13 @@
{% load i18n static %} {% load i18n static %}
{% load render_table from django_tables2 %} {% load render_table from django_tables2 %}
{% block title %}{% trans "Awaiting Review" %}{% endblock %} {% block title %}{% trans "Submissions awaiting Review" %}{% endblock %}
{% block content %} {% block content %}
<div class="admin-bar"> <div class="admin-bar">
<div class="admin-bar__inner wrapper--search"> <div class="admin-bar__inner wrapper--search">
{% block page_header %} {% block page_header %}
<div> <div>
<h1 class="gamma heading heading--no-margin heading--bold">{% trans "Waiting for your Review" %}<span class="submissions-count"> ({{ table.rows|length }})</span></h1> <h1 class="gamma heading heading--no-margin heading--bold">{% trans "Submissions waiting for your review" %}<span class="submissions-count"> ({{ table.rows|length }})</span></h1>
</div> </div>
{% endblock %} {% endblock %}
</div> </div>
......
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