From bbbe172a4409718d36db49868bf15f26107ff943 Mon Sep 17 00:00:00 2001
From: Jorran de Wit <jorrandewit@outlook.com>
Date: Thu, 26 Apr 2018 10:26:00 +0200
Subject: [PATCH] Step 2: Statuses settled
---
.../migrations/0028_merge_20180426_1023.py | 16 ++++++++++++
submissions/constants.py | 8 +++---
.../migrations/0017_auto_20180426_1018.py | 26 +++++++++++++++++++
.../migrations/0018_auto_20180426_1023.py | 20 ++++++++++++++
4 files changed, 66 insertions(+), 4 deletions(-)
create mode 100644 journals/migrations/0028_merge_20180426_1023.py
create mode 100644 submissions/migrations/0017_auto_20180426_1018.py
create mode 100644 submissions/migrations/0018_auto_20180426_1023.py
diff --git a/journals/migrations/0028_merge_20180426_1023.py b/journals/migrations/0028_merge_20180426_1023.py
new file mode 100644
index 000000000..3d78290e6
--- /dev/null
+++ b/journals/migrations/0028_merge_20180426_1023.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2018-04-26 08:23
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('journals', '0027_auto_20180414_1627'),
+ ('journals', '0027_auto_20180414_2053'),
+ ]
+
+ operations = [
+ ]
diff --git a/submissions/constants.py b/submissions/constants.py
index 1bdf2153d..86776c1e9 100644
--- a/submissions/constants.py
+++ b/submissions/constants.py
@@ -9,7 +9,7 @@ STATUS_UNASSIGNED = 'unassigned'
STATUS_ASSIGNMENT_FAILED = 'assignment_failed'
STATUS_RESUBMISSION_INCOMING = 'resubmitted_incoming'
STATUS_REVISION_REQUESTED = 'revision_requested'
-STATUS_EIC_ASSIGNED = 'EICassigned'
+STATUS_EIC_ASSIGNED = 'assigned'
STATUS_AWAITING_ED_REC = 'awaiting_ed_rec'
STATUS_REVIEW_CLOSED = 'review_closed'
STATUS_ACCEPTED = 'accepted'
@@ -30,10 +30,10 @@ STATUS_EIC_REC_FORMULATED = 'recommendation_formulated'
# All possible Submission statuses
SUBMISSION_STATUS = (
- (STATUS_NEW_INCOMING, 'Unassigned, undergoing pre-screening'),
+ (STATUS_NEW_INCOMING, 'Submission incoming, undergoing pre-screening'),
+ (STATUS_UNASSIGNED, 'Unassigned, awaiting editor assignment'),
+ (STATUS_EIC_ASSIGNED, 'Editor-in-charge assigned, manuscript under review'),
(STATUS_ASSIGNMENT_FAILED, 'Failed to assign Editor-in-charge; manuscript rejected'),
- (STATUS_EIC_REC_FORMULATED, 'Editorial Recommendation formulated'),
- (STATUS_AWAITING_ED_REC, 'Awaiting Editorial Recommendation'),
(STATUS_RESUBMITTED, 'Has been resubmitted'),
(STATUS_ACCEPTED, 'Publication decision taken: accept'),
(STATUS_REJECTED, 'Publication decision taken: reject'),
diff --git a/submissions/migrations/0017_auto_20180426_1018.py b/submissions/migrations/0017_auto_20180426_1018.py
new file mode 100644
index 000000000..ccc51f2b1
--- /dev/null
+++ b/submissions/migrations/0017_auto_20180426_1018.py
@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2018-04-26 08:18
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+def update_submission_statuses(apps, schema_editor):
+ """Update Submission incoming status to unassigned."""
+ Submission = apps.get_model('submissions', 'Submission')
+
+ # Update Submission statuses
+ Submission.objects.filter(status='unassigned_incoming').update(status='unassigned')
+ Submission.objects.filter(status='recommendation_formulated').update(status='assigned')
+ Submission.objects.filter(status='EICassigned').update(status='assigned') # Renaming of key
+ Submission.objects.filter(status='awaiting_ed_rec').update(status='assigned')
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('submissions', '0016_auto_20180414_1825'),
+ ]
+
+ operations = [
+ migrations.RunPython(update_submission_statuses),
+ ]
diff --git a/submissions/migrations/0018_auto_20180426_1023.py b/submissions/migrations/0018_auto_20180426_1023.py
new file mode 100644
index 000000000..e5c081633
--- /dev/null
+++ b/submissions/migrations/0018_auto_20180426_1023.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2018-04-26 08:23
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('submissions', '0017_auto_20180426_1018'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='submission',
+ name='status',
+ field=models.CharField(choices=[('unassigned_incoming', 'Submission incoming, undergoing pre-screening'), ('unassigned', 'Unassigned, awaiting editor assignment'), ('assigned', 'Editor-in-charge assigned, manuscript under review'), ('assignment_failed', 'Failed to assign Editor-in-charge; manuscript rejected'), ('resubmitted', 'Has been resubmitted'), ('accepted', 'Publication decision taken: accept'), ('rejected', 'Publication decision taken: reject'), ('withdrawn', 'Withdrawn by the Authors'), ('published', 'Published')], default='unassigned', max_length=30),
+ ),
+ ]
--
GitLab