diff --git a/scipost_django/SciPost_v1/settings/base.py b/scipost_django/SciPost_v1/settings/base.py
index f2177804aba33aa3b3cfe538d70792dd3163b075..3f8298b3f70ac2463e8cfc1d4c06cc3086334736 100644
--- a/scipost_django/SciPost_v1/settings/base.py
+++ b/scipost_django/SciPost_v1/settings/base.py
@@ -186,7 +186,7 @@ HAYSTACK_SIGNAL_PROCESSOR = "SciPost_v1.signalprocessors.SearchIndexingProcessor
SHELL_PLUS_POST_IMPORTS = (
("theses.factories", ("ThesisLinkFactory")),
("comments.factories", ("CommentFactory")),
- ("submissions.factories", ("SubmissionFactory", "EICassignedSubmissionFactory")),
+ ("submissions.factories", ("SubmissionFactory", "InRefereeingSubmissionFactory")),
(
"commentaries.factories",
(
diff --git a/scipost_django/comments/tests/test_views.py b/scipost_django/comments/tests/test_views.py
index b730a6218427c7973829e5eb637b521734e03960..f85c42701a675beec1d2f82f1af2c6e0efbfde07 100644
--- a/scipost_django/comments/tests/test_views.py
+++ b/scipost_django/comments/tests/test_views.py
@@ -9,7 +9,7 @@ from django.http import Http404
from scipost.factories import ContributorFactory
from theses.factories import ThesisLinkFactory
-from submissions.factories import EICassignedSubmissionFactory
+from submissions.factories import InRefereeingSubmissionFactory
from commentaries.factories import UnpublishedCommentaryFactory
from ..factories import CommentFactory
@@ -66,7 +66,7 @@ class TestNewComment(TestCase):
# AssertionError: 404 != 200 : Couldn't retrieve redirection page '/submissions/3963.08788v1/': response code was 404 (expected 200)
# def test_submitting_comment_on_submission_creates_comment_and_redirects(self):
# contributor = ContributorFactory()
- # submission = EICassignedSubmissionFactory()
+ # submission = InRefereeingSubmissionFactory()
# submission.open_for_commenting = True
# submission.save()
# valid_comment_data = model_form_data(CommentFactory, CommentForm)
@@ -130,7 +130,7 @@ class TestNewComment(TestCase):
self,
):
contributor = ContributorFactory()
- submission = EICassignedSubmissionFactory()
+ submission = InRefereeingSubmissionFactory()
submission.open_for_commenting = False
submission.save()
valid_comment_data = model_form_data(CommentFactory, CommentForm)
diff --git a/scipost_django/scipost/management/commands/populate_faker_data.py b/scipost_django/scipost/management/commands/populate_faker_data.py
index 05f25ad138d0da799bdc3dd7e665305e6416bbdf..4882a8dc391fcc31ceecbae41cefb931933cc427 100644
--- a/scipost_django/scipost/management/commands/populate_faker_data.py
+++ b/scipost_django/scipost/management/commands/populate_faker_data.py
@@ -28,7 +28,7 @@ class Command(BaseCommand):
# Submissions, reports and publications
submission_factories.SubmissionFactory.create_batch(20)
submission_factories.ScreeningSubmissionFactory.create_batch(20)
- submission_factories.EICassignedSubmissionFactory.create_batch(20)
+ submission_factories.InRefereeingSubmissionFactory.create_batch(20)
submission_factories.ResubmittedSubmissionFactory.create_batch(10)
submission_factories.ResubmissionFactory.create_batch(10)
submission_factories.PublishedSubmissionFactory.create_batch(20)
diff --git a/scipost_django/series/templates/series/collection_detail.html b/scipost_django/series/templates/series/collection_detail.html
index 67d5113bc4cdeaac39e27775a2a0b46890b3b26e..686f76992d01406094e248a344bc8e01081720ef 100644
--- a/scipost_django/series/templates/series/collection_detail.html
+++ b/scipost_django/series/templates/series/collection_detail.html
@@ -95,7 +95,7 @@
</div>
{% endif %}
- {% with active_submissions=collection.submissions.actively_refereeing %}
+ {% with active_submissions=collection.submissions.under_consideration %}
{% if active_submissions|length > 0 %}
<div class="row">
<div class="col-12">
@@ -111,7 +111,7 @@
<a href="{{ submission.get_absolute_url }}" target="_blank">{{ submission }}</a>
</li>
{% endfor %}
- {% for submission in active_submissions.actively_refereeing %}
+ {% for submission in active_submissions.in_refereeing %}
<li><strong class="text-warning">under refereeing:</strong>
<a href="{{ submission.get_absolute_url }}" target="_blank">{{ submission }}</a>
</li>
diff --git a/scipost_django/submissions/factories.py b/scipost_django/submissions/factories.py
index 0e2d86b97c8149b44f686ad802ada46a07a1bb48..4bcab8c590d219c1060c6f9258ab10efa0b2de94 100644
--- a/scipost_django/submissions/factories.py
+++ b/scipost_django/submissions/factories.py
@@ -127,12 +127,12 @@ class ScreeningSubmissionFactory(SubmissionFactory):
visible_pool = True
-class EICassignedSubmissionFactory(SubmissionFactory):
+class InRefereeingSubmissionFactory(SubmissionFactory):
"""
A Submission with an EIC assigned, visible in the pool and refereeing in process.
"""
- status = Submission.EIC_ASSIGNED
+ status = Submission.IN_REFEREEING
open_for_commenting = True
open_for_reporting = True
visible_public = True
@@ -170,7 +170,7 @@ class EICassignedSubmissionFactory(SubmissionFactory):
EICRecommendationFactory(submission=self)
-class ResubmittedSubmissionFactory(EICassignedSubmissionFactory):
+class ResubmittedSubmissionFactory(InRefereeingSubmissionFactory):
"""
A Submission that has a newer Submission version in the database
with a successive version number.
@@ -232,7 +232,7 @@ class ResubmittedSubmissionFactory(EICassignedSubmissionFactory):
CancelledRefereeInvitationFactory(submission=self)
-class ResubmissionFactory(EICassignedSubmissionFactory):
+class ResubmissionFactory(InRefereeingSubmissionFactory):
"""
This Submission is a newer version of a Submission which is
already known by the SciPost database.
@@ -288,7 +288,7 @@ class ResubmissionFactory(EICassignedSubmissionFactory):
pass
-class PublishedSubmissionFactory(EICassignedSubmissionFactory):
+class PublishedSubmissionFactory(InRefereeingSubmissionFactory):
status = Submission.PUBLISHED
open_for_commenting = False
open_for_reporting = False
diff --git a/scipost_django/submissions/forms.py b/scipost_django/submissions/forms.py
index 233f8a10bb5e9ba2cd53313a7f0b22916dc3abaa..0ee174d50288e75af36c98341e67a9d1642aac4f 100644
--- a/scipost_django/submissions/forms.py
+++ b/scipost_django/submissions/forms.py
@@ -160,7 +160,7 @@ class SubmissionSearchForm(forms.Form):
)
if self.reports_needed:
submissions = (
- submissions.actively_refereeing()
+ submissions.in_refereeing()
.open_for_reporting()
.reports_needed()
.order_by("submission_date")
@@ -221,7 +221,7 @@ class SubmissionPoolSearchForm(forms.Form):
"Refereeing",
(
(Submission.REFEREEING_IN_PREPARATION, "Refereeing in preparation (cycle choice needed)"),
- ("actively_refereeing", "In refereeing"),
+ ("in_refereeing", "In refereeing"),
("unvetted_reports", "... with unvetted Reports"),
("deadline_passed", "deadline passed, no recommendation yet"),
("refereeing_1", "Refereeing round ongoing for > 1 month"),
@@ -414,14 +414,14 @@ class SubmissionPoolSearchForm(forms.Form):
status=Submission.SCREENING,
submission_date__lt=timezone.now() - datetime.timedelta(days=28),
)
- elif status == "actively_refereeing":
- submissions = submissions.actively_refereeing()
+ elif status == "in_refereeing":
+ submissions = submissions.in_refereeing()
elif status == "unvetted_reports":
reports_to_vet = Report.objects.awaiting_vetting()
id_list = [r.submission.id for r in reports_to_vet.all()]
submissions = submissions.filter(id__in=id_list)
elif status == "deadline_passed":
- submissions = submissions.actively_refereeing().filter(
+ submissions = submissions.in_refereeing().filter(
reporting_deadline__lt=timezone.now(),
).exclude(eicrecommendations__isnull=False)
elif status == "refereeing_1":
@@ -1939,7 +1939,7 @@ class EditorialAssignmentForm(forms.ModelForm):
# Update related Submission.
Submission.objects.filter(id=self.submission.id).update(
refereeing_cycle=CYCLE_DEFAULT,
- status=Submission.EIC_ASSIGNED,
+ status=Submission.IN_REFEREEING,
editor_in_charge=self.request.user.contributor,
reporting_deadline=deadline,
open_for_reporting=True,
@@ -1958,7 +1958,7 @@ class EditorialAssignmentForm(forms.ModelForm):
)
Submission.objects.filter(id=self.submission.id).update(
refereeing_cycle=CYCLE_DIRECT_REC,
- status=Submission.EIC_ASSIGNED,
+ status=Submission.REFEREEING_CLOSED,
editor_in_charge=self.request.user.contributor,
reporting_deadline=timezone.now(),
open_for_reporting=False,
@@ -2665,7 +2665,7 @@ class RestartRefereeingForm(forms.Form):
def save(self):
if self.is_confirmed():
Submission.objects.filter(id=self.submission.id).update(
- status=Submission.EIC_ASSIGNED,
+ status=Submission.REFEREEING_IN_PREPARATION,
refereeing_cycle=CYCLE_UNDETERMINED,
acceptance_date=None,
latest_activity=timezone.now(),
diff --git a/scipost_django/submissions/management/commands/create_submissions.py b/scipost_django/submissions/management/commands/create_submissions.py
index 83c48d0976e7c09151c8619e09fbf3c5bfd7117e..055ec7d1219a7ea1f0e33de7ffddd5b81f6d9ac6 100644
--- a/scipost_django/submissions/management/commands/create_submissions.py
+++ b/scipost_django/submissions/management/commands/create_submissions.py
@@ -23,14 +23,14 @@ class Command(BaseCommand):
"--status",
choices=[
"screening",
- "assigned",
+ "in_refereeing",
"resubmitted",
"resubmission",
"published",
],
action="store",
dest="status",
- default="assigned",
+ default="in_refereeing",
help="Current status of the Submission",
)
@@ -38,11 +38,11 @@ class Command(BaseCommand):
if kwargs["number"]:
self.create_submissions(kwargs["number"], status=kwargs["status"])
- def create_submissions(self, n, status="assigned"):
+ def create_submissions(self, n, status="in_refereeing"):
if status == "screening":
factories.ScreeningSubmissionFactory.create_batch(n)
- elif status == "assigned":
- factories.EICassignedSubmissionFactory.create_batch(n)
+ elif status == "in_refereeing":
+ factories.InRefereeingSubmissionFactory.create_batch(n)
elif status == "resubmitted":
factories.ResubmittedSubmissionFactory.create_batch(n)
elif status == "resubmission":
diff --git a/scipost_django/submissions/managers/submission.py b/scipost_django/submissions/managers/submission.py
index 89550e66cca4d0fdb0255bcc0aa12eb8f6393617..25e20b81c3d31e9737ff0f8aff007784a206f94f 100644
--- a/scipost_django/submissions/managers/submission.py
+++ b/scipost_django/submissions/managers/submission.py
@@ -79,6 +79,9 @@ class SubmissionQuerySet(models.QuerySet):
#### Managers mixing statuses ####
+ def under_consideration(self):
+ return self.filter(status__in=self.model.UNDER_CONSIDERATION)
+
def accepted(self):
return self.filter(status__in=[
self.model.ACCEPTED_IN_TARGET,
@@ -172,17 +175,6 @@ class SubmissionQuerySet(models.QuerySet):
status__in=[self.model.INCOMING, self.model.SCREENING]
)
- def actively_refereeing(self):
- from ..models import EditorialDecision
-
- """Return submission currently in some point of the refereeing round."""
- return self.filter(status=self.model.EIC_ASSIGNED).exclude(
- models.Q(eicrecommendations__status=constants.DECISION_FIXED)
- & ~models.Q(
- editorialdecision__decision=EditorialDecision.FIXED_AND_ACCEPTED
- )
- )
-
def public(self):
"""Return all publicly available Submissions."""
return self.filter(visible_public=True)
diff --git a/scipost_django/submissions/models/submission.py b/scipost_django/submissions/models/submission.py
index 8f22145e838a575a66ffdd82790b16d2adf5202e..c851a8aa7304001c4f660bf6e308ed3038a34597 100644
--- a/scipost_django/submissions/models/submission.py
+++ b/scipost_django/submissions/models/submission.py
@@ -54,7 +54,6 @@ class Submission(models.Model):
PRESCREENING_FAILED = "prescreening_failed"
SCREENING = "screening"
SCREENING_FAILED = "screening_failed"
- EIC_ASSIGNED = "assigned" # remove
ASSIGNMENT_FAILED = "assignment_failed" # remove
REFEREEING_IN_PREPARATION = "refereeing_in_preparation"
IN_REFEREEING = "in_refereeing"
@@ -81,7 +80,6 @@ class Submission(models.Model):
(PRESCREENING_FAILED, "Pre-screening failed"), ## new
(SCREENING, "In screening"),
(SCREENING_FAILED, "Screening failed"), ## new
- (EIC_ASSIGNED, "Editor-in-charge assigned"), ## rename: IN_REFEREEING or others
(
ASSIGNMENT_FAILED, ## rename: SCREENING_FAILED
"Failed to assign Editor-in-charge; manuscript rejected",
@@ -115,7 +113,6 @@ class Submission(models.Model):
INCOMING,
PRESCREENING,
SCREENING,
- EIC_ASSIGNED, # remove
REFEREEING_IN_PREPARATION,
IN_REFEREEING,
REFEREEING_CLOSED,
@@ -499,17 +496,11 @@ class Submission(models.Model):
@property
def open_for_resubmission(self):
"""Check if Submission has fixed EICRecommendation asking for revision."""
- # CLEANUP 2022-11-27
- # if self.status != self.EIC_ASSIGNED:
- # return False
- # return self.eicrecommendations.fixed().asking_revision().exists()
return self.status == self.AWAITING_RESUBMISSION
@property
def reporting_deadline_has_passed(self):
"""Check if Submission has passed its reporting deadline."""
- if self.status != self.IN_REFEREEING:
- return False
return timezone.now() > self.reporting_deadline
@property
@@ -553,34 +544,6 @@ class Submission(models.Model):
def in_prescreening(self):
return self.status == self.INCOMING
- @property
- def in_refereeing_phase(self):
- """Check if Submission is in active refereeing phase.
-
- This is not meant for functional logic, rather for explanatory functionality to the user.
- """
- if self.eicrecommendations.active().exists():
- # Editorial Recommendation is formulated!
- return False
-
- if self.refereeing_cycle == CYCLE_DIRECT_REC:
- # There's no refereeing in this cycle at all.
- return False
-
- if self.referee_invitations.in_process().exists():
- # Some unfinished invitations exist still.
- return True
-
- if self.referee_invitations.awaiting_response().exists():
- # Some invitations have been sent out without a response.
- return True
-
- # Maybe: Check for unvetted Reports?
- return (
- self.status == self.EIC_ASSIGNED
- and self.is_open_for_reporting_within_deadline
- )
-
@property
def can_reset_reporting_deadline(self):
"""Check if reporting deadline is allowed to be reset."""
diff --git a/scipost_django/submissions/refereeing_cycles.py b/scipost_django/submissions/refereeing_cycles.py
index 86df64ae0c5aea468dd16a6a327f330f1e6b3aae..e60de4b9b873fcf203ca4d50c98bd72ca5fe6d15 100644
--- a/scipost_django/submissions/refereeing_cycles.py
+++ b/scipost_django/submissions/refereeing_cycles.py
@@ -293,7 +293,7 @@ class BaseCycle:
for report in reports_to_vet:
self.add_action(VettingAction(report))
- if self.can_invite_referees and self._submission.in_refereeing_phase:
+ if self.can_invite_referees and self._submission.in_stage_in_refereeing:
# Referees required in this cycle.
referee_invitations_count = (
self._submission.referee_invitations.non_cancelled().count()
@@ -361,17 +361,16 @@ class BaseCycle:
url=publication.get_absolute_url(),
doi=publication.doi_label,
))
- elif self._submission.status == self._submission.EIC_ASSIGNED:
- if not self._submission.in_refereeing_phase:
- if recommendation:
- texts.append("The refereeing round is closed.")
- else:
- texts.append(
- (
- "The refereeing round is closed "
- "and you have not formulated an Editorial Recommendation."
- )
+ elif self._submission.status == self._submission.REFEREEING_CLOSED:
+ if recommendation:
+ texts.append("The refereeing round is closed.")
+ else:
+ texts.append(
+ (
+ "The refereeing round is closed "
+ "and you have not formulated an Editorial Recommendation."
)
+ )
if not self.required_actions and not texts:
texts.append("No action required.")
diff --git a/scipost_django/submissions/templates/submissions/_submission_author_information.html b/scipost_django/submissions/templates/submissions/_submission_author_information.html
index 9cd4c5dc1adc25fdeb32ff120a7961a3f43f8cd3..3345a59102caedfc9fa604da7f0c25e61dc01f70 100644
--- a/scipost_django/submissions/templates/submissions/_submission_author_information.html
+++ b/scipost_django/submissions/templates/submissions/_submission_author_information.html
@@ -12,7 +12,7 @@
<p>
{% if not submission.editor_in_charge %}
No Editor-in-charge is assigned yet. The SciPost administration will inform you as soon as one is assigned.
- {% elif submission.in_refereeing_phase %}
+ {% elif submission.in_refereeing %}
The refereeing round has started. The current deadline is set to {{ submission.reporting_deadline|date:'j F Y' }}.
{% elif submission.eicrecommendations.active.first %}
An Editorial Recommendation has been formulated. See its status details below.
diff --git a/scipost_django/submissions/templates/submissions/pool/_referee_invitations.html b/scipost_django/submissions/templates/submissions/pool/_referee_invitations.html
index fbbf24fcb84245d8cc0248ac7914280e667ee32f..48f984f16d27283b87eeca49f9265c3dc3fa6832 100644
--- a/scipost_django/submissions/templates/submissions/pool/_referee_invitations.html
+++ b/scipost_django/submissions/templates/submissions/pool/_referee_invitations.html
@@ -133,7 +133,7 @@
</tr>
{% endfor %}
- {% if submission.in_refereeing_phase %}
+ {% if submission.in_refereeing %}
<tr class="bg-white">
<td class="text-center py-3" colspan="9">
{% if invitations %}
diff --git a/scipost_django/submissions/templates/submissions/pool/editorial_page.html b/scipost_django/submissions/templates/submissions/pool/editorial_page.html
index e82fc435154790fc4acb16699f61299c4e4454dc..a4a14d1d6f6d7bfb341e9ca37983177e1c4896e2 100644
--- a/scipost_django/submissions/templates/submissions/pool/editorial_page.html
+++ b/scipost_django/submissions/templates/submissions/pool/editorial_page.html
@@ -66,7 +66,7 @@
{% if not submission.eicrecommendations.all %}
No Editorial Recommendation has been formulated yet.
{% endif %}
- {% if submission.in_refereeing_phase %}
+ {% if submission.in_refereeing %}
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>.
@@ -209,7 +209,7 @@
{% endif %}
</span>
{% endif %}
- {% if submission.in_refereeing_phase %}
+ {% if submission.in_refereeing %}
{% if submission.reporting_deadline_has_passed %}
<div class="mt-2 p-2 border">
<span class="text-danger">{% include 'bi/exclamation-triangle-fill.html' %}</span>
@@ -322,7 +322,7 @@
<h3>All available actions</h3>
<ul class="mb-5">
{% if submission.refereeing_cycle != 'direct_rec' %}
- {% if submission.in_refereeing_phase %}
+ {% if submission.in_refereeing %}
<li>
{% if submission.referee_invitations.all %}
<a href="{% url 'submissions:select_referee' identifier_w_vn_nr=submission.preprint.identifier_w_vn_nr %}">Invite an additional referee</a>
@@ -430,7 +430,7 @@
{% if submission.eic_recommendation_required %}
<p>
- {% if submission.in_refereeing_phase %}
+ {% if submission.in_refereeing %}
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 here</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>.
diff --git a/scipost_django/submissions/tests/test_utils.py b/scipost_django/submissions/tests/test_utils.py
index 0564336cd1e85bcecf4dfd26c1a77910513ef925..7c09ff29623ac9e4d155bf57a54cea5a1010e826 100644
--- a/scipost_django/submissions/tests/test_utils.py
+++ b/scipost_django/submissions/tests/test_utils.py
@@ -102,7 +102,7 @@ from ..factories import ScreeningSubmissionFactory, ResubmissionFactory
# # Update status for default cycle to check new status
# self.submission.cycle.update_status()
-# self.assertEqual(self.submission.status, self.submission.EIC_ASSIGNED)
+# self.assertEqual(self.submission.status, self.submission.REFEREEING_IN_PREPARATION)
# NOTED AS BROKEN 2019-11-08
@@ -143,4 +143,4 @@ from ..factories import ScreeningSubmissionFactory, ResubmissionFactory
# # Update status for default cycle to check new status
# self.submission.cycle.update_status()
-# self.assertEqual(self.submission.status, self.submission.EIC_ASSIGNED)
+# self.assertEqual(self.submission.status, self.submission.REFEREEING_IN_PREPARATION)
diff --git a/scipost_django/submissions/tests/test_views.py b/scipost_django/submissions/tests/test_views.py
index b9157e239aa8c36b4c80130c1934f9a56cdaf62f..59623ea8a5525f0b7c4d93621e005e75339f9511 100644
--- a/scipost_django/submissions/tests/test_views.py
+++ b/scipost_django/submissions/tests/test_views.py
@@ -14,7 +14,7 @@ from scipost.factories import ContributorFactory
from ..constants import STATUS_DRAFT, STATUS_UNVETTED
from ..factories import (
ScreeningSubmissionFactory,
- EICassignedSubmissionFactory,
+ InRefereeingSubmissionFactory,
ResubmittedSubmissionFactory,
ResubmissionFactory,
PublishedSubmissionFactory,
@@ -212,7 +212,7 @@ class SubmissionDetailTest(BaseContributorTestCase):
def setUp(self):
super().setUp()
self.client = Client()
- self.submission = EICassignedSubmissionFactory()
+ self.submission = InRefereeingSubmissionFactory()
self.target = reverse(
"submissions:submission",
kwargs={"identifier_w_vn_nr": self.submission.preprint.identifier_w_vn_nr},
@@ -240,7 +240,7 @@ class SubmissionDetailTest(BaseContributorTestCase):
# visible_submission_ids = []
# visible_submission_ids.append(
# ResubmittedSubmissionFactory.create(preprint__identifier_w_vn_nr=arxiv_id_resubmission).id)
-# visible_submission_ids.append(EICassignedSubmissionFactory.create().id)
+# visible_submission_ids.append(InRefereeingSubmissionFactory.create().id)
# visible_submission_ids.append(PublishedSubmissionFactory.create().id)
# # Extra submission with multiple versions where the newest is publicly visible
@@ -248,7 +248,7 @@ class SubmissionDetailTest(BaseContributorTestCase):
# arxiv_id_resubmission = random_arxiv_identifier_without_version_number()
# ResubmittedSubmissionFactory.create(preprint__identifier_w_vn_nr=arxiv_id_resubmission)
# visible_submission_ids.append(
-# EICassignedSubmissionFactory.create(
+# InRefereeingSubmissionFactory.create(
# preprint__identifier_w_vn_nr=arxiv_id_resubmission,
# fill_arxiv_fields__preprint__vn_nr=2).id
# )
@@ -291,7 +291,7 @@ class SubmitReportTest(BaseContributorTestCase):
report_deadline = Faker().date_time_between(
start_date="now", end_date="+30d", tzinfo=pytz.utc
)
- self.submission = EICassignedSubmissionFactory(
+ self.submission = InRefereeingSubmissionFactory(
reporting_deadline=report_deadline
)
self.submission.authors.remove(self.current_contrib)
@@ -310,7 +310,7 @@ class SubmitReportTest(BaseContributorTestCase):
# '''Test response for view if no report is submitted yet.'''
# report_deadline = Faker().date_time_between(
# start_date="now", end_date="+30d", tzinfo=pytz.utc)
- # submission = EICassignedSubmissionFactory(reporting_deadline=report_deadline)
+ # submission = InRefereeingSubmissionFactory(reporting_deadline=report_deadline)
# submission.authors.remove(self.current_contrib)
# submission.authors_false_claims.add(self.current_contrib)
@@ -412,7 +412,7 @@ class SubmitReportTest(BaseContributorTestCase):
# def test_post_report_flagged_author(self):
# '''Test if report is `flagged` if author is flagged on related submission.'''
# report_deadline = Faker().date_time_between(start_date="now", end_date="+30d", tzinfo=None)
- # submission = EICassignedSubmissionFactory(reporting_deadline=report_deadline,
+ # submission = InRefereeingSubmissionFactory(reporting_deadline=report_deadline,
# referees_flagged=str(self.current_contrib))
# submission.authors.remove(self.current_contrib)
# submission.authors_false_claims.add(self.current_contrib)
diff --git a/scipost_django/submissions/views.py b/scipost_django/submissions/views.py
index 1f22645635264e42417fa08d8df1bb93999d6e53..6efc21b5e7cc6807186a70ca6e073bdcdbaff43e 100644
--- a/scipost_django/submissions/views.py
+++ b/scipost_django/submissions/views.py
@@ -1822,7 +1822,7 @@ def refereeing_overview(request):
"""List all Submissions undergoing active Refereeing."""
submissions_under_refereeing = (
Submission.objects.in_pool(request.user)
- .actively_refereeing()
+ .in_refereeing()
.order_by("submission_date")
)
context = {"submissions_under_refereeing": submissions_under_refereeing}