diff --git a/hypha/apply/funds/workflow.py b/hypha/apply/funds/workflow.py index 849485f0bd33767da09ef49e584fa94073dc2290..a8870a15ae522b20433d1caa3dd831606d0d9866 100644 --- a/hypha/apply/funds/workflow.py +++ b/hypha/apply/funds/workflow.py @@ -175,8 +175,6 @@ community_review_permissions = make_permissions(edit=[staff_can], review=[staff_ applicant_edit_permissions = make_permissions(edit=[applicant_can, partner_can], review=[staff_can]) -staff_applicant_edit_permissions = make_permissions(edit=[staff_can, applicant_can, partner_can]) - staff_edit_permissions = make_permissions(edit=[staff_can]) @@ -215,8 +213,9 @@ SingleStageDefinition = [ 'more_info': 'Request More Information', 'internal_review': 'Open Review', 'determination': 'Ready For Determination', - 'rejected': 'Dismiss', + 'almost': 'Accept but additional info required', 'accepted': 'Accept', + 'rejected': 'Dismiss', }, 'display': 'Screening', 'public': 'Application Received', @@ -231,6 +230,7 @@ SingleStageDefinition = [ 'method': 'create_revision', }, 'determination': 'Ready For Determination', + 'almost': 'Accept but additional info required', 'accepted': 'Accept', 'rejected': 'Dismiss', }, @@ -257,6 +257,7 @@ SingleStageDefinition = [ 'post_review_more_info': 'Request More Information', 'determination': 'Ready For Determination', 'internal_review': 'Open Review (back)', + 'almost': 'Accept but additional info required', 'accepted': 'Accept', 'rejected': 'Dismiss', }, @@ -272,6 +273,7 @@ SingleStageDefinition = [ 'method': 'create_revision', }, 'determination': 'Ready For Determination', + 'almost': 'Accept but additional info required', 'accepted': 'Accept', 'rejected': 'Dismiss', }, @@ -284,6 +286,7 @@ SingleStageDefinition = [ 'determination': { 'transitions': { 'post_review_discussion': 'Ready For Discussion (back)', + 'almost': 'Accept but additional info required', 'accepted': 'Accept', 'rejected': 'Dismiss', }, @@ -293,11 +296,20 @@ SingleStageDefinition = [ }, }, { + 'almost': { + 'transitions': { + 'accepted': 'Accept', + 'post_review_discussion': 'Ready For Discussion (back)', + }, + 'display': 'Accepted but additional info required', + 'stage': Request, + 'permissions': applicant_edit_permissions, + }, 'accepted': { 'display': 'Accepted', 'future': 'Application Outcome', 'stage': Request, - 'permissions': staff_applicant_edit_permissions, + 'permissions': staff_edit_permissions, }, 'rejected': { 'display': 'Dismissed', @@ -403,6 +415,7 @@ SingleStageExternalDefinition = [ 'ext_post_external_review_more_info': 'Request More Information', 'ext_determination': 'Ready For Determination', 'ext_external_review': 'Open AC review (back)', + 'ext_almost': 'Accept but additional info required', 'ext_accepted': 'Accept', 'ext_rejected': 'Dismiss', }, @@ -427,6 +440,7 @@ SingleStageExternalDefinition = [ 'ext_determination': { 'transitions': { 'ext_post_external_review_discussion': 'Ready For Discussion (back)', + 'ext_almost': 'Accept but additional info required', 'ext_accepted': 'Accept', 'ext_rejected': 'Dismiss', }, @@ -436,11 +450,20 @@ SingleStageExternalDefinition = [ }, }, { + 'ext_almost': { + 'transitions': { + 'ext_accepted': 'Accept', + 'ext_post_external_review_discussion': 'Ready For Discussion (back)', + }, + 'display': 'Accepted but additional info required', + 'stage': RequestExt, + 'permissions': applicant_edit_permissions, + }, 'ext_accepted': { 'display': 'Accepted', 'future': 'Application Outcome', 'stage': RequestExt, - 'permissions': staff_applicant_edit_permissions, + 'permissions': staff_edit_permissions, }, 'ext_rejected': { 'display': 'Dismissed', @@ -571,6 +594,7 @@ SingleStageCommunityDefinition = [ 'com_post_external_review_more_info': 'Request More Information', 'com_determination': 'Ready For Determination', 'com_external_review': 'Open AC review (back)', + 'com_almost': 'Accept but additional info required', 'com_accepted': 'Accept', 'com_rejected': 'Dismiss', }, @@ -595,6 +619,7 @@ SingleStageCommunityDefinition = [ 'com_determination': { 'transitions': { 'com_post_external_review_discussion': 'Ready For Discussion (back)', + 'com_almost': 'Accept but additional info required', 'com_accepted': 'Accept', 'com_rejected': 'Dismiss', }, @@ -604,11 +629,20 @@ SingleStageCommunityDefinition = [ }, }, { + 'com_almost': { + 'transitions': { + 'com_accepted': 'Accept', + 'com_post_external_review_discussion': 'Ready For Discussion (back)', + }, + 'display': 'Accepted but additional info required', + 'stage': RequestCom, + 'permissions': applicant_edit_permissions, + }, 'com_accepted': { 'display': 'Accepted', 'future': 'Application Outcome', 'stage': RequestCom, - 'permissions': staff_applicant_edit_permissions, + 'permissions': staff_edit_permissions, }, 'com_rejected': { 'display': 'Dismissed', @@ -835,6 +869,7 @@ DoubleStageDefinition = [ 'post_external_review_more_info': 'Request More Information', 'proposal_determination': 'Ready For Final Determination', 'external_review': 'Open AC review (back)', + 'proposal_almost': 'Accept but additional info required', 'proposal_accepted': 'Accept', 'proposal_rejected': 'Dismiss', }, @@ -859,6 +894,7 @@ DoubleStageDefinition = [ 'proposal_determination': { 'transitions': { 'post_external_review_discussion': 'Ready For Discussion (back)', + 'proposal_almost': 'Accept but additional info required', 'proposal_accepted': 'Accept', 'proposal_rejected': 'Dismiss', }, @@ -868,11 +904,20 @@ DoubleStageDefinition = [ }, }, { + 'proposal_almost': { + 'transitions': { + 'proposal_accepted': 'Accept', + 'post_external_review_discussion': 'Ready For Discussion (back)', + }, + 'display': 'Accepted but additional info required', + 'stage': Proposal, + 'permissions': applicant_edit_permissions, + }, 'proposal_accepted': { 'display': 'Accepted', 'future': 'Final Determination', 'stage': Proposal, - 'permissions': staff_applicant_edit_permissions, + 'permissions': staff_edit_permissions, }, 'proposal_rejected': { 'display': 'Dismissed',