Skip to content

Commit df4fafa

Browse files
sandeepsajan0sandeepsajan0
committed
Fix/add random status choices, migration issue
1 parent 89b2c94 commit df4fafa

2 files changed

Lines changed: 51 additions & 51 deletions

File tree

‎hypha/apply/funds/migrations/0127_alter_applicationsubmission_status.py‎

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Generated by Django 4.2.21 on 2025-06-02 10:04
1+
# Generated by Django 4.2.21 on 2025-06-02 10:21
22

33
from django.db import migrations, models
44

@@ -14,68 +14,68 @@ class Migration(migrations.Migration):
1414
name="status",
1515
field=models.CharField(
1616
choices=[
17+
("accepted", "Accepted"),
18+
("almost", "Accepted but additional info required"),
1719
("com_accepted", "Accepted"),
18-
("concept_review_discussion", "Ready For Discussion"),
19-
("post_proposal_review_more_info", "More information required"),
20-
("post_external_review_more_info", "More information required"),
21-
("ext_accepted", "Accepted"),
22-
("ext_post_external_review_discussion", "Ready For Discussion"),
23-
("proposal_more_info", "More information required"),
24-
("invited_to_proposal", "Concept Accepted"),
25-
("proposal_rejected", "Dismissed"),
26-
("draft_proposal", "Invited for Proposal"),
27-
("same_more_info", "More information required"),
2820
("com_almost", "Accepted but additional info required"),
29-
("same_post_review_more_info", "More information required"),
30-
("same_determination", "Ready for Determination"),
31-
("same_internal_review", "Review"),
32-
("post_external_review_discussion", "Ready For Discussion"),
33-
("rejected", "Dismissed"),
34-
("concept_internal_review", "Internal Review"),
35-
("com_post_review_more_info", "More information required"),
36-
("almost", "Accepted but additional info required"),
37-
("determination", "Ready for Determination"),
38-
("internal_review", "Internal Review"),
39-
("ext_post_external_review_more_info", "More information required"),
21+
("com_community_review", "Community Review"),
22+
("com_determination", "Ready for Determination"),
23+
("com_external_review", "External Review"),
24+
("com_internal_review", "Internal Review"),
4025
("com_more_info", "More information required"),
26+
("com_open_call", "Open Call (public)"),
27+
("com_post_external_review_discussion", "Ready For Discussion"),
28+
("com_post_external_review_more_info", "More information required"),
29+
("com_post_review_discussion", "Ready For Discussion"),
30+
("com_post_review_more_info", "More information required"),
31+
("com_rejected", "Dismissed"),
4132
("concept_determination", "Ready for Preliminary Determination"),
33+
("concept_internal_review", "Internal Review"),
34+
("concept_more_info", "More information required"),
4235
("concept_rejected", "Dismissed"),
43-
("ext_post_review_discussion", "Ready For Discussion"),
36+
("concept_review_discussion", "Ready For Discussion"),
37+
("concept_review_more_info", "More information required"),
38+
("determination", "Ready for Determination"),
39+
("draft", "Draft"),
40+
("draft_proposal", "Invited for Proposal"),
41+
("ext_accepted", "Accepted"),
42+
("ext_almost", "Accepted but additional info required"),
4443
("ext_determination", "Ready for Determination"),
45-
("same_rejected", "Dismissed"),
46-
("post_review_discussion", "Ready For Discussion"),
47-
("com_rejected", "Dismissed"),
4844
("ext_external_review", "External Review"),
49-
("post_proposal_review_discussion", "Ready For Discussion"),
50-
("concept_review_more_info", "More information required"),
51-
("post_review_more_info", "More information required"),
52-
("com_internal_review", "Internal Review"),
53-
("same_post_review_discussion", "Ready For Discussion"),
54-
("com_open_call", "Open Call (public)"),
55-
("com_determination", "Ready for Determination"),
56-
("proposal_internal_review", "Internal Review"),
57-
("same_accepted", "Accepted"),
58-
("com_post_review_discussion", "Ready For Discussion"),
5945
("ext_internal_review", "Internal Review"),
46+
("ext_more_info", "More information required"),
47+
("ext_post_external_review_discussion", "Ready For Discussion"),
48+
("ext_post_external_review_more_info", "More information required"),
49+
("ext_post_review_discussion", "Ready For Discussion"),
50+
("ext_post_review_more_info", "More information required"),
6051
("ext_rejected", "Dismissed"),
61-
("com_external_review", "External Review"),
6252
("external_review", "External Review"),
63-
("same_almost", "Accepted but additional info required"),
64-
("com_post_external_review_discussion", "Ready For Discussion"),
65-
("concept_more_info", "More information required"),
6653
("in_discussion", "Need screening"),
67-
("com_post_external_review_more_info", "More information required"),
68-
("ext_almost", "Accepted but additional info required"),
69-
("com_community_review", "Community Review"),
70-
("ext_more_info", "More information required"),
71-
("proposal_almost", "Accepted but additional info required"),
72-
("ext_post_review_more_info", "More information required"),
54+
("internal_review", "Internal Review"),
55+
("invited_to_proposal", "Concept Accepted"),
7356
("more_info", "More information required"),
74-
("draft", "Draft"),
75-
("proposal_discussion", "Proposal Received"),
76-
("proposal_determination", "Ready for Final Determination"),
77-
("accepted", "Accepted"),
57+
("post_external_review_discussion", "Ready For Discussion"),
58+
("post_external_review_more_info", "More information required"),
59+
("post_proposal_review_discussion", "Ready For Discussion"),
60+
("post_proposal_review_more_info", "More information required"),
61+
("post_review_discussion", "Ready For Discussion"),
62+
("post_review_more_info", "More information required"),
7863
("proposal_accepted", "Accepted"),
64+
("proposal_almost", "Accepted but additional info required"),
65+
("proposal_determination", "Ready for Final Determination"),
66+
("proposal_discussion", "Proposal Received"),
67+
("proposal_internal_review", "Internal Review"),
68+
("proposal_more_info", "More information required"),
69+
("proposal_rejected", "Dismissed"),
70+
("rejected", "Dismissed"),
71+
("same_accepted", "Accepted"),
72+
("same_almost", "Accepted but additional info required"),
73+
("same_determination", "Ready for Determination"),
74+
("same_internal_review", "Review"),
75+
("same_more_info", "More information required"),
76+
("same_post_review_discussion", "Ready For Discussion"),
77+
("same_post_review_more_info", "More information required"),
78+
("same_rejected", "Dismissed"),
7979
],
8080
default="in_discussion",
8181
max_length=100,

‎hypha/apply/funds/models/submissions.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ def get_all_possible_states():
289289
for workflow in WORKFLOWS.values():
290290
for phase_name, data in workflow.items():
291291
all_states.add((phase_name, data.display_name))
292-
return all_states
292+
return sorted(all_states, key=lambda x: x[0])
293293

294294

295295
class AddTransitions(models.base.ModelBase):

0 commit comments

Comments
 (0)