Merge remote-tracking branch 'origin/main' into themes

* origin/main:
  Fix report file path issue and duplicate file issue, Fix file path issue for Project and SOW Form (#4580)
  Use xhtml2pdf inplace of reportlab for submission pdf export (#4577)
  Fix co-applicant permission for Partners, Reviewers, and Community Reviewers (#4583)
  Migrate django-fsm to django-viewflow (#4561)
  Delete application comments with the application (#4585)

Author: theskumar

hypha/apply/funds/files.py

@@ -22,23 +22,24 @@ class PrivateStreamFieldFile(StreamFieldFile):
 
     def get_entity_id(self):
         from hypha.apply.funds.models import ApplicationRevision
-        from hypha.apply.projects.reports.models import ReportVersion
+        from hypha.apply.projects.models.project import Project, ProjectSOW
+        from hypha.apply.projects.reports.models import Report, ReportVersion
 
         entity_id = self.instance.pk
 
-        if isinstance(self.instance, ApplicationRevision):
+        if isinstance(self.instance, ApplicationRevision) or isinstance(
+            self.instance, Project
+        ):
             entity_id = self.instance.submission.pk
+        elif isinstance(self.instance, Report) or isinstance(self.instance, ProjectSOW):
+            entity_id = self.instance.project.submission.pk
         elif isinstance(self.instance, ReportVersion):
             # Reports are project documents.
-            entity_id = self.instance.report.project.pk
+            entity_id = self.instance.report.project.submission.pk
         return entity_id
 
     def generate_filename(self):
-        from hypha.apply.projects.reports.models import ReportVersion
-
         path_start = "submission"
-        if isinstance(self.instance, ReportVersion):
-            path_start = "project"
         return generate_private_file_path(
             self.get_entity_id(),
             self.field.id,
@@ -48,14 +49,10 @@ def generate_filename(self):
 
     @property
     def url(self):
-        from hypha.apply.projects.reports.models import ReportVersion
-
         view_name = "apply:submissions:serve_private_media"
         kwargs = {
             "pk": self.get_entity_id(),
             "field_id": self.field.id,
             "file_name": self.basename,
         }
-        if isinstance(self.instance, ReportVersion):
-            view_name = "apply:projects:document"
         return reverse(viewname=view_name, kwargs=kwargs)

hypha/apply/funds/migrations/0033_use_django_fsm.py

@@ -1,7 +1,6 @@
 # Generated by Django 2.0.2 on 2018-06-11 16:14
 
 from django.db import migrations, models
-import django_fsm
 
 
 class Migration(migrations.Migration):
@@ -13,8 +12,9 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name="applicationsubmission",
             name="status",
-            field=django_fsm.FSMField(
-                default="in_discussion", max_length=50, protected=True
+            field=models.CharField(
+                default="in_discussion",
+                max_length=50,
             ),
         ),
         migrations.AlterField(

hypha/apply/funds/migrations/0130_alter_applicationsubmission_status.py

@@ -0,0 +1,84 @@
+# Generated by Django 4.2.22 on 2025-06-10 13:09
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("funds", "0129_coapplicantinvite_project_permission"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="applicationsubmission",
+            name="status",
+            field=models.CharField(
+                choices=[
+                    ("accepted", "Accepted"),
+                    ("almost", "Accepted but additional info required"),
+                    ("com_accepted", "Accepted"),
+                    ("com_almost", "Accepted but additional info required"),
+                    ("com_community_review", "Community Review"),
+                    ("com_determination", "Ready for Determination"),
+                    ("com_external_review", "External Review"),
+                    ("com_internal_review", "Internal Review"),
+                    ("com_more_info", "More information required"),
+                    ("com_open_call", "Open Call (public)"),
+                    ("com_post_external_review_discussion", "Ready For Discussion"),
+                    ("com_post_external_review_more_info", "More information required"),
+                    ("com_post_review_discussion", "Ready For Discussion"),
+                    ("com_post_review_more_info", "More information required"),
+                    ("com_rejected", "Dismissed"),
+                    ("concept_determination", "Ready for Preliminary Determination"),
+                    ("concept_internal_review", "Internal Review"),
+                    ("concept_more_info", "More information required"),
+                    ("concept_rejected", "Dismissed"),
+                    ("concept_review_discussion", "Ready For Discussion"),
+                    ("concept_review_more_info", "More information required"),
+                    ("determination", "Ready for Determination"),
+                    ("draft", "Draft"),
+                    ("draft_proposal", "Invited for Proposal"),
+                    ("ext_accepted", "Accepted"),
+                    ("ext_almost", "Accepted but additional info required"),
+                    ("ext_determination", "Ready for Determination"),
+                    ("ext_external_review", "External Review"),
+                    ("ext_internal_review", "Internal Review"),
+                    ("ext_more_info", "More information required"),
+                    ("ext_post_external_review_discussion", "Ready For Discussion"),
+                    ("ext_post_external_review_more_info", "More information required"),
+                    ("ext_post_review_discussion", "Ready For Discussion"),
+                    ("ext_post_review_more_info", "More information required"),
+                    ("ext_rejected", "Dismissed"),
+                    ("external_review", "External Review"),
+                    ("in_discussion", "Need screening"),
+                    ("internal_review", "Internal Review"),
+                    ("invited_to_proposal", "Concept Accepted"),
+                    ("more_info", "More information required"),
+                    ("post_external_review_discussion", "Ready For Discussion"),
+                    ("post_external_review_more_info", "More information required"),
+                    ("post_proposal_review_discussion", "Ready For Discussion"),
+                    ("post_proposal_review_more_info", "More information required"),
+                    ("post_review_discussion", "Ready For Discussion"),
+                    ("post_review_more_info", "More information required"),
+                    ("proposal_accepted", "Accepted"),
+                    ("proposal_almost", "Accepted but additional info required"),
+                    ("proposal_determination", "Ready for Final Determination"),
+                    ("proposal_discussion", "Proposal Received"),
+                    ("proposal_internal_review", "Internal Review"),
+                    ("proposal_more_info", "More information required"),
+                    ("proposal_rejected", "Dismissed"),
+                    ("rejected", "Dismissed"),
+                    ("same_accepted", "Accepted"),
+                    ("same_almost", "Accepted but additional info required"),
+                    ("same_determination", "Ready for Determination"),
+                    ("same_internal_review", "Review"),
+                    ("same_more_info", "More information required"),
+                    ("same_post_review_discussion", "Ready For Discussion"),
+                    ("same_post_review_more_info", "More information required"),
+                    ("same_rejected", "Dismissed"),
+                ],
+                default="in_discussion",
+                max_length=100,
+            ),
+        ),
+    ]

hypha/apply/funds/models/mixins.py

@@ -385,3 +385,20 @@ def get_answer_from_label(self, label):
                     if answer and not answer == "N":
                         return answer
         return None
+
+    def get_text_questions_answers_as_dict(self):
+        data_dict = {}
+        for field_id in self.question_text_field_ids:
+            if field_id not in self.named_blocks:
+                question_field = self.serialize(field_id)
+                if isinstance(question_field["answer"], str):
+                    answer = question_field["answer"]
+                else:
+                    answer = ",".join(question_field["answer"])
+                if answer and not answer == "None":
+                    data_dict[question_field["question"]] = answer
+                elif question_field["type"] == "checkbox":
+                    data_dict[question_field["question"]] = False
+                else:
+                    data_dict[question_field["question"]] = "-"
+        return data_dict