diff --git a/opentech/apply/workflow.py b/opentech/apply/workflow.py index 7ab64787b56c629a94f2108854ae98b2132d8e51..e918bb3ffcaa8043d10fc2587b96e1b97912ca37 100644 --- a/opentech/apply/workflow.py +++ b/opentech/apply/workflow.py @@ -185,7 +185,7 @@ reject_action = ChangePhaseAction('rejected', 'Reject') accept_action = ChangePhaseAction('accepted', 'Accept') -progress_stage = ChangePhaseAction(None, 'Progress Stage') +progress_stage = ChangePhaseAction(None, 'Invite to Proposal') next_phase = NextPhaseAction('Progress') @@ -202,6 +202,12 @@ class DeterminationWithProgressionPhase(Phase): actions = [progress_stage, reject_action] +class DeterminationPhase(Phase): + name = 'Under Discussion' + public_name = 'In review' + actions = [accept_action, reject_action] + + class DeterminationWithNextPhase(Phase): name = 'Under Discussion' public_name = 'In review' @@ -218,8 +224,9 @@ class ConceptStage(Stage): phases = [ DeterminationWithNextPhase(), ReviewPhase(), - DeterminationWithProgressionPhase(), - rejected + DeterminationPhase(), + accepted, + rejected, ] @@ -229,8 +236,8 @@ class ProposalStage(Stage): DeterminationWithNextPhase(), ReviewPhase(), DeterminationWithNextPhase(), - ReviewPhase('AC Review'), - DeterminationWithNextPhase(), + ReviewPhase('AC Review', public_name='In AC review'), + DeterminationPhase(public_name='In AC review'), accepted, rejected, ]