From 55c86afb1202d889cbe7055d18b6342f80288868 Mon Sep 17 00:00:00 2001
From: "J.-S. Caux" <J.S.Caux@uva.nl>
Date: Tue, 6 Feb 2018 11:59:20 +0100
Subject: [PATCH] Update email fellow tasklist
---
submissions/constants.py | 1 -
submissions/utils.py | 8 ++++----
templates/email/email_fellow_tasklist.html | 4 ++--
templates/email/email_fellow_tasklist.txt | 2 +-
4 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/submissions/constants.py b/submissions/constants.py
index c06c7aa50..438211e49 100644
--- a/submissions/constants.py
+++ b/submissions/constants.py
@@ -105,7 +105,6 @@ SUBMISSION_TYPE = (
NO_REQUIRED_ACTION_STATUSES = SUBMISSION_STATUS_PUBLICLY_INVISIBLE + [
STATUS_UNASSIGNED,
- STATUS_RESUBMISSION_INCOMING
]
ED_COMM_CHOICES = (
diff --git a/submissions/utils.py b/submissions/utils.py
index 018678df4..103c5d849 100644
--- a/submissions/utils.py
+++ b/submissions/utils.py
@@ -169,7 +169,7 @@ class BaseRefereeSubmissionCycle(BaseSubmissionCycle):
for ref_inv in self.submission.referee_invitations.all():
if not ref_inv.cancelled:
if ref_inv.accepted is None:
- '''An invited referee may have not responsed yet.'''
+ '''An invited referee may have not responded yet.'''
timelapse = timezone.now() - ref_inv.date_invited
if timelapse > datetime.timedelta(days=3):
text = ('Referee %s has not responded for %i days. '
@@ -185,10 +185,10 @@ class BaseRefereeSubmissionCycle(BaseSubmissionCycle):
if timeleft.days < 0:
text += '(%i days overdue). ' % (- timeleft.days)
elif timeleft.days == 1:
- text += '(with 1 day left). '
+ text += '(with 1 day left). Consider sending an urgent reminder.'
else:
- text += '(with %i days left). ' % timeleft.days
- text += 'Consider sending a reminder or cancelling the invitation.'
+ text += ('(with %i days left). Consider sending a reminder if '
+ 'you think it can ensure a timely Report.' % timeleft.days)
self.required_actions.append(('referee_no_delivery', text,))
if self.submission.reporting_deadline < timezone.now():
diff --git a/templates/email/email_fellow_tasklist.html b/templates/email/email_fellow_tasklist.html
index 4de2a66f0..a7c8eb44e 100644
--- a/templates/email/email_fellow_tasklist.html
+++ b/templates/email/email_fellow_tasklist.html
@@ -1,7 +1,7 @@
{% load bootstrap %}
{% load submissions_extras %}
<p>Dear {{ fellow.get_title_display }} {{ fellow.user.last_name }},</p>
-<p>Please find below a digest of your current assignments, with pending and upcoming required actions. Many thanks in advance for your timely invervention.</p>
+<p>Please find below a digest of your current assignments, with (if applicable) pending and upcoming required actions. Many thanks in advance for your timely invervention.</p>
{% if assignments_to_consider %}
<h3>Assignments for you to consider:</h3>
<ul>
@@ -18,7 +18,7 @@
{% for assignment in assignments_ongoing %}
<li>
<p>
- <a href="https://scipost.org{% url 'submissions:pool' assignment.submission.arxiv_identifier_w_vn_nr %}">{{ assignment.submission.title }}</a><br>
+ <a href="https://scipost.org{% url 'submissions:submission_detail' assignment.submission.arxiv_identifier_w_vn_nr %}">{{ assignment.submission.title }}</a><br>
<em>by {{ assignment.submission.author_list }}</em>
</p>
<p><a href="https://scipost.org{% url 'submissions:editorial_page' assignment.submission.arxiv_identifier_w_vn_nr %}">Go to this Submission's Editorial page</a></p>
diff --git a/templates/email/email_fellow_tasklist.txt b/templates/email/email_fellow_tasklist.txt
index 5e6fb4155..a1d872066 100644
--- a/templates/email/email_fellow_tasklist.txt
+++ b/templates/email/email_fellow_tasklist.txt
@@ -1,6 +1,6 @@
{% load submissions_extras %}
Dear {{ fellow.get_title_display }} {{ fellow.user.last_name }},\n\n
-Please find below a digest of your current assignments, with pending and upcoming required actions. Many thanks in advance for your timely invervention.\n\n
+Please find below a digest of your current assignments, with (if applicable) pending and upcoming required actions. Many thanks in advance for your timely invervention.\n\n
{% if assignments_to_consider %}
Assignments for you to consider:\n\n
{% for assignment in assignments_to_consider %}
--
GitLab