diff --git a/submissions/models.py b/submissions/models.py index d322603d05fbd16a1dd2b9e39a1f2fb2282590aa..8b2f21ef33d4a28af2dbff7bac6b30cd99a96e1b 100644 --- a/submissions/models.py +++ b/submissions/models.py @@ -192,6 +192,15 @@ class Submission(models.Model): return Submission.objects.filter( arxiv_identifier_wo_vn_nr=self.arxiv_identifier_wo_vn_nr).first().submission_date + @cached_property + def thread(self): + """ + Return all versions of the Submission with that arxiv id. + """ + return Submission.objects.public().filter( + arxiv_identifier_wo_vn_nr=self.arxiv_identifier_wo_vn_nr + ).order_by('-arxiv_vn_nr') + @cached_property def other_versions(self): """ diff --git a/submissions/templates/partials/submissions/table_of_contents.html b/submissions/templates/partials/submissions/table_of_contents.html new file mode 100644 index 0000000000000000000000000000000000000000..f1e1751347b977c365c5f4e47d4d3868620591e0 --- /dev/null +++ b/submissions/templates/partials/submissions/table_of_contents.html @@ -0,0 +1,31 @@ +<div class="card border-secondary"> + <div class="card-body"> + <h3>Table of Contents</h3> + {# <p class="card-text">{{ submission.title }}</p> #} + </div> + <ul class="toc list-group list-group-flush"> + {% for sibling in submission.thread %} + <li class="list-group-item"><div class="card-body pb-1"> + <a class="pubtitleli" href="{{ sibling.get_absolute_url }}">Version {{ sibling.arxiv_vn_nr }}</a> + <span class="version-suffix"> + {% if sibling.is_current %} + (current version) + {% else %} + (deprecated version) + {% endif %} + </span> + <p class="mx-1 mt-1 mb-0">Submitted on {{ sibling.submission_date }}</p> + <ul class=""> + {% for report in sibling.reports.accepted %} + <li class="py-1"> + <a href="{{ report.get_absolute_url }}" class="pubtitleli">Report {{ report.report_nr }}</a> + <div class="mt-1 ml-1">Submitted on {{ report.date_submitted }} by {% if not report.anonymous %}{{ report.author.get_title_display }} {{ report.author.user.last_name }}{% else %}<em>Anonymous</em>{% endif %}</div> + </li> + {% empty %} + <li><em>No Reports have been submitted yet.</em></li> + {% endfor %} + </ul> + </div></li> + {% endfor %} + </ul> +</div> diff --git a/submissions/templates/submissions/submission_detail.html b/submissions/templates/submissions/submission_detail.html index dfd390661a321543e2c64ad961c8f6b529e7063c..4ef69e1add595c045ceef5812f20185643fc9713 100644 --- a/submissions/templates/submissions/submission_detail.html +++ b/submissions/templates/submissions/submission_detail.html @@ -20,42 +20,44 @@ {% block content %} <div class="row"> - <div class="col"> + <div class="col-md-8"> <h2>SciPost Submission Page</h2> <h1 class="text-primary">{{submission.title}}</h1> <h3 class="mb-3">by {{submission.author_list}}</h3> - <div class="pl-2"> - {% if submission.publication %} - <h3>- Published as <a href="{{submission.publication.get_absolute_url}}">{{submission.publication.in_issue.in_volume.in_journal.get_abbreviation_citation}} <strong>{{submission.publication.in_issue.in_volume.number}}</strong>, {{submission.publication.get_paper_nr}} ({{submission.publication.publication_date|date:'Y'}})</a></h3> - {% endif %} + <div class="pl-2"> + {% if submission.publication %} + <h3>- Published as <a href="{{submission.publication.get_absolute_url}}">{{submission.publication.in_issue.in_volume.in_journal.get_abbreviation_citation}} <strong>{{submission.publication.in_issue.in_volume.number}}</strong>, {{submission.publication.get_paper_nr}} ({{submission.publication.publication_date|date:'Y'}})</a></h3> + {% endif %} - {% if submission.editor_in_charge and request.user.contributor == submission.editor_in_charge %} - <h3>- You are the Editor-in-charge, go to the <a href="{% url 'submissions:editorial_page' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr %}">Editorial Page</a> to take editorial actions</h3> - {% endif %} + {% if submission.editor_in_charge and request.user.contributor == submission.editor_in_charge %} + <h3>- You are the Editor-in-charge, go to the <a href="{% url 'submissions:editorial_page' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr %}">Editorial Page</a> to take editorial actions</h3> + {% endif %} - {% if unfinished_report_for_user %} - <h3 class="mt-0">- <span class="circle text-danger border-danger">!</span> You have an unfinished report for this submission, <a href="{% url 'submissions:submit_report' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr %}">finish your report here.</a></h3> - {% endif %} + {% if unfinished_report_for_user %} + <h3 class="mt-0">- <span class="circle text-danger border-danger">!</span> You have an unfinished report for this submission, <a href="{% url 'submissions:submit_report' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr %}">finish your report here.</a></h3> + {% endif %} - {% if submission.other_versions or not submission.is_current %} - <ul class="mt-3 mb-1 list-unstyled pl-4"> - {% if not submission.is_current %} - <li><h3 class="text-danger">This is not the current version.</h3></li> - {% endif %} + {% comment %} + {% if submission.other_versions or not submission.is_current %} + <ul class="mt-3 mb-1 list-unstyled pl-4"> + {% if not submission.is_current %} + <li><h3 class="text-danger">This is not the current version.</h3></li> + {% endif %} - {% if submission.other_versions %} - <li>Other versions of this Submission (with Reports) exist:</li> - <ul class="list-unstyled"> - {% for vn in submission.other_versions %} - <li>{% include 'submissions/_submission_version.html' with submission=vn %}</li> - {% endfor %} + {% if submission.other_versions %} + <li>Other versions of this Submission (with Reports) exist:</li> + <ul class="list-unstyled"> + {% for vn in submission.other_versions %} + <li>{% include 'submissions/_submission_version.html' with submission=vn %}</li> + {% endfor %} + </ul> + {% endif %} </ul> {% endif %} - </ul> - {% endif %} - </div> + {% endcomment %} + </div> <h3>Submission summary</h3> {% include 'submissions/_submission_summary.html' with submission=submission hide_title=1 %} @@ -77,13 +79,14 @@ {% endif %} </div> - {% if invitations %} - <div class="col-md-4"> - {% for invitation in invitations %} - {% include 'partials/submissions/refereeing_status_card.html' with invitation=invitation %} - {% endfor %} - </div> - {% endif %} + <div class="col-md-4"> + {% for invitation in invitations %} + {% include 'partials/submissions/refereeing_status_card.html' with invitation=invitation %} + {% endfor %} + + {% include 'partials/submissions/table_of_contents.html' with submission=submission %} + </div> + </div> {% if is_author or user|is_in_group:'Editorial College' or user|is_in_group:'Editorial Administrators' %}