diff --git a/submissions/models.py b/submissions/models.py index 3076e2fa28091392f498cf1da8da6c6b3ecbea15..59a3cdf275ace7e3115a292a8198dde23cb10192 100644 --- a/submissions/models.py +++ b/submissions/models.py @@ -265,7 +265,7 @@ class Submission(models.Model): def in_refereeing_phase(self): """Check if Submission is in active refereeing phase. - This is not meant for functional logic, rather for explanatory logic for the user. + This is not meant for functional logic, rather for explanatory functionality to the user. """ if self.eicrecommendations.active().exists(): # Editorial Recommendation is formulated! diff --git a/submissions/refereeing_cycles.py b/submissions/refereeing_cycles.py index 1ac5951e9fde294db1c9890ace9ffb4c3ab7fd8c..9feeb5fdef1dc101689bdc556026b0fcd1c81692 100644 --- a/submissions/refereeing_cycles.py +++ b/submissions/refereeing_cycles.py @@ -15,6 +15,7 @@ class BaseAction: """An item in the RequiredActionsDict dictionary for the Submission refereeing cycle.""" txt = '' url = '#' + url2 = '#' submission = None def __init__(self, object=None, **kwargs): @@ -47,7 +48,8 @@ class BaseAction: days=timedelta.days, deadline=deadline.days, deadline_min=-deadline.days, - url=self.url) + url=self.url, + url2=self.url2) def as_text(self): return ' '.join([e for e in self]) @@ -106,7 +108,7 @@ class NoEICRecommendationAction(BaseAction): txt = ( 'The refereeing deadline has passed. Please either ' '<a href="{url}">extend it</a>, ' - 'or formulate your Editorial Recommendation.') + 'or <a href="{url2}">formulate your Editorial Recommendation</a>.') return txt @property @@ -114,6 +116,11 @@ class NoEICRecommendationAction(BaseAction): return '{}#reporting-deadline'.format(reverse( 'submissions:editorial_page', args=(self.submission.preprint.identifier_w_vn_nr,))) + @property + def url2(self): + return reverse( + 'submissions:eic_recommendation',args=(self.submission.preprint.identifier_w_vn_nr,)) + class NeedRefereesAction(BaseAction): def __init__(self, object=None, **kwargs): diff --git a/submissions/templates/submissions/pool/editorial_page.html b/submissions/templates/submissions/pool/editorial_page.html index 2cf319e62264cc7f28b170aadb63f94064265394..c97ab2c5f68149e5431a49024bff7eeb52d3bf90 100644 --- a/submissions/templates/submissions/pool/editorial_page.html +++ b/submissions/templates/submissions/pool/editorial_page.html @@ -56,17 +56,20 @@ <h3 id="editorial-recommendation">Editorial Recommendation</h3> {% for recommendation in submission.eicrecommendations.all %} {% include 'partials/submissions/recommendation_fellow_content.html' with recommendation=recommendation %} - {% empty %} - <p>No Editorial Recommendation has been formulated yet.</p> {% endfor %} {% if submission.eic_recommendation_required %} <div class="mb-4"> - <a href="{% url 'submissions:eic_recommendation' identifier_w_vn_nr=submission.preprint.identifier_w_vn_nr %}">Formulate an Editorial Recommendation</a>. - <br> - If you recommend revisions, this will be communicated directly to the Authors, who will be asked to resubmit. - <br> - If you recommend acceptance or rejection, this will be put to the Editorial College for ratification. + {% if not submission.eicrecommendations.all %} + No Editorial Recommendation has been formulated yet. + {% endif %} + {% if submission.in_refereeing_phase %} + Refereeing is still in progress, you may <a href="{% url 'submissions:eic_recommendation' identifier_w_vn_nr=submission.preprint.identifier_w_vn_nr %}">formulate an Editorial Recommendation</a> when the refereeing round is closed. + {% elif not submission.reports.accepted %} + Please make sure you have at least one vetted Report before you <a href="{% url 'submissions:eic_recommendation' identifier_w_vn_nr=submission.preprint.identifier_w_vn_nr %}">formulate an Editorial Recommendation</a>. + {% else %} + When refereeing has finished, you may <a href="{% url 'submissions:eic_recommendation' identifier_w_vn_nr=submission.preprint.identifier_w_vn_nr %}">formulate an Editorial Recommendation here</a>. + {% endif %} </div> {% endif %} </div> @@ -259,6 +262,8 @@ </div> {% endif %} {% endif %} + + <strong>TODO: CHECK: Does this *ALWAYS* show when in direct-eic refereeing cycle??!!!!</strong> {% if submission.reporting_deadline_has_passed and submission.eic_recommendation_required %} <div class="px-3 py-2 my-1 border"> <a href="{% url 'submissions:eic_recommendation' identifier_w_vn_nr=submission.preprint.identifier_w_vn_nr %}">Formulate an Editorial Recommendation</a>.