diff --git a/scipost/templates/scipost/personal_page.html b/scipost/templates/scipost/personal_page.html
index 0e9f37b82cf2420c147d8329978e11a0877838e9..dd9465f3554d6a3e6cc85074b99656e92e9ec438 100644
--- a/scipost/templates/scipost/personal_page.html
+++ b/scipost/templates/scipost/personal_page.html
@@ -392,17 +392,50 @@
</div>
</div>
- {% if unfinished_reports %}
+ {% if contributor.reports.in_draft.exists %}
<div class="row">
<div class="col-12">
<h3>Unfinished reports:</h3>
</div>
<div class="col-12">
<ul class="list-group list-group-flush">
- {% for report in unfinished_reports %}
+ {% for report in contributor.reports.in_draft.all %}
<li class="list-group-item">
<div class="w-100">{% include 'submissions/_submission_card_content.html' with submission=report.submission %}</div>
- <div class="px-2"><a class="px-1" href="{% url 'submissions:submit_report' report.submission.arxiv_identifier_w_vn_nr %}">Finish report</a></div>
+ <div class="px-2 mb-2"><a class="px-1" href="{% url 'submissions:submit_report' report.submission.arxiv_identifier_w_vn_nr %}">Finish report</a></div>
+ </li>
+ {% endfor %}
+ </ul>
+ </div>
+ </div>
+ {% endif %}
+
+ {% if contributor.reports.non_draft.exists %}
+ <div class="row">
+ <div class="col-12">
+ <h3>Finished reports:</h3>
+ </div>
+ <div class="col-12">
+ <ul class="list-group list-group-flush">
+ {% for report in contributor.reports.non_draft.all %}
+ <li class="list-group-item">
+ {% comment %}
+ Temporary: There is already a template for a "Report summary" in a parallel (unmerged) branch. Awaiting merge to use that template.
+ {% endcomment %}
+ <div class="card-block {% block cardblock_class_block %}{% endblock %}">
+ <h3>Report on Submission <a href="{{report.submission.get_absolute_url}}">{{report.submission.title}}</a></h3>
+ <table>
+ <tr>
+ <th style='min-width: 100px;'>Received:</th><td>{{ report.date_submitted|date:'Y-n-j' }}<td>
+ </tr>
+ <tr>
+ <th>Status:</th><td {% if report.status == 'vetted' %}class="text-success"{% elif report.status == 'unvetted' %}class="text-danger"{% endif %}>{{report.get_status_display}}</td>
+ </tr>
+ <tr>
+ <th>Anonymous:</th><td>{{report.anonymous|yesno:'Yes,No'}}</td>
+ </tr>
+ </table>
+ </div>
</li>
{% endfor %}
</ul>
diff --git a/scipost/views.py b/scipost/views.py
index 146b08f53e11cdf3b330c898eb4a6c7ed62a2094..d947c8d23f8649f5319cb3200b98982c2bfc4dfb 100644
--- a/scipost/views.py
+++ b/scipost/views.py
@@ -833,9 +833,8 @@ def personal_page(request):
referee=contributor, accepted=None, cancelled=False).count()
pending_ref_tasks = RefereeInvitation.objects.filter(
referee=contributor, accepted=True, fulfilled=False)
- unfinished_reports = Report.objects.in_draft().filter(author=contributor)
refereeing_tab_total_count = nr_ref_inv_to_consider + len(pending_ref_tasks)
- refereeing_tab_total_count += len(unfinished_reports)
+ refereeing_tab_total_count += Report.objects.in_draft().filter(author=contributor).count()
# Verify if there exist objects authored by this contributor,
# whose authorship hasn't been claimed yet
@@ -895,7 +894,6 @@ def personal_page(request):
'nr_ref_inv_to_consider': nr_ref_inv_to_consider,
'pending_ref_tasks': pending_ref_tasks,
'refereeing_tab_total_count': refereeing_tab_total_count,
- 'unfinished_reports': unfinished_reports,
'own_submissions': own_submissions,
'own_commentaries': own_commentaries,
'own_thesislinks': own_thesislinks,
diff --git a/submissions/constants.py b/submissions/constants.py
index 2b247ffa6a78a9c83e72934b3871e42c21ec3435..6fa524e42eafdb888dbf6aa8d1c8ff3f847a6149 100644
--- a/submissions/constants.py
+++ b/submissions/constants.py
@@ -124,6 +124,7 @@ ASSIGNMENT_REFUSAL_REASONS = (
)
REFEREE_QUALIFICATION = (
+ (None, '-'),
(4, 'expert in this subject'),
(3, 'very knowledgeable in this subject'),
(2, 'knowledgeable in this subject'),
@@ -132,6 +133,7 @@ REFEREE_QUALIFICATION = (
)
QUALITY_SPEC = (
+ (None, '-'),
(6, 'perfect'),
(5, 'excellent'),
(4, 'good'),
@@ -143,7 +145,7 @@ QUALITY_SPEC = (
# Only values between 0 and 100 are kept, anything outside those limits is discarded.
RANKING_CHOICES = (
- (101, '-'),
+ (None, '-'),
(100, 'top'),
(80, 'high'),
(60, 'good'),
@@ -153,6 +155,7 @@ RANKING_CHOICES = (
)
REPORT_REC = (
+ (None, '-'),
(1, 'Publish as Tier I (top 10% of papers in this journal, qualifies as Select) NOTE: SELECT NOT YET OPEN, STARTS EARLY 2017'),
(2, 'Publish as Tier II (top 50% of papers in this journal)'),
(3, 'Publish as Tier III (meets the criteria of this journal)'),
diff --git a/submissions/exceptions.py b/submissions/exceptions.py
index 0e8794a8cc841af0df2896138ce2ec0209ee0c7e..a6e26c2d6c946fec39d3b402415bd0110e63378a 100644
--- a/submissions/exceptions.py
+++ b/submissions/exceptions.py
@@ -1,4 +1,4 @@
-class CycleUpdateDeadlineError(Exception):
+class BaseCustomException(Exception):
def __init__(self, name):
self.name = name
@@ -6,9 +6,9 @@ class CycleUpdateDeadlineError(Exception):
return self.name
-class InvalidReportVettingValue(Exception):
- def __init__(self, name):
- self.name = name
+class CycleUpdateDeadlineError(BaseCustomException):
+ pass
- def __str__(self):
- return self.name
+
+class InvalidReportVettingValue(BaseCustomException):
+ pass
diff --git a/submissions/forms.py b/submissions/forms.py
index 7f2d39772f1086f15e09c39ef36facb7bda4cb61..8500b892e96a1fd3ae9eb414c0aa7e99111cbb32 100644
--- a/submissions/forms.py
+++ b/submissions/forms.py
@@ -420,6 +420,17 @@ class ReportForm(forms.ModelForm):
'recommendation', 'remarks_for_editors', 'anonymous']
def __init__(self, *args, **kwargs):
+ if kwargs.get('instance'):
+ if kwargs['instance'].is_followup_report:
+ # Prefill data from latest report in the series
+ latest_report = kwargs['instance'].latest_report_from_series()
+ kwargs.update({
+ 'initial': {
+ 'qualification': latest_report.qualification,
+ 'anonymous': latest_report.anonymous
+ }
+ })
+
super(ReportForm, self).__init__(*args, **kwargs)
self.fields['strengths'].widget.attrs.update({
'placeholder': ('Give a point-by-point '
@@ -440,7 +451,28 @@ class ReportForm(forms.ModelForm):
'cols': 100
})
- def save(self, submission, current_contributor):
+ # If the Report is not a followup: Explicitly assign more fields as being required!
+ if not self.instance.is_followup_report:
+ required_fields = [
+ 'strengths',
+ 'weaknesses',
+ 'requested_changes',
+ 'validity',
+ 'significance',
+ 'originality',
+ 'clarity',
+ 'formatting',
+ 'grammar'
+ ]
+ for field in required_fields:
+ self.fields[field].required = True
+
+ # Let user know the field is required!
+ for field in self.fields:
+ if self.fields[field].required:
+ self.fields[field].label += ' *'
+
+ def save(self, submission):
"""
Update meta data if ModelForm is submitted (non-draft).
Possibly overwrite the default status if user asks for saving as draft.
@@ -448,7 +480,6 @@ class ReportForm(forms.ModelForm):
report = super().save(commit=False)
report.submission = submission
- report.author = current_contributor
report.date_submitted = timezone.now()
# Save with right status asked by user
@@ -458,7 +489,7 @@ class ReportForm(forms.ModelForm):
report.status = STATUS_UNVETTED
# Update invitation and report meta data if exist
- invitation = submission.referee_invitations.filter(referee=current_contributor).first()
+ invitation = submission.referee_invitations.filter(referee=report.author).first()
if invitation:
invitation.fulfilled = True
invitation.save()
@@ -466,7 +497,7 @@ class ReportForm(forms.ModelForm):
# Check if report author if the report is being flagged on the submission
if submission.referees_flagged:
- if current_contributor.user.last_name in submission.referees_flagged:
+ if report.author.user.last_name in submission.referees_flagged:
report.flagged = True
report.save()
return report
diff --git a/submissions/managers.py b/submissions/managers.py
index 7e8a148b350b085842210c73263aba07e4e7832c..4af4e221c2c9c30bbc3a861bdf5b166c1538aa39 100644
--- a/submissions/managers.py
+++ b/submissions/managers.py
@@ -129,3 +129,6 @@ class ReportManager(models.Manager):
def in_draft(self):
return self.filter(status=STATUS_DRAFT)
+
+ def non_draft(self):
+ return self.exclude(status=STATUS_DRAFT)
diff --git a/submissions/migrations/0048_auto_20170721_0936.py b/submissions/migrations/0048_auto_20170721_0936.py
new file mode 100644
index 0000000000000000000000000000000000000000..657a049399d2aadca650ebbc94e78fbd0b70712d
--- /dev/null
+++ b/submissions/migrations/0048_auto_20170721_0936.py
@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.3 on 2017-07-21 07:36
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('submissions', '0047_submission_acceptance_date'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='report',
+ name='requested_changes',
+ field=models.TextField(blank=True, verbose_name='requested changes'),
+ ),
+ migrations.AlterField(
+ model_name='report',
+ name='strengths',
+ field=models.TextField(blank=True),
+ ),
+ migrations.AlterField(
+ model_name='report',
+ name='weaknesses',
+ field=models.TextField(blank=True),
+ ),
+ ]
diff --git a/submissions/migrations/0049_auto_20170721_1010.py b/submissions/migrations/0049_auto_20170721_1010.py
new file mode 100644
index 0000000000000000000000000000000000000000..4627f2592d5f4a8d77755911038deb9dc7fe64a1
--- /dev/null
+++ b/submissions/migrations/0049_auto_20170721_1010.py
@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.3 on 2017-07-21 08:10
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('submissions', '0048_auto_20170721_0936'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='report',
+ name='formatting',
+ field=models.SmallIntegerField(blank=True, choices=[(6, 'perfect'), (5, 'excellent'), (4, 'good'), (3, 'reasonable'), (2, 'acceptable'), (1, 'below threshold'), (0, 'mediocre')], null=True, verbose_name='Quality of paper formatting'),
+ ),
+ migrations.AlterField(
+ model_name='report',
+ name='grammar',
+ field=models.SmallIntegerField(blank=True, choices=[(6, 'perfect'), (5, 'excellent'), (4, 'good'), (3, 'reasonable'), (2, 'acceptable'), (1, 'below threshold'), (0, 'mediocre')], null=True, verbose_name='Quality of English grammar'),
+ ),
+ migrations.AlterField(
+ model_name='report',
+ name='qualification',
+ field=models.PositiveSmallIntegerField(choices=[(4, 'expert in this subject'), (3, 'very knowledgeable in this subject'), (2, 'knowledgeable in this subject'), (1, 'generally qualified'), (0, 'not qualified')], verbose_name='Qualification to referee this: I am'),
+ ),
+ migrations.AlterField(
+ model_name='report',
+ name='remarks_for_editors',
+ field=models.TextField(blank=True, verbose_name='optional remarks for the Editors only'),
+ ),
+ ]
diff --git a/submissions/migrations/0050_auto_20170721_1042.py b/submissions/migrations/0050_auto_20170721_1042.py
new file mode 100644
index 0000000000000000000000000000000000000000..f81add96676950e1daed51e7c308e02dc48f82d2
--- /dev/null
+++ b/submissions/migrations/0050_auto_20170721_1042.py
@@ -0,0 +1,68 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.3 on 2017-07-21 08:42
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+def report_101_to_none(apps, schema_editor):
+ Report = apps.get_model('submissions', 'Report')
+ for rep in Report.objects.all():
+ if rep.clarity == 101:
+ rep.clarity = None
+ if rep.originality == 101:
+ rep.originality = None
+ if rep.significance == 101:
+ rep.significance = None
+ if rep.validity == 101:
+ rep.validity = None
+ rep.save()
+ print('\nChanged all Report fields: {clarites,originality,significance,validity} with value'
+ ' `101` to `None`.')
+
+
+def report_none_to_101(apps, schema_editor):
+ Report = apps.get_model('submissions', 'Report')
+ for rep in Report.objects.all():
+ if not rep.clarity:
+ rep.clarity = 101
+ if not rep.originality:
+ rep.originality = 101
+ if not rep.significance:
+ rep.significance = 101
+ if not rep.validity:
+ rep.validity = 101
+ rep.save()
+ print('\nChanged all Report fields: {clarites,originality,significance,validity} with value'
+ ' `None` to `101`.')
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('submissions', '0049_auto_20170721_1010'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='report',
+ name='clarity',
+ field=models.PositiveSmallIntegerField(blank=True, choices=[(None, '-'), (100, 'top'), (80, 'high'), (60, 'good'), (40, 'ok'), (20, 'low'), (0, 'poor')], null=True),
+ ),
+ migrations.AlterField(
+ model_name='report',
+ name='originality',
+ field=models.PositiveSmallIntegerField(blank=True, choices=[(None, '-'), (100, 'top'), (80, 'high'), (60, 'good'), (40, 'ok'), (20, 'low'), (0, 'poor')], null=True),
+ ),
+ migrations.AlterField(
+ model_name='report',
+ name='significance',
+ field=models.PositiveSmallIntegerField(blank=True, choices=[(None, '-'), (100, 'top'), (80, 'high'), (60, 'good'), (40, 'ok'), (20, 'low'), (0, 'poor')], null=True),
+ ),
+ migrations.AlterField(
+ model_name='report',
+ name='validity',
+ field=models.PositiveSmallIntegerField(blank=True, choices=[(None, '-'), (100, 'top'), (80, 'high'), (60, 'good'), (40, 'ok'), (20, 'low'), (0, 'poor')], null=True),
+ ),
+ migrations.RunPython(report_101_to_none, report_none_to_101),
+ ]
diff --git a/submissions/migrations/0051_auto_20170721_1049.py b/submissions/migrations/0051_auto_20170721_1049.py
new file mode 100644
index 0000000000000000000000000000000000000000..5ccf06a410f6f585b3f2ce23faecf963d0a88af6
--- /dev/null
+++ b/submissions/migrations/0051_auto_20170721_1049.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.3 on 2017-07-21 08:49
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('submissions', '0050_auto_20170721_1042'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='report',
+ name='formatting',
+ field=models.SmallIntegerField(blank=True, choices=[(None, '-'), (6, 'perfect'), (5, 'excellent'), (4, 'good'), (3, 'reasonable'), (2, 'acceptable'), (1, 'below threshold'), (0, 'mediocre')], null=True, verbose_name='Quality of paper formatting'),
+ ),
+ migrations.AlterField(
+ model_name='report',
+ name='grammar',
+ field=models.SmallIntegerField(blank=True, choices=[(None, '-'), (6, 'perfect'), (5, 'excellent'), (4, 'good'), (3, 'reasonable'), (2, 'acceptable'), (1, 'below threshold'), (0, 'mediocre')], null=True, verbose_name='Quality of English grammar'),
+ ),
+ ]
diff --git a/submissions/migrations/0052_auto_20170721_1057.py b/submissions/migrations/0052_auto_20170721_1057.py
new file mode 100644
index 0000000000000000000000000000000000000000..c89df6fc0f4aba11de3118a756d79c46e47f29d5
--- /dev/null
+++ b/submissions/migrations/0052_auto_20170721_1057.py
@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.3 on 2017-07-21 08:57
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('submissions', '0051_auto_20170721_1049'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='eicrecommendation',
+ name='recommendation',
+ field=models.SmallIntegerField(choices=[(None, '-'), (1, 'Publish as Tier I (top 10% of papers in this journal, qualifies as Select) NOTE: SELECT NOT YET OPEN, STARTS EARLY 2017'), (2, 'Publish as Tier II (top 50% of papers in this journal)'), (3, 'Publish as Tier III (meets the criteria of this journal)'), (-1, 'Ask for minor revision'), (-2, 'Ask for major revision'), (-3, 'Reject')]),
+ ),
+ migrations.AlterField(
+ model_name='report',
+ name='qualification',
+ field=models.PositiveSmallIntegerField(choices=[(None, '-'), (4, 'expert in this subject'), (3, 'very knowledgeable in this subject'), (2, 'knowledgeable in this subject'), (1, 'generally qualified'), (0, 'not qualified')], verbose_name='Qualification to referee this: I am'),
+ ),
+ migrations.AlterField(
+ model_name='report',
+ name='recommendation',
+ field=models.SmallIntegerField(choices=[(None, '-'), (1, 'Publish as Tier I (top 10% of papers in this journal, qualifies as Select) NOTE: SELECT NOT YET OPEN, STARTS EARLY 2017'), (2, 'Publish as Tier II (top 50% of papers in this journal)'), (3, 'Publish as Tier III (meets the criteria of this journal)'), (-1, 'Ask for minor revision'), (-2, 'Ask for major revision'), (-3, 'Reject')]),
+ ),
+ ]
diff --git a/submissions/migrations/0053_auto_20170721_1100.py b/submissions/migrations/0053_auto_20170721_1100.py
new file mode 100644
index 0000000000000000000000000000000000000000..ebb3fc0bfb4327f4c5a8ed239a130468efd4eae1
--- /dev/null
+++ b/submissions/migrations/0053_auto_20170721_1100.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.3 on 2017-07-21 09:00
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('submissions', '0052_auto_20170721_1057'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='report',
+ name='author',
+ field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='reports', to='scipost.Contributor'),
+ ),
+ ]
diff --git a/submissions/models.py b/submissions/models.py
index 6aa62b53228b673f215516a6866c70a54952983f..544ae9554b24a66f9d0cf5b94a9bc2c4d287ea93 100644
--- a/submissions/models.py
+++ b/submissions/models.py
@@ -4,6 +4,7 @@ from django.utils import timezone
from django.db import models
from django.contrib.postgres.fields import JSONField
from django.urls import reverse
+from django.utils.functional import cached_property
from .constants import ASSIGNMENT_REFUSAL_REASONS, ASSIGNMENT_NULLBOOL,\
SUBMISSION_TYPE, ED_COMM_CHOICES, REFEREE_QUALIFICATION, QUALITY_SPEC,\
@@ -235,47 +236,87 @@ class RefereeInvitation(models.Model):
###########
class Report(models.Model):
- """ Both types of reports, invited or contributed. """
+ """
+ Both types of reports, invited or contributed.
+
+ This Report model acts as both a regular `Report` and a `FollowupReport`; A normal Report
+ should have all fields required, whereas a FollowupReport only has the `report` field as
+ a required field.
+
+ Important note!
+ Due to the construction of the two different types within a single model, it is important
+ to explicitly implement the perticular differences in for example the form used.
+ """
status = models.CharField(max_length=16, choices=REPORT_STATUSES, default=STATUS_UNVETTED)
- submission = models.ForeignKey('submissions.Submission', related_name='reports',
- on_delete=models.CASCADE)
+ submission = models.ForeignKey('submissions.Submission', on_delete=models.CASCADE)
vetted_by = models.ForeignKey('scipost.Contributor', related_name="report_vetted_by",
blank=True, null=True, on_delete=models.CASCADE)
+
# `invited' filled from RefereeInvitation objects at moment of report submission
invited = models.BooleanField(default=False)
+
# `flagged' if author of report has been flagged by submission authors (surname check only)
flagged = models.BooleanField(default=False)
date_submitted = models.DateTimeField('date submitted')
author = models.ForeignKey('scipost.Contributor', on_delete=models.CASCADE)
qualification = models.PositiveSmallIntegerField(
choices=REFEREE_QUALIFICATION,
- verbose_name="Qualification to referee this: I am ")
+ verbose_name="Qualification to referee this: I am")
+
# Text-based reporting
- strengths = models.TextField()
- weaknesses = models.TextField()
+ strengths = models.TextField(blank=True)
+ weaknesses = models.TextField(blank=True)
report = models.TextField()
- requested_changes = models.TextField(verbose_name="requested changes")
+ requested_changes = models.TextField(verbose_name="requested changes", blank=True)
+
# Qualities:
- validity = models.PositiveSmallIntegerField(choices=RANKING_CHOICES, default=101)
- significance = models.PositiveSmallIntegerField(choices=RANKING_CHOICES, default=101)
- originality = models.PositiveSmallIntegerField(choices=RANKING_CHOICES, default=101)
- clarity = models.PositiveSmallIntegerField(choices=RANKING_CHOICES, default=101)
- formatting = models.SmallIntegerField(choices=QUALITY_SPEC,
+ validity = models.PositiveSmallIntegerField(choices=RANKING_CHOICES,
+ null=True, blank=True)
+ significance = models.PositiveSmallIntegerField(choices=RANKING_CHOICES,
+ null=True, blank=True)
+ originality = models.PositiveSmallIntegerField(choices=RANKING_CHOICES,
+ null=True, blank=True)
+ clarity = models.PositiveSmallIntegerField(choices=RANKING_CHOICES,
+ null=True, blank=True)
+ formatting = models.SmallIntegerField(choices=QUALITY_SPEC, null=True, blank=True,
verbose_name="Quality of paper formatting")
- grammar = models.SmallIntegerField(choices=QUALITY_SPEC,
+ grammar = models.SmallIntegerField(choices=QUALITY_SPEC, null=True, blank=True,
verbose_name="Quality of English grammar")
recommendation = models.SmallIntegerField(choices=REPORT_REC)
- remarks_for_editors = models.TextField(default='', blank=True,
+ remarks_for_editors = models.TextField(blank=True,
verbose_name='optional remarks for the Editors only')
anonymous = models.BooleanField(default=True, verbose_name='Publish anonymously')
objects = ReportManager()
+ class Meta:
+ default_related_name = 'reports'
+ ordering = ['-date_submitted']
+
+
def __str__(self):
return (self.author.user.first_name + ' ' + self.author.user.last_name + ' on ' +
self.submission.title[:50] + ' by ' + self.submission.author_list[:50])
+ @cached_property
+ def is_followup_report(self):
+ """
+ Check if current Report is a `FollowupReport`. A Report is a `FollowupReport` if the
+ author of the report already has a vetted report in the series of the specific Submission.
+ """
+ return (self.author.reports.accepted()
+ .filter(submission__arxiv_identifier_wo_vn_nr=self.submission.arxiv_identifier_wo_vn_nr)
+ .exists())
+
+ def latest_report_from_series(self):
+ """
+ Get latest Report from the same author for the Submission series.
+ """
+ return (self.author.reports.accepted()
+ .filter(submission__arxiv_identifier_wo_vn_nr=self.submission.arxiv_identifier_wo_vn_nr)
+ .order_by('submission__arxiv_identifier_wo_vn_nr').last())
+
##########################
# EditorialCommunication #
diff --git a/submissions/templates/submissions/_single_public_report_without_comments.html b/submissions/templates/submissions/_single_public_report_without_comments.html
index bad492424de08ddb7c528cca2a7d70e0eba1e438..f39932745a139ece5d79a744868724e0bf1945f8 100644
--- a/submissions/templates/submissions/_single_public_report_without_comments.html
+++ b/submissions/templates/submissions/_single_public_report_without_comments.html
@@ -28,9 +28,10 @@
<div class="row">
<div class="col-12">
<h3>Remarks for editors</h3>
- <div class="pl-md-4">{{ report.remarks_for_editors }}</div>
+ <div class="pl-md-4">{{ report.remarks_for_editors|default:'-' }}</div>
</div>
</div>
+
<div class="row">
<div class="col-12">
<h3>Recommendation</h3>
diff --git a/submissions/templates/submissions/_single_report_content.html b/submissions/templates/submissions/_single_report_content.html
index 82e06f943f39743d148e56b154382759fe1b2fa8..3e1874d8a8f4d81b1b1550dfb0bca28d0b0ce4be 100644
--- a/submissions/templates/submissions/_single_report_content.html
+++ b/submissions/templates/submissions/_single_report_content.html
@@ -1,27 +1,36 @@
-<div class="row">
- <div class="col-12">
- <h3 class="highlight tight">Strengths</h3>
- <div class="pl-md-4">{{ report.strengths|linebreaks }}</div>
+{% if report.strengths %}
+ <div class="row">
+ <div class="col-12">
+ <h3 class="highlight tight">Strengths</h3>
+ <div class="pl-md-4">{{ report.strengths|linebreaks }}</div>
+ </div>
</div>
-</div>
-<div class="row">
- <div class="col-12">
- <h3 class="highlight tight">Weaknesses</h3>
- <div class="pl-md-4">{{ report.weaknesses|linebreaks }}</div>
+{% endif %}
+
+{% if report.weaknesses %}
+ <div class="row">
+ <div class="col-12">
+ <h3 class="highlight tight">Weaknesses</h3>
+ <div class="pl-md-4">{{ report.weaknesses|linebreaks }}</div>
+ </div>
</div>
-</div>
+{% endif %}
+
<div class="row">
<div class="col-12">
<h3 class="highlight tight">Report</h3>
<div class="pl-md-4">{{ report.report|linebreaks }}</div>
</div>
</div>
-<div class="row">
- <div class="col-12">
- <h3 class="highlight tight">Requested changes</h3>
- <div class="pl-md-4">
- <p>{{ report.requested_changes|linebreaks }}</p>
- {% include 'submissions/_single_report_ratings.html' with report=report %}
- </div>
- </div>
-</div>
+
+{% if report.requested_changes %}
+ <div class="row">
+ <div class="col-12">
+ <h3 class="highlight tight">Requested changes</h3>
+ <div class="pl-md-4">
+ <p>{{ report.requested_changes|linebreaksbr }}</p>
+ {% include 'submissions/_single_report_ratings.html' with report=report %}
+ </div>
+ </div>
+ </div>
+{% endif %}
diff --git a/submissions/templates/submissions/_submission_card_author_content.html b/submissions/templates/submissions/_submission_card_author_content.html
index 89a1ae41aa7b9982b41dcb8bf59095a0ee47da88..1dabd69564b13275a5cc7742cbf8f826e3baeb2f 100644
--- a/submissions/templates/submissions/_submission_card_author_content.html
+++ b/submissions/templates/submissions/_submission_card_author_content.html
@@ -8,8 +8,10 @@
<p class="card-text">Status: {{submission.get_status_display}}</p>
{% if current_user and current_user.contributor == submission.submitted_by %}
- <p>
- <a href="{% url 'submissions:communication' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr comtype='AtoE' %}">Write to the Editor-in-charge</a>
+ <p class="card-text">
+ {% if submission.editor_in_charge %}
+ <a href="{% url 'submissions:communication' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr comtype='AtoE' %}">Write to the Editor-in-charge</a>
+ {% endif %}
{% if submission.status == 'revision_requested' %}
· <a href="{% url 'submissions:prefill_using_identifier' %}?identifier={{submission.arxiv_identifier_wo_vn_nr}}">Resubmit this manuscript</a>
{% endif %}
diff --git a/submissions/templates/submissions/submit_report.html b/submissions/templates/submissions/submit_report.html
index 63f80e447b69a04de026d1a51db389b58df83e29..fb4029c449a0df7ba6ebd109247bdb01de5e6255 100644
--- a/submissions/templates/submissions/submit_report.html
+++ b/submissions/templates/submissions/submit_report.html
@@ -81,13 +81,20 @@
<div class="col-12">
<div class="card card-grey">
<div class="card-block">
- <h1>Your report:</h1>
- <p class="mb-0">A preview of text areas will appear below as you type (you can use LaTeX \$...\$ for in-text equations or \ [ ... \ ] for on-line equations).</p>
+ <h1>Your {% if form.instance.is_followup_report %}followup {% endif %}report:</h1>
+ <p>A preview of text areas will appear below as you type (you can use LaTeX \$...\$ for in-text equations or \ [ ... \ ] for on-line equations).</p>
+ <p class="mb-0">Any fields with an asterisk (*) are required.</p>
+ {% if form.instance.is_followup_report %}
+ <p class="mb-0">
+ Because you have already submitted a Report for this Submission series, not all fields are required.
+ </p>
+ {% endif %}
</div>
</div>
<form action="{% url 'submissions:submit_report' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr %}" method="post">
{% csrf_token %}
{{ form|bootstrap:'3,9' }}
+ <p>Any fields with an asterisk (*) are required.</p>
<input class="btn btn-primary" type="submit" name="save_submit" value="Submit your report"/>
<input class="btn btn-secondary ml-2" type="submit" name="save_draft" value="Save your report as draft"/>
<div class="my-4">
diff --git a/submissions/utils.py b/submissions/utils.py
index 908f7f35c9a12bfd2a592b2a712b31952f468bce..385dbfc3402e25ff730686360b4f49f6561e8428 100644
--- a/submissions/utils.py
+++ b/submissions/utils.py
@@ -126,7 +126,6 @@ class BaseSubmissionCycle:
self.submission.reporting_deadline = deadline
self.submission.save()
-
def get_required_actions(self):
'''Return list of the submission its required actions'''
if not self.updated_action:
diff --git a/submissions/views.py b/submissions/views.py
index dbe926c6d43fff757dc1943d7400f2fe395de3c6..67d59bfbad547235621eba50e6cebde2a050cf75 100644
--- a/submissions/views.py
+++ b/submissions/views.py
@@ -1032,6 +1032,10 @@ def submit_report(request, arxiv_identifier_w_vn_nr):
errormessage = ('The system flagged you as a potential author of this Submission. '
'Please go to your personal page under the Submissions tab'
' to clarify this.')
+ # if submission.reports.non_draft().filter(author=current_contributor).exists():
+ # errormessage = ('You have already submitted a Report for this Submission. You cannot'
+ # ' submit an additional Report.')
+
if errormessage:
messages.warning(request, errormessage)
return redirect(reverse('scipost:personal_page'))
@@ -1040,12 +1044,12 @@ def submit_report(request, arxiv_identifier_w_vn_nr):
try:
report_in_draft = submission.reports.in_draft().get(author=current_contributor)
except Report.DoesNotExist:
- report_in_draft = None
+ report_in_draft = Report(author=current_contributor, submission=submission)
form = ReportForm(request.POST or None, instance=report_in_draft)
# Check if data sent is valid
if form.is_valid():
- newreport = form.save(submission, current_contributor)
+ newreport = form.save(submission)
if newreport.status == STATUS_DRAFT:
messages.success(request, ('Your Report has been saved. '
'You may carry on working on it,'
@@ -1069,16 +1073,17 @@ def submit_report(request, arxiv_identifier_w_vn_nr):
@permission_required('scipost.can_take_charge_of_submissions', raise_exception=True)
def vet_submitted_reports(request):
"""
- Reports with status `unvetted` will be shown one-by-one. A user may only
+ Reports with status `unvetted` will be shown one-by-one (oldest first). A user may only
vet reports of submissions he/she is EIC of.
After vetting an email is sent to the report author, bcc EIC. If report
has not been refused, the submission author is also mailed.
"""
- contributor = Contributor.objects.get(user=request.user)
+ contributor = request.user.contributor
report_to_vet = (Report.objects.awaiting_vetting()
.select_related('submission')
- .filter(submission__editor_in_charge=contributor).first())
+ .filter(submission__editor_in_charge=contributor)
+ .order_by('date_submitted').first())
form = VetReportForm(request.POST or None, initial={'report': report_to_vet})
if form.is_valid():