Rename PAF to project form in more places (#4254)

Fixes #4252

Hopefully this is the last of it.

Author: frjo

hypha/apply/activity/adapters/activity_feed.py

@@ -203,7 +203,7 @@ def handle_paf_assignment(self, source, paf_approvals, **kwargs):
                 ]
             )
             users_sentence = " and".join(users.rsplit(",", 1))
-            return _("PAF assigned to {}").format(users_sentence)
+            return _("Project form assigned to {}").format(users_sentence)
         return None
 
     def handle_task_removal(self, source, task, **kwargs):

hypha/apply/activity/migrations/0085_rename_paf.py

@@ -0,0 +1,85 @@
+# Generated by Django 4.2.17 on 2024-12-06 07:47
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("activity", "0084_alter_event_type"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="event",
+            name="type",
+            field=models.CharField(
+                choices=[
+                    ("UPDATE_LEAD", "updated lead"),
+                    ("BATCH_UPDATE_LEAD", "batch updated lead"),
+                    ("EDIT_SUBMISSION", "edited submission"),
+                    ("APPLICANT_EDIT", "edited applicant"),
+                    ("NEW_SUBMISSION", "submitted new submission"),
+                    ("DRAFT_SUBMISSION", "submitted new draft submission"),
+                    ("SCREENING", "screened"),
+                    ("TRANSITION", "transitioned"),
+                    ("BATCH_TRANSITION", "batch transitioned"),
+                    ("DETERMINATION_OUTCOME", "sent determination outcome"),
+                    ("BATCH_DETERMINATION_OUTCOME", "sent batch determination outcome"),
+                    ("INVITED_TO_PROPOSAL", "invited to proposal"),
+                    ("REVIEWERS_UPDATED", "updated reviewers"),
+                    ("BATCH_REVIEWERS_UPDATED", "batch updated reviewers"),
+                    ("PARTNERS_UPDATED", "updated partners"),
+                    ("PARTNERS_UPDATED_PARTNER", "partners updated partner"),
+                    ("READY_FOR_REVIEW", "marked ready for review"),
+                    ("BATCH_READY_FOR_REVIEW", "marked batch ready for review"),
+                    ("NEW_REVIEW", "added new review"),
+                    ("COMMENT", "added comment"),
+                    ("PROPOSAL_SUBMITTED", "submitted proposal"),
+                    ("OPENED_SEALED", "opened sealed submission"),
+                    ("REVIEW_OPINION", "reviewed opinion"),
+                    ("DELETE_SUBMISSION", "deleted submission"),
+                    ("DELETE_REVIEW", "deleted review"),
+                    ("DELETE_REVIEW_OPINION", "deleted review opinion"),
+                    ("CREATED_PROJECT", "created project"),
+                    ("UPDATE_PROJECT_LEAD", "updated project lead"),
+                    ("UPDATE_PROJECT_TITLE", "updated project title"),
+                    ("EDIT_REVIEW", "edited review"),
+                    ("SEND_FOR_APPROVAL", "sent for approval"),
+                    ("APPROVE_PROJECT", "approved project"),
+                    ("ASSIGN_PAF_APPROVER", "assign project form approver"),
+                    ("APPROVE_PAF", "approved project form"),
+                    ("PROJECT_TRANSITION", "transitioned project"),
+                    ("REQUEST_PROJECT_CHANGE", "requested project change"),
+                    ("SUBMIT_CONTRACT_DOCUMENTS", "submitted contract documents"),
+                    ("UPLOAD_DOCUMENT", "uploaded document to project"),
+                    ("REMOVE_DOCUMENT", "removed document from project"),
+                    ("UPLOAD_CONTRACT", "uploaded contract to project"),
+                    ("APPROVE_CONTRACT", "approved contract"),
+                    ("CREATE_INVOICE", "created invoice for project"),
+                    ("UPDATE_INVOICE_STATUS", "updated invoice status"),
+                    ("APPROVE_INVOICE", "approve invoice"),
+                    ("DELETE_INVOICE", "deleted invoice"),
+                    ("SENT_TO_COMPLIANCE", "sent project to compliance"),
+                    ("UPDATE_INVOICE", "updated invoice"),
+                    ("SUBMIT_REPORT", "submitted report"),
+                    ("SKIPPED_REPORT", "skipped report"),
+                    ("REPORT_FREQUENCY_CHANGED", "changed report frequency"),
+                    ("DISABLED_REPORTING", "disabled reporting"),
+                    ("REPORT_NOTIFY", "notified report"),
+                    ("CREATE_REMINDER", "created reminder"),
+                    ("DELETE_REMINDER", "deleted reminder"),
+                    ("REVIEW_REMINDER", "reminder to review"),
+                    ("BATCH_DELETE_SUBMISSION", "batch deleted submissions"),
+                    ("BATCH_ARCHIVE_SUBMISSION", "batch archive submissions"),
+                    ("BATCH_INVOICE_STATUS_UPDATE", "batch update invoice status"),
+                    ("STAFF_ACCOUNT_CREATED", "created new account"),
+                    ("STAFF_ACCOUNT_EDITED", "edited account"),
+                    ("ARCHIVE_SUBMISSION", "archived submission"),
+                    ("UNARCHIVE_SUBMISSION", "unarchived submission"),
+                    ("REMOVE_TASK", "remove task"),
+                ],
+                max_length=50,
+                verbose_name="verb",
+            ),
+        ),
+    ]

hypha/apply/activity/options.py

@@ -42,8 +42,8 @@ class MESSAGES(TextChoices):
     EDIT_REVIEW = "EDIT_REVIEW", _("edited review")
     SEND_FOR_APPROVAL = "SEND_FOR_APPROVAL", _("sent for approval")
     APPROVE_PROJECT = "APPROVE_PROJECT", _("approved project")
-    ASSIGN_PAF_APPROVER = "ASSIGN_PAF_APPROVER", _("assign paf approver")
-    APPROVE_PAF = "APPROVE_PAF", _("approved paf")
+    ASSIGN_PAF_APPROVER = "ASSIGN_PAF_APPROVER", _("assign project form approver")
+    APPROVE_PAF = "APPROVE_PAF", _("approved project form")
     PROJECT_TRANSITION = "PROJECT_TRANSITION", _("transitioned project")
     REQUEST_PROJECT_CHANGE = "REQUEST_PROJECT_CHANGE", _("requested project change")
     SUBMIT_CONTRACT_DOCUMENTS = (

hypha/apply/activity/templates/messages/email/project_request_change.html

@@ -4,7 +4,7 @@
 {% block salutation %}{% endblock %}
 
 {% block content %}{# fmt:off #}
-{% trans "A Project has been rejected by PAF reviewers, please update it accordingly and resubmit it to the reviewers." %}
+{% trans "A Project has been rejected by project form reviewers, please update it accordingly and resubmit it to the reviewers." %}
 
 {% trans "Title" %}: {{ source.title }}
 {% trans "Link" %}: {{ request.scheme }}://{{ request.get_host }}{% url 'apply:projects:detail' pk=source.pk %}

hypha/apply/dashboard/templates/dashboard/staff_dashboard.html

@@ -93,7 +93,7 @@ <h3 class="text-xl mb-2">
 
         {% if PROJECTS_ENABLED and paf_for_review.count %}
             <div id="paf_for_review" class="wrapper wrapper--bottom-space">
-                <h3 class="text-xl mb-2">{% trans "PAFs for review" %}</h3>
+                <h3 class="text-xl mb-2">{% trans "Project forms for review" %}</h3>
                 {% render_table paf_for_review.table %}
             </div>
         {% endif %}

hypha/apply/projects/permissions.py

@@ -79,13 +79,16 @@ def can_update_paf_approvers(user, project, **kwargs):
         return False, "Login Required"
 
     if project.status != INTERNAL_APPROVAL:
-        return False, "PAF Approvers can be updated only in Internal approval state"
+        return (
+            False,
+            "Project form approvers can be updated only in Internal approval state",
+        )
     if user == project.lead:
         return True, "Lead can update approvers in approval state"
     if not project.paf_approvals.exists():
         return (
             False,
-            "No user can update approvers without paf approval, except lead(lead can add paf approvals)",
+            "No user can update approvers without project form approval, except lead (lead can add project form approvals)",
         )
 
     request = kwargs.get("request")
@@ -99,7 +102,7 @@ def can_update_paf_approvers(user, project, **kwargs):
             ):
                 return (
                     True,
-                    "PAF Reviewer-roles users can update next approval approvers if any approvers assigned",
+                    "Project form reviewer-roles users can update next approval approvers if any approvers assigned",
                 )
         return False, "Forbidden Error"
     else:
@@ -114,7 +117,7 @@ def can_update_paf_approvers(user, project, **kwargs):
                 )
             )
         if user.id in approvers_ids:
-            return True, "PAF Reviewer-roles users can update approvers"
+            return True, "Project form reviewer-roles users can update approvers"
     return False, "Forbidden Error"
 
 
@@ -126,7 +129,10 @@ def can_update_assigned_paf_approvers(user, project, **kwargs):
     if not user.is_authenticated:
         return False, "Login Required"
     if project.status != INTERNAL_APPROVAL:
-        return False, "PAF approvers can be assigned only in Internal approval state"
+        return (
+            False,
+            "Project form approvers can be assigned only in Internal approval state",
+        )
     if not project.paf_approvals.exists():
         return False, "No user can assign approvers with paf_approvals"
 
@@ -139,7 +145,7 @@ def can_update_assigned_paf_approvers(user, project, **kwargs):
                 list(next_paf_approval.paf_reviewer_role.user_roles.all()),
                 exact_match=True,
             ):
-                return True, "PAF Reviewer-roles users can assign approvers"
+                return True, "Project form reviewer-roles users can assign approvers"
             return False, "Forbidden Error"
         return False, "Forbidden Error"
     else:
@@ -152,7 +158,7 @@ def can_update_assigned_paf_approvers(user, project, **kwargs):
                 )
             )
         if user.id in assigners_ids:
-            return True, "PAF Reviewer-roles users can assign approvers"
+            return True, "Project form reviewer-roles users can assign approvers"
     return False, "Forbidden Error"
 
 
@@ -161,9 +167,12 @@ def can_assign_paf_approvers(user, project, **kwargs):
         return False, "Login Required"
 
     if project.status != INTERNAL_APPROVAL:
-        return False, "PAF approvers can be assigned only in Internal approval state"
+        return (
+            False,
+            "Project form approvers can be assigned only in Internal approval state",
+        )
     if not project.paf_approvals.exists():
-        return False, "No user can assign approvers with paf_approvals"
+        return False, "No user can assign approvers with project form approvals"
 
     request = kwargs.get("request")
     project_settings = ProjectSettings.for_request(request)
@@ -177,7 +186,10 @@ def can_assign_paf_approvers(user, project, **kwargs):
                     list(next_paf_approval.paf_reviewer_role.user_roles.all()),
                     exact_match=True,
                 ):
-                    return True, "PAF Reviewer-roles users can assign approvers"
+                    return (
+                        True,
+                        "Project form reviewer-roles users can assign approvers",
+                    )
             return False, "Forbidden Error"
         return False, "Forbidden Error"
     else:
@@ -191,7 +203,7 @@ def can_assign_paf_approvers(user, project, **kwargs):
             )
 
         if user.id in assigners_ids:
-            return True, "PAF Reviewer-roles users can assign approvers"
+            return True, "Project form reviewer-roles users can assign approvers"
     return False, "Forbidden Error"
 
 
@@ -200,10 +212,10 @@ def can_update_paf_status(user, project, **kwargs):
         return False, "Login Required"
 
     if not project.paf_approvals.filter(approved=False).exists():
-        return False, "No PAF Approvals Exists"
+        return False, "No project form approvals exists"
 
     if project.status != INTERNAL_APPROVAL:
-        return False, "Incorrect project status to approve PAF"
+        return False, "Incorrect project status to approve project form"
 
     request = kwargs.get("request")
     if request:
@@ -219,11 +231,11 @@ def can_update_paf_status(user, project, **kwargs):
             if user.id in possible_approvers_ids:
                 return (
                     True,
-                    "Next approval group users can approve PAF(For Sequential Approvals)",
+                    "Next approval group users can approve project form (for sequential approvals)",
                 )
             return (
                 False,
-                "Only Next approval group can approve PAF(For Sequential Approvals)",
+                "Only Next approval group can approve project form (for sequential approvals)",
             )
         else:
             possible_approvers_ids = []
@@ -240,11 +252,11 @@ def can_update_paf_status(user, project, **kwargs):
             if user.id in possible_approvers_ids:
                 return (
                     True,
-                    "All approval group users can approve PAF(For Parallel Approvals)",
+                    "All approval group users can approve project form (for parallel approvals)",
                 )
             return (
                 False,
-                "Only approval group users can approve PAF(For Parallel Approvals)",
+                "Only approval group users can approve project form (for parallel approvals)",
             )
 
     return False, "Forbidden Error"
@@ -260,7 +272,10 @@ def can_update_project_status(user, project, **kwargs):
     if user.is_apply_staff or user.is_apply_staff_admin:
         if project.status == DRAFT:
             if no_pafreviewer_role():
-                return True, "Staff and Staff Admin can skip the PAF approval process"
+                return (
+                    True,
+                    "Staff and Staff Admin can skip the project form approval process",
+                )
         else:
             return True, "Staff and Staff Admin can update status"
 
@@ -359,7 +374,7 @@ def can_access_project(user, project):
         if user.id in paf_reviewer_roles_users_ids:
             return (
                 True,
-                "PAF Approvers can access the project in Draft, Approval state and after approval state",
+                "Project form approvers can access the project in Draft, Approval state and after approval state",
             )
 
     return False, "Forbidden Error"
@@ -380,9 +395,9 @@ def can_view_contract_category_documents(user, project, **kwargs):
 
 def can_edit_paf(user, project):
     if no_pafreviewer_role() and project.status != COMPLETE:
-        return True, "Paf is editable for active projects if no reviewer roles"
+        return True, "Project form is editable for active projects if no reviewer roles"
     if project.editable_by(user):
-        return True, "PAF is editable in Draft by this user"
+        return True, "Project form is editable in Draft by this user"
     return False, "You are not allowed to edit the project at this time"
 
 

hypha/apply/projects/templates/application_projects/modals/send_for_approval.html

@@ -27,11 +27,11 @@ <h5>{% trans "Are you ready to submit the project documents to be approved in" %
             <p class="flex-grow h-px bg-mid-grey mb-0"></p>
         </div>
 
-        <p>{% trans "Please note that in "%}{% if project_settings.paf_approval_sequential %}{%trans "sequential order, approvers will approve PAF one after the other."%}{% else %}{% trans "parallel order, approvers can approve PAF anytime." %}{% endif %}</p>
+        <p>{% trans "Please note that in "%}{% if project_settings.paf_approval_sequential %}{%trans "sequential order, approvers will approve project form one after the other."%}{% else %}{% trans "parallel order, approvers can approve project form anytime." %}{% endif %}</p>
         {% url 'apply:projects:submit_project_for_approval' pk=object.id as document_submit_url %}
         {% include 'funds/includes/dialog_form_base.html' with form=form value=submit url=document_submit_url %}
     {% else %}
-        <p>{% trans "No PAF Reviewer Roles created yet, please create these in " %}
+        <p>{% trans "No project form reviewer roles has been created yet, please create these in " %}
             <a href="{% project_settings_url project_settings %}" target="_blank">{% trans " project settings" %}</a>
         </p>
     {% endif %}

hypha/apply/projects/templates/application_projects/modals/update_pafapprovers.html

@@ -8,7 +8,7 @@
         {% url 'apply:projects:update_pafapprovers' pk=object.id as url %}
         {% include 'funds/includes/dialog_form_base.html' with form=form value=value url=url %}
     {% else %}
-        <p>{% trans "No PAF Reviewer Roles created yet, please create these in " %}
+        <p>{% trans "No project form reviewer roles has been created yet, please create these in " %}
             <a href="{% project_settings_url project_settings %}" target="_blank">{% trans " project settings" %}</a>
         </p>
     {% endif %}

hypha/apply/projects/views/project.py

@@ -1060,13 +1060,15 @@ def post(self, *args, **kwargs):
                             break
                     else:
                         # should never be the case but still to avoid 500.
-                        raise PermissionDenied("User don't have PAF approver roles")
+                        raise PermissionDenied(
+                            "User don't have project form approver roles"
+                        )
 
             paf_status = form.cleaned_data.get("paf_status")
             comment = form.cleaned_data.get("comment", "")
 
             paf_status_update_message = _(
-                "<p>{role} has updated PAF status to {paf_status}.</p>"
+                "<p>{role} has updated project form status to {paf_status}.</p>"
             ).format(
                 role=paf_approval.paf_reviewer_role.label,
                 paf_status=get_paf_status_display(paf_status).lower(),
@@ -1142,7 +1144,7 @@ def post(self, *args, **kwargs):
 
                 messages.success(
                     self.request,
-                    _("PAF status has been updated"),
+                    _("Project form status has been updated"),
                     extra_tags=PROJECT_ACTION_MESSAGE_TAG,
                 )
             elif paf_status == APPROVE:
@@ -1198,7 +1200,7 @@ def post(self, *args, **kwargs):
                             )
                 messages.success(
                     self.request,
-                    _("PAF has been approved"),
+                    _("Project form has been approved"),
                     extra_tags=PROJECT_ACTION_MESSAGE_TAG,
                 )
 
@@ -1607,7 +1609,7 @@ def post(self, *args, **kwargs):
 
             messages.success(
                 self.request,
-                _("PAF approvers have been updated"),
+                _("Project form approvers have been updated"),
                 extra_tags=PROJECT_ACTION_MESSAGE_TAG,
             )
             return HttpResponseClientRefresh()

hypha/apply/users/roles.py

@@ -79,7 +79,7 @@ class CommunityReviewer(AbstractUserRole):
 class Approver(AbstractUserRole):
     role_name = APPROVER_GROUP_NAME
     help_text = _(
-        "Can review/approve PAF, and access compliance documents. "
+        "Can review/approve project form, and access compliance documents. "
         "Must also be in group: Staff, Contracting, or Finance."
     )
 
@@ -89,7 +89,7 @@ class Approver(AbstractUserRole):
 class Finance(AbstractUserRole):
     role_name = FINANCE_GROUP_NAME
     help_text = _(
-        "Can review/approve the PAF, access documents associated with "
+        "Can review/approve the project form, access documents associated with "
         "contracting, and access invoices approved by Staff."
     )
 
@@ -99,7 +99,7 @@ class Finance(AbstractUserRole):
 class Contracting(AbstractUserRole):
     role_name = CONTRACTING_GROUP_NAME
     help_text = _(
-        "Can review/approve the PAF and access documents associated with contracting."
+        "Can review/approve the project form and access documents associated with contracting."
     )
 
     available_permissions = {}