From 482f621560244055d7c689edd6acf8333b8a8048 Mon Sep 17 00:00:00 2001
From: "J.-S. Caux" <J.S.Caux@uva.nl>
Date: Mon, 28 Oct 2019 06:06:33 +0100
Subject: [PATCH] Improve info presentation
---
submissions/forms.py | 6 ++++--
.../partials/submissions/submission_status.html | 16 ++++++++++------
.../templates/submissions/submission_detail.html | 7 ++-----
submissions/views.py | 11 +++++++----
.../inform_authors_editorial_decision.html | 6 +++++-
5 files changed, 28 insertions(+), 18 deletions(-)
diff --git a/submissions/forms.py b/submissions/forms.py
index 7f8ef492a..eb582fe3f 100644
--- a/submissions/forms.py
+++ b/submissions/forms.py
@@ -1298,9 +1298,9 @@ class EICRecommendationForm(forms.ModelForm):
recommendation.version = len(self.earlier_recommendations) + 1
if self.reformulate:
- event_text = 'The Editorial Recommendation has been reformulated: {}.'
+ event_text = 'The Editorial Recommendation has been reformulated for Journal {}: {}.'
else:
- event_text = 'An Editorial Recommendation has been formulated: {}.'
+ event_text = 'An Editorial Recommendation has been formulated for Journal {}: {}.'
if recommendation.recommendation in [REPORT_MINOR_REV, REPORT_MAJOR_REV]:
# Minor/Major revision: return to Author; ask to resubmit
@@ -1317,10 +1317,12 @@ class EICRecommendationForm(forms.ModelForm):
# Add SubmissionEvents for both Author and EIC
self.submission.add_general_event(event_text.format(
+ str(recommendation.for_journal),
recommendation.get_recommendation_display()))
else:
# Add SubmissionEvent for EIC only
self.submission.add_event_for_eic(event_text.format(
+ str(recommendation.for_journal),
recommendation.get_recommendation_display()))
if self.earlier_recommendations:
diff --git a/submissions/templates/partials/submissions/submission_status.html b/submissions/templates/partials/submissions/submission_status.html
index 28d53a616..d1a1b3e37 100644
--- a/submissions/templates/partials/submissions/submission_status.html
+++ b/submissions/templates/partials/submissions/submission_status.html
@@ -2,11 +2,15 @@
<h6 class="prefix">Current status:</h6>
<div class="status">
<span class="label label-secondary">{{ submission.get_status_display }}</span>
- {% if submission.publication and submission.publication.is_published %}
- as
- <a href="{{ submission.publication.get_absolute_url }}">
- {{ submission.publication.citation }}
- </a>
- {% endif %}
</div>
+ <p>
+ Editorial decision:
+ <span class="label label-secondary">For Journal {{ submission.editorial_decision.for_journal }}: {{ submission.editorial_decision.get_decision_display }}</span>
+ <br>(status: {{ submission.editorial_decision.get_status_display }})
+ </p>
+ {% if submission.publication and submission.publication.is_published %}
+ <p>Published as <a href="{{ submission.publication.get_absolute_url }}">
+ {{ submission.publication.citation }}</a>
+ </p>
+ {% endif %}
</div>
diff --git a/submissions/templates/submissions/submission_detail.html b/submissions/templates/submissions/submission_detail.html
index 51a20a618..4fffc0744 100644
--- a/submissions/templates/submissions/submission_detail.html
+++ b/submissions/templates/submissions/submission_detail.html
@@ -89,14 +89,11 @@
<h3 class="mt-4">Submission summary</h3>
{% include 'partials/submissions/submission_summary.html' with submission=submission hide_title=1 show_abstract=1 %}
- {% include 'partials/submissions/submission_status.html' with submission=submission %}
-
{% include 'partials/submissions/submission_topics.html' with submission=submission %}
- <br/>
+
+ {% include 'partials/submissions/submission_status.html' with submission=submission %}
{% if submission.editorial_decision %}
- <h3 class="highlight">Editorial decision</h3>
- <p>For Journal {{ submission.editorial_decision.for_journal }}: {{ submission.editorial_decision.get_decision_display }}<br>(status: {{ submission.editorial_decision.get_status_display }})</p>
{% if is_author and submission.editorial_decision.status == submission.editorial_decision.AWAITING_PUBOFFER_ACCEPTANCE %}
<p>
<strong>We are awaiting your response to the publication offer.</strong>
diff --git a/submissions/views.py b/submissions/views.py
index 9a9a51243..453461c6d 100644
--- a/submissions/views.py
+++ b/submissions/views.py
@@ -246,6 +246,7 @@ def withdraw_manuscript(request, identifier_w_vn_nr):
- deprecates any Editorial Recommendation
- emailing authors, EIC (cc to EdAdmin)
- deprecates all outstanding refereeing requests (emailing referees)
+ - if an outstanding puboffer exists, mark it as turned down in EdDecision
- deletes production stream (if started, in case puboffer made)
- adds an event.
@@ -2153,11 +2154,13 @@ def fix_editorial_decision(request, identifier_w_vn_nr):
decision.status = EditorialDecision.AWAITING_PUBOFFER_ACCEPTANCE
decision.save()
submission.add_event_for_author(
- 'The Editorial Decision has been fixed: %s (with status: %s).' % (
- decision.get_decision_display(), decision.get_status_display()))
+ 'The Editorial Decision has been fixed for Journal %s: %s (with status: %s).' % (
+ str(decision.for_journal), decision.get_decision_display(),
+ decision.get_status_display()))
submission.add_event_for_eic(
- 'The Editorial Decision has been fixed: %s (with status: %s).' % (
- decision.get_decision_display(), decision.get_status_display()))
+ 'The Editorial Decision has been fixed for Journal %s: %s (with status: %s).' % (
+ str(decision.for_journal), decision.get_decision_display(),
+ decision.get_status_display()))
return redirect('submissions:pool')
else:
diff --git a/templates/email/authors/inform_authors_editorial_decision.html b/templates/email/authors/inform_authors_editorial_decision.html
index 6fdbfbc4c..c34184628 100644
--- a/templates/email/authors/inform_authors_editorial_decision.html
+++ b/templates/email/authors/inform_authors_editorial_decision.html
@@ -57,13 +57,17 @@
</p>
<p>
You can view more details at the Submission's page at
- <a href="{% url 'submissions:submission' identifier_w_vn_nr={{ identifier_w_vn_nr }}">{% url 'submissions:submission' identifier_w_vn_nr={{ identifier_w_vn_nr }}</a>.
+ <a href="https://scipost.org{{ decision.submission.get_absolute_url }}">https://scipost.org{{ decision.submission.get_absolute_url }}</a> .
Note that these details are viewable only by the registered authors of the submission.
</p>
<p>
This Submission Page has now been removed from general public view; if you wish,
you can email us and request to make it publicly visible again.
</p>
+ <p>
+ This completes the editorial procedure on our side, and you are now free to submit
+ your manuscript elsewhere.
+ </p>
{% endif %}
{% endif %}
{% if decision.remarks_for_authors %}
--
GitLab