From 7795b60813800ed34636f2d71e39ce7e75ddb740 Mon Sep 17 00:00:00 2001
From: Jorran de Wit <jorrandewit@outlook.com>
Date: Mon, 24 Jul 2017 18:37:37 +0200
Subject: [PATCH] First Submission event case
---
.../submissions/_submission_refereeing_status.html | 2 +-
.../templates/submissions/submission_detail.html | 4 ++--
.../submissions/submission_event_list.html | 13 +++++++++++++
submissions/views.py | 11 +++--------
4 files changed, 19 insertions(+), 11 deletions(-)
create mode 100644 submissions/templates/submissions/submission_event_list.html
diff --git a/submissions/templates/submissions/_submission_refereeing_status.html b/submissions/templates/submissions/_submission_refereeing_status.html
index 50066b96f..5d1ea7b1d 100644
--- a/submissions/templates/submissions/_submission_refereeing_status.html
+++ b/submissions/templates/submissions/_submission_refereeing_status.html
@@ -1,6 +1,6 @@
{% if submission.refereeing_cycle != 'direct_rec' %}
<div class="card-block">
<p class="card-text">Nr referees invited: {{submission.referee_invitations.count}} <span>[{{submission.count_accepted_invitations}} acccepted / {{submission.count_declined_invitations}} declined / {{submission.count_pending_invitations}} response pending]</span></p>
- <p class="card-text">Nr reports obtained: {{submission.count_obtained_reports}} [{{submission.count_invited_reports}} invited / {{submission.count_contrib_reports}} contributed], nr refused: {{submission.count_refused_reports}}, nr awaiting vetting: {{submission.count_awaiting_vetting}}</p>
+ <p class="card-text">Nr reports obtained: {{submission.count_obtained_reports}} [{{submission.count_invited_reports}} invited / {{submission.count_contrib_reports}} contributed], nr refused: {{submission.reports.rejected.count}}, nr awaiting vetting: {{submission.reports.awaiting_vetting.count}}</p>
</div>
{% endif %}
diff --git a/submissions/templates/submissions/submission_detail.html b/submissions/templates/submissions/submission_detail.html
index f255cf191..2bdfae71d 100644
--- a/submissions/templates/submissions/submission_detail.html
+++ b/submissions/templates/submissions/submission_detail.html
@@ -50,10 +50,10 @@
</div>
</div>
- {% if other_versions %}
+ {% if submission.other_versions %}
<h3>Other versions of this Submission (with Reports) exist:</h3>
<div class="pl-4">
- {% for vn in other_versions %}
+ {% for vn in submission.other_versions %}
{% include 'submissions/_submission_version.html' with submission=vn %}
{% endfor %}
</div>
diff --git a/submissions/templates/submissions/submission_event_list.html b/submissions/templates/submissions/submission_event_list.html
new file mode 100644
index 000000000..539fc70c2
--- /dev/null
+++ b/submissions/templates/submissions/submission_event_list.html
@@ -0,0 +1,13 @@
+<div class="row">
+ <div class="col-12">
+ <ul class="list-group list-group-flush">
+ {% for event in events %}
+ <li class="list-group-item">
+ {{event}}
+ </li>
+ {% empty %}
+ <li class="list-group-item">There have been no events for this Submission.</li>
+ {% endfor %}
+ </ul>
+ </div>
+</div>
diff --git a/submissions/views.py b/submissions/views.py
index 1036455a0..7e1d6f911 100644
--- a/submissions/views.py
+++ b/submissions/views.py
@@ -63,6 +63,9 @@ class RequestSubmission(CreateView):
@transaction.atomic
def form_valid(self, form):
submission = form.save()
+ submission.add_general_event('The manuscript has been submitted to %s.'
+ % submission.submitted_to_journal)
+
text = ('<h3>Thank you for your Submission to SciPost</h3>'
'Your Submission will soon be handled by an Editor.')
messages.success(self.request, text)
@@ -186,9 +189,6 @@ def submission_detail(request, arxiv_identifier_w_vn_nr):
'Editorial College']).exists()
and not is_author):
raise Http404
- other_versions = Submission.objects.filter(
- arxiv_identifier_wo_vn_nr=submission.arxiv_identifier_wo_vn_nr
- ).exclude(pk=submission.id)
form = CommentForm()
@@ -206,7 +206,6 @@ def submission_detail(request, arxiv_identifier_w_vn_nr):
recommendation = None
context = {'submission': submission,
- 'other_versions': other_versions,
'recommendation': recommendation,
'comments': comments,
'invited_reports': invited_reports,
@@ -526,13 +525,9 @@ def assignments(request):
def editorial_page(request, arxiv_identifier_w_vn_nr):
submission = get_object_or_404(Submission.objects.filter_editorial_page(request.user),
arxiv_identifier_w_vn_nr=arxiv_identifier_w_vn_nr)
- other_versions = (Submission.objects
- .filter(arxiv_identifier_wo_vn_nr=submission.arxiv_identifier_wo_vn_nr)
- .exclude(pk=submission.id))
context = {
'submission': submission,
- 'other_versions': other_versions,
'set_deadline_form': SetRefereeingDeadlineForm(),
'cycle_choice_form': SubmissionCycleChoiceForm(instance=submission),
}
--
GitLab