From 90fe68aa9f1d3a2b0a67113c0d3f4e7a45c49764 Mon Sep 17 00:00:00 2001
From: Fredrik Jonsson <frjo@xdeb.org>
Date: Tue, 9 Oct 2018 12:23:11 +0200
Subject: [PATCH] Add a new SingleStageExternalDefinition workflow.
---
.../funds/migrations/0044_new_workflow.py | 33 +++++
opentech/apply/funds/workflow.py | 114 ++++++++++++++++++
2 files changed, 147 insertions(+)
create mode 100644 opentech/apply/funds/migrations/0044_new_workflow.py
diff --git a/opentech/apply/funds/migrations/0044_new_workflow.py b/opentech/apply/funds/migrations/0044_new_workflow.py
new file mode 100644
index 000000000..06085c54a
--- /dev/null
+++ b/opentech/apply/funds/migrations/0044_new_workflow.py
@@ -0,0 +1,33 @@
+# Generated by Django 2.0.8 on 2018-10-10 06:25
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('funds', '0043_auto_20180926_0948'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='applicationbase',
+ name='workflow_name',
+ field=models.CharField(choices=[('single', 'Request'), ('single_ext', 'Request with external review'), ('double', 'Concept & Proposal')], default='single', max_length=100, verbose_name='Workflow'),
+ ),
+ migrations.AlterField(
+ model_name='applicationsubmission',
+ name='workflow_name',
+ field=models.CharField(choices=[('single', 'Request'), ('single_ext', 'Request with external review'), ('double', 'Concept & Proposal')], default='single', max_length=100, verbose_name='Workflow'),
+ ),
+ migrations.AlterField(
+ model_name='labbase',
+ name='workflow_name',
+ field=models.CharField(choices=[('single', 'Request'), ('single_ext', 'Request with external review'), ('double', 'Concept & Proposal')], default='single', max_length=100, verbose_name='Workflow'),
+ ),
+ migrations.AlterField(
+ model_name='roundbase',
+ name='workflow_name',
+ field=models.CharField(choices=[('single', 'Request'), ('single_ext', 'Request with external review'), ('double', 'Concept & Proposal')], default='single', max_length=100, verbose_name='Workflow'),
+ ),
+ ]
diff --git a/opentech/apply/funds/workflow.py b/opentech/apply/funds/workflow.py
index b0e408b68..5d7b9d405 100644
--- a/opentech/apply/funds/workflow.py
+++ b/opentech/apply/funds/workflow.py
@@ -137,6 +137,8 @@ class CanEditPermissions(DefaultPermissions):
Request = Stage('Request', False)
+RequestExt = Stage('RequestExt', True)
+
Concept = Stage('Concept', False)
Proposal = Stage('Proposal', True)
@@ -217,6 +219,112 @@ SingleStageDefinition = {
},
}
+SingleStageExternalDefinition = {
+ INITIAL_STATE: {
+ 'transitions': {
+ 'ext_internal_review': 'Open Review',
+ 'ext_rejected': {'display': 'Reject', 'permissions': {UserPermissions.ADMIN, UserPermissions.LEAD}},
+ 'ext_more_info': 'Request More Information',
+ },
+ 'display': 'Under Discussion',
+ 'stage': RequestExt,
+ 'permissions': DefaultPermissions(),
+ 'step': 0,
+ },
+ 'ext_more_info': {
+ 'transitions': {
+ INITIAL_STATE: {
+ 'display': 'Submit',
+ 'permissions': {UserPermissions.APPLICANT, UserPermissions.LEAD, UserPermissions.ADMIN},
+ 'method': 'create_revision',
+ },
+ },
+ 'display': 'More information required',
+ 'stage': RequestExt,
+ 'permissions': CanEditPermissions(),
+ 'step': 0,
+ },
+ 'ext_internal_review': {
+ 'transitions': {
+ 'ext_post_review_discussion': 'Close Review',
+ },
+ 'display': 'Internal Review',
+ 'stage': RequestExt,
+ 'permissions': DefaultPermissions(),
+ 'step': 1,
+ },
+ 'ext_post_review_discussion': {
+ 'transitions': {
+ 'ext_accepted': {'display': 'Accept', 'permissions': {UserPermissions.ADMIN, UserPermissions.LEAD}},
+ 'ext_rejected': {'display': 'Reject', 'permissions': {UserPermissions.ADMIN, UserPermissions.LEAD}},
+ 'ext_post_review_more_info': 'Request More Information',
+ },
+ 'display': 'Under Discussion',
+ 'stage': RequestExt,
+ 'permissions': DefaultPermissions(),
+ 'step': 2,
+ },
+ 'ext_post_review_more_info': {
+ 'transitions': {
+ 'ext_post_review_discussion': {
+ 'display': 'Submit',
+ 'permissions': {UserPermissions.APPLICANT, UserPermissions.LEAD, UserPermissions.ADMIN},
+ 'method': 'create_revision',
+ },
+ },
+ 'display': 'More information required',
+ 'stage': RequestExt,
+ 'permissions': CanEditPermissions(),
+ 'step': 2,
+ },
+ 'ext_external_review': {
+ 'transitions': {
+ 'ext_post_external_review_discussion': 'Close Review',
+ },
+ 'display': 'Advisory Council Review',
+ 'stage': RequestExt,
+ 'permissions': ReviewerReviewPermissions(),
+ 'step': 3,
+ },
+ 'ext_post_external_review_discussion': {
+ 'transitions': {
+ 'ext_accepted': {'display': 'Accept', 'permissions': {UserPermissions.ADMIN, UserPermissions.LEAD}},
+ 'ext_rejected': {'display': 'Reject', 'permissions': {UserPermissions.ADMIN, UserPermissions.LEAD}},
+ 'ext_post_external_review_more_info': 'Request More Information',
+ },
+ 'display': 'Under Discussion',
+ 'stage': RequestExt,
+ 'permissions': DefaultPermissions(),
+ 'step': 4,
+ },
+ 'ext_post_external_review_more_info': {
+ 'transitions': {
+ 'ext_post_external_review_discussion': {
+ 'display': 'Submit',
+ 'permissions': {UserPermissions.APPLICANT, UserPermissions.LEAD, UserPermissions.ADMIN},
+ 'method': 'create_revision',
+ },
+ },
+ 'display': 'More information required',
+ 'stage': RequestExt,
+ 'permissions': CanEditPermissions(),
+ 'step': 4,
+ },
+
+ 'ext_accepted': {
+ 'display': 'Accepted',
+ 'stage': RequestExt,
+ 'permissions': NoPermissions(),
+ 'step': 5,
+ },
+ 'ext_rejected': {
+ 'display': 'Rejected',
+ 'stage': RequestExt,
+ 'permissions': NoPermissions(),
+ 'step': 5,
+ },
+}
+
DoubleStageDefinition = {
INITIAL_STATE: {
@@ -416,6 +524,10 @@ Request = Workflow('Request', 'single', **{
for phase_name, phase_data in SingleStageDefinition.items()
})
+RequestExternal = Workflow('Request with external review', 'single_ext', **{
+ phase_name: Phase(phase_name, **phase_data)
+ for phase_name, phase_data in SingleStageExternalDefinition.items()
+})
ConceptProposal = Workflow('Concept & Proposal', 'double', **{
phase_name: Phase(phase_name, **phase_data)
@@ -425,6 +537,7 @@ ConceptProposal = Workflow('Concept & Proposal', 'double', **{
WORKFLOWS = {
Request.admin_name: Request,
+ RequestExternal.admin_name: RequestExternal,
ConceptProposal.admin_name: ConceptProposal,
}
@@ -479,6 +592,7 @@ DETERMINATION_RESPONSE_PHASES = [
'post_review_discussion',
'concept_review_discussion',
'post_external_review_discussion',
+ 'ext_post_external_review_discussion',
]
--
GitLab