From 60484d9de80bf20bdc40d8ab8b45cf6e13372e08 Mon Sep 17 00:00:00 2001 From: Sandeep Chauhan Date: Fri, 1 Nov 2024 00:30:58 +0530 Subject: [PATCH] Remove Fancybox modal for PAF workflow (#4160) Fixes #4124 - [ ] Use htmx/alpine for supporting documents upload/remove - [ ] Use htmx/alpine for Send for approval modal - [ ] Use htmx/alpine for Assign paf approvers modal - [ ] Use htmx/alpine for Change paf approvers modal - [ ] Use htmx/alpine for View/Update paf approvers modal - [ ] Use htmx/alpine for Update Paf status modal - [ ] Use htmx/alpine for Skip paf approval modal --- hypha/apply/projects/forms/__init__.py | 2 - hypha/apply/projects/forms/project.py | 20 +- hypha/apply/projects/models/project.py | 13 - .../includes/project_documents.html | 161 +++ .../includes/supporting_documents.html | 308 ----- .../modals/assign_pafapprovers.html | 13 + .../modals/pafstatus_update.html | 7 + .../modals/send_for_approval.html | 38 + .../modals/supporting_documents_upload.html | 14 + .../modals/update_pafapprovers.html | 15 + .../partials/supporting_documents.html | 82 ++ .../project_admin_detail.html | 14 +- .../project_approval_detail.html | 45 +- .../application_projects/project_detail.html | 2 +- hypha/apply/projects/tests/test_views.py | 32 +- hypha/apply/projects/urls.py | 46 + hypha/apply/projects/views/__init__.py | 10 + hypha/apply/projects/views/project.py | 1102 ++++++++++------- .../apply/projects/views/project_partials.py | 18 +- 19 files changed, 1084 insertions(+), 858 deletions(-) create mode 100644 hypha/apply/projects/templates/application_projects/includes/project_documents.html delete mode 100644 hypha/apply/projects/templates/application_projects/includes/supporting_documents.html create mode 100644 hypha/apply/projects/templates/application_projects/modals/assign_pafapprovers.html create mode 100644 hypha/apply/projects/templates/application_projects/modals/pafstatus_update.html create mode 100644 hypha/apply/projects/templates/application_projects/modals/send_for_approval.html create mode 100644 hypha/apply/projects/templates/application_projects/modals/supporting_documents_upload.html create mode 100644 hypha/apply/projects/templates/application_projects/modals/update_pafapprovers.html create mode 100644 hypha/apply/projects/templates/application_projects/partials/supporting_documents.html diff --git a/hypha/apply/projects/forms/__init__.py b/hypha/apply/projects/forms/__init__.py index cd9736dc6d..239b1fa12c 100644 --- a/hypha/apply/projects/forms/__init__.py +++ b/hypha/apply/projects/forms/__init__.py @@ -15,7 +15,6 @@ ProjectForm, ProjectSOWForm, RemoveContractDocumentForm, - RemoveDocumentForm, SetPendingForm, SkipPAFApprovalProcessForm, StaffUploadContractForm, @@ -42,7 +41,6 @@ "ProjectCreateForm", "ProjectForm", "ProjectSOWForm", - "RemoveDocumentForm", "RemoveContractDocumentForm", "SetPendingForm", "UploadContractForm", diff --git a/hypha/apply/projects/forms/project.py b/hypha/apply/projects/forms/project.py index e67b602a72..eb3da00094 100644 --- a/hypha/apply/projects/forms/project.py +++ b/hypha/apply/projects/forms/project.py @@ -193,7 +193,7 @@ class Meta: fields = ["paf_status", "comment"] model = Project - def __init__(self, instance, user, *args, **kwargs): + def __init__(self, *args, user=None, instance=None, **kwargs): super().__init__(*args, **kwargs, instance=instance) self.fields["paf_status"].widget.attrs["class"] = "grid--status-update" @@ -217,17 +217,6 @@ def __init__(self, instance, user, *args, **kwargs): status_field.choices = possible_status_transitions.get(instance.status, []) -class RemoveDocumentForm(forms.ModelForm): - id = forms.IntegerField(widget=forms.HiddenInput()) - - class Meta: - fields = ["id"] - model = PacketFile - - def __init__(self, user=None, *args, **kwargs): - super().__init__(*args, **kwargs) - - class RemoveContractDocumentForm(forms.ModelForm): id = forms.IntegerField(widget=forms.HiddenInput()) @@ -245,7 +234,7 @@ class Meta: model = Project widgets = {"id": forms.HiddenInput()} - def __init__(self, user=None, *args, **kwargs): + def __init__(self, *args, user=None, **kwargs): from hypha.apply.activity.adapters.utils import get_users_for_groups super().__init__(*args, **kwargs) @@ -308,7 +297,7 @@ class Meta: model = Project widgets = {"id": forms.HiddenInput()} - def __init__(self, user=None, *args, **kwargs): + def __init__(self, *args, user=None, **kwargs): from hypha.apply.activity.adapters.utils import get_users_for_groups super().__init__(*args, **kwargs) @@ -400,8 +389,9 @@ class UploadDocumentForm(FileFormMixin, forms.ModelForm): class Meta: fields = ["category", "document"] model = PacketFile + widgets = {"category": forms.HiddenInput()} - def __init__(self, user=None, instance=None, *args, **kwargs): + def __init__(self, *args, user=None, instance=None, **kwargs): super().__init__(*args, **kwargs) def save(self, commit=True): diff --git a/hypha/apply/projects/models/project.py b/hypha/apply/projects/models/project.py index 6c99e6ea95..f525056b4e 100644 --- a/hypha/apply/projects/models/project.py +++ b/hypha/apply/projects/models/project.py @@ -623,19 +623,6 @@ def __str__(self): class Meta: ordering = ("-created_at",) - def get_remove_form(self): - """ - Get an instantiated RemoveDocumentForm with this class as `instance`. - - This allows us to build instances of the RemoveDocumentForm for each - instance of PacketFile in the supporting documents template. The - standard Delegated View flow makes it difficult to create these forms - in the view or template. - """ - from ..forms import RemoveDocumentForm - - return RemoveDocumentForm(instance=self) - @receiver(post_delete, sender=PacketFile) def delete_packetfile_file(sender, instance, **kwargs): diff --git a/hypha/apply/projects/templates/application_projects/includes/project_documents.html b/hypha/apply/projects/templates/application_projects/includes/project_documents.html new file mode 100644 index 0000000000..5596e16766 --- /dev/null +++ b/hypha/apply/projects/templates/application_projects/includes/project_documents.html @@ -0,0 +1,161 @@ +{% load i18n approval_tools project_tags heroicons %} +{% allow_collapsible_header object header_type='project_documents' as collapsible_header %} + +
+
+
+

+ {% trans "Project documents" %} +

+ + {% if collapsible_header %} + + {% endif %} +
+
+ {% user_can_send_for_approval object user as can_send_to_approve %} + {% if can_send_to_approve %} + + {% if object.paf_approvals.exists %} + {% trans "Resubmit for approval" %} + {% else %} + {% trans "Submit for approval" %} + {% endif %} + + {% endif %} + {% user_can_update_paf_approvers object user request as can_update_paf_approvers %} + {% user_can_assign_approvers_to_project object user request as can_assign_paf_approvers %} + {% if can_update_paf_approvers %} + {% if user == project.lead %} + + {% trans "View/Update Approvers" %} + + {% else %} + + {% trans "Change approver" %} + + {% endif %} + {% endif %} + {% if can_assign_paf_approvers %} + + {% trans "Assign approver" %} + + {% endif %} + {% user_can_update_paf_status object user request=request as can_update_paf_status %} + {% if object.can_make_approval and can_update_paf_status %} + + {% trans "Update Status" %} + + {% endif %} +
+
+ +
+ + +{% if can_update_paf_status %} + +{% endif %} diff --git a/hypha/apply/projects/templates/application_projects/includes/supporting_documents.html b/hypha/apply/projects/templates/application_projects/includes/supporting_documents.html deleted file mode 100644 index fb8fee5058..0000000000 --- a/hypha/apply/projects/templates/application_projects/includes/supporting_documents.html +++ /dev/null @@ -1,308 +0,0 @@ -{% load i18n approval_tools project_tags heroicons %} -{% allow_collapsible_header object header_type='project_documents' as collapsible_header %} - -
-
-
-

- {% trans "Project documents" %} -

- - {% if collapsible_header %} - - {% endif %} -
-
- {% user_can_send_for_approval object user as can_send_to_approve %} - {% if can_send_to_approve %} - - {% if object.paf_approvals.exists %} - {% trans "Resubmit for approval" %} - {% else %} - {% trans "Submit for approval" %} - {% endif %} - - {% endif %} - {% user_can_update_paf_approvers object user request as can_update_paf_approvers %} - {% user_can_assign_approvers_to_project object user request as can_assign_paf_approvers %} - {% if can_update_paf_approvers %} - {% if user == project.lead %} - - {% trans "View/Update Approvers" %} - - {% else %} - - {% trans "Change approver" %} - - {% endif %} - {% endif %} - {% if can_assign_paf_approvers %} - - {% trans "Assign approver" %} - - {% endif %} - {% user_can_update_paf_status object user request=request as can_update_paf_status %} - {% if object.can_make_approval and can_update_paf_status %} - - {% trans "Update Status" %} - - {% endif %} -
-
- -
- -{% if user.is_apply_staff %} - -{% endif %} - -{% if can_send_to_approve %} - -{% endif %} - -{% if can_update_paf_approvers %} - - - - -{% endif %} - -{% if can_assign_paf_approvers %} - -{% endif %} - -{% if can_update_paf_status %} - -{% endif %} diff --git a/hypha/apply/projects/templates/application_projects/modals/assign_pafapprovers.html b/hypha/apply/projects/templates/application_projects/modals/assign_pafapprovers.html new file mode 100644 index 0000000000..35b83fbecd --- /dev/null +++ b/hypha/apply/projects/templates/application_projects/modals/assign_pafapprovers.html @@ -0,0 +1,13 @@ +{% load i18n %} +{% if pafapprover_exists %} + {% modal_title %}{% trans "Assign Approver" %}{% endmodal_title %} +{% else %} + {% modal_title %}{% trans "Change Approver" %}{% endmodal_title %} +{% endif %} + +
+

{% trans "Selected approver will be notified. On unselecting, every listed member here will be notified." %}

+ + {% url 'apply:projects:assign_pafapprovers' pk=object.id as url %} + {% include 'funds/includes/dialog_form_base.html' with form=form value=value url=url %} +
diff --git a/hypha/apply/projects/templates/application_projects/modals/pafstatus_update.html b/hypha/apply/projects/templates/application_projects/modals/pafstatus_update.html new file mode 100644 index 0000000000..3283c5325a --- /dev/null +++ b/hypha/apply/projects/templates/application_projects/modals/pafstatus_update.html @@ -0,0 +1,7 @@ +{% load i18n project_tags %} +{% modal_title %}{% trans "Update Project Form Status" %}{% endmodal_title %} + +
+ {% url 'apply:projects:update_pafapprovers' pk=object.id as url %} + {% include 'funds/includes/dialog_form_base.html' with form=form value=value url=url %} +
diff --git a/hypha/apply/projects/templates/application_projects/modals/send_for_approval.html b/hypha/apply/projects/templates/application_projects/modals/send_for_approval.html new file mode 100644 index 0000000000..624e3c1e64 --- /dev/null +++ b/hypha/apply/projects/templates/application_projects/modals/send_for_approval.html @@ -0,0 +1,38 @@ +{% load i18n approval_tools project_tags heroicons %} +{% modal_title %}{% trans "Submit for Approval" %}{% endmodal_title %} + +
+ {% if remaining_document_categories %} +
{% trans "Are you sure you're ready to submit the project documents to be approved in" %} + {% if project_settings.paf_approval_sequential %}{% trans "sequential order?" %}{% else %}{% trans "parallel order?" %}{% endif %}
+ +

{% trans "This project is missing the following documents" %}:

+ + + {% trans "Submit anyway" as submit %} + {% else %} +
{% trans "Are you ready to submit the project documents to be approved in" %} + {% if project_settings.paf_approval_sequential %}{% trans "sequential order?" %}{% else %}{% trans "parallel order?" %}{% endif %}
+ {% trans "Submit" as submit %} + {% endif %} + {% if project_settings.paf_reviewers_roles.all %} + +

{% trans "By default all the members are notified when an approver is not selected. Optionally, you may select specific approvers to assign and notify them." %}

+
+

{% trans "Optional" %}

+

+
+ +

{% 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 %}

+ {% 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 %} +

{% trans "No PAF Reviewer Roles created yet, please create these in " %} + {% trans " project settings" %} +

+ {% endif %} +
diff --git a/hypha/apply/projects/templates/application_projects/modals/supporting_documents_upload.html b/hypha/apply/projects/templates/application_projects/modals/supporting_documents_upload.html new file mode 100644 index 0000000000..b57a09d96c --- /dev/null +++ b/hypha/apply/projects/templates/application_projects/modals/supporting_documents_upload.html @@ -0,0 +1,14 @@ +{% load i18n %} +{% modal_title %}{% trans "Upload Supporting Documents" %}{% endmodal_title %} + +
+
+
+
{% trans "Category" %}
+
{{ category }}
+
+
+ + {% url 'apply:projects:supporting_doc_upload' pk=object.id category_pk=category.id as document_upload_url %} + {% include 'funds/includes/dialog_form_base.html' with form=form value=value url=document_upload_url %} +
diff --git a/hypha/apply/projects/templates/application_projects/modals/update_pafapprovers.html b/hypha/apply/projects/templates/application_projects/modals/update_pafapprovers.html new file mode 100644 index 0000000000..efc515a4e9 --- /dev/null +++ b/hypha/apply/projects/templates/application_projects/modals/update_pafapprovers.html @@ -0,0 +1,15 @@ +{% load i18n project_tags %} +{% modal_title %}{% trans "View/Update Approvers" %}{% endmodal_title %} + +
+ {% if project_settings.paf_reviewers_roles.all %} +

{% trans "Are you sure you want to update the approvers?" %} {% if project_settings.paf_approval_sequential %} {% trans "The uppermost active approver will be notified via email." %} {% else %}{% trans "All approvers will be notified via email." %}{% endif %}

+
+ {% 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 %} +

{% trans "No PAF Reviewer Roles created yet, please create these in " %} + {% trans " project settings" %} +

+ {% endif %} +
diff --git a/hypha/apply/projects/templates/application_projects/partials/supporting_documents.html b/hypha/apply/projects/templates/application_projects/partials/supporting_documents.html new file mode 100644 index 0000000000..b639d6026b --- /dev/null +++ b/hypha/apply/projects/templates/application_projects/partials/supporting_documents.html @@ -0,0 +1,82 @@ +{% load i18n approval_tools project_tags heroicons %} + +
  • +
    + {% if remaining_document_categories %} + {% heroicon_outline "check-circle" class="stroke-gray-400 me-1" aria_hidden=true %} + {% else %} + {% heroicon_outline "check-circle" class="stroke-light-blue me-1" aria_hidden=true %} + {% endif %} +

    {% trans "Supporting documents" %}

    +
    + + {% if all_document_categories %} + +
    +

    + +
    + {% endif %} + +
    • diff --git a/hypha/apply/projects/templates/application_projects/project_admin_detail.html b/hypha/apply/projects/templates/application_projects/project_admin_detail.html index 66d4f9ab26..d0dbaa6396 100644 --- a/hypha/apply/projects/templates/application_projects/project_admin_detail.html +++ b/hypha/apply/projects/templates/application_projects/project_admin_detail.html @@ -12,14 +12,12 @@
    {% trans "Actions to take" %}
    {% user_can_skip_pafapproval_process project user as can_skip_paf %} {% if can_skip_paf %} - {% trans "Continue to next status" %} - - + + {% trans "Continue to next status" %} + {% else %}
    diff --git a/hypha/apply/projects/templates/application_projects/project_approval_detail.html b/hypha/apply/projects/templates/application_projects/project_approval_detail.html index 64d785f888..27ee4d2505 100644 --- a/hypha/apply/projects/templates/application_projects/project_approval_detail.html +++ b/hypha/apply/projects/templates/application_projects/project_approval_detail.html @@ -104,8 +104,8 @@
    {% trans "Actions to take" %}
    {% if can_edit_paf %} {% trans "Edit PAF" %} {% endif %} -
    -
    @@ -118,40 +118,33 @@
    {% trans "Actions to take" %}
    {% user_can_update_paf_approvers object user request as can_update_paf_approvers %} {% if can_update_paf_approvers %} {% if user != project.lead %} - + {% trans "Change approver" %} - {% endif %} {% endif %} {% user_can_assign_approvers_to_project object user request as can_assign_paf_approvers %} {% if can_assign_paf_approvers %} - + {% trans "Assign approver" %} - {% endif %} {% if can_update_paf_status %} - {% trans "Update Status" %} - + + {% trans "Update Status" %} + {% endif %}
    diff --git a/hypha/apply/projects/templates/application_projects/project_detail.html b/hypha/apply/projects/templates/application_projects/project_detail.html index f648d2592a..a0b05ca5e6 100644 --- a/hypha/apply/projects/templates/application_projects/project_detail.html +++ b/hypha/apply/projects/templates/application_projects/project_detail.html @@ -159,7 +159,7 @@
    {% trans "E-mail" %}
    {% include "application_projects/includes/contracting_documents.html" %} {% endif %} - {% include "application_projects/includes/supporting_documents.html" %} + {% include "application_projects/includes/project_documents.html" %} {% block sidebar %} diff --git a/hypha/apply/projects/tests/test_views.py b/hypha/apply/projects/tests/test_views.py index b1b66cf9e1..bafb971a37 100644 --- a/hypha/apply/projects/tests/test_views.py +++ b/hypha/apply/projects/tests/test_views.py @@ -139,7 +139,7 @@ def test_send_for_approval_fails_when_project_is_not_in_draft_state(self): def test_send_for_approval_happy_path(self): project = ProjectFactory(is_locked=False, status=DRAFT) - response = self.post_page(project, {"form-submitted-request_approval_form": ""}) + response = self.post_page(project, {}, view_name="submit_project_for_approval") self.assertEqual(response.status_code, 200) project.refresh_from_db() @@ -190,7 +190,7 @@ def test_unassigned_staff_cant_update_paf_status(self): ) response = self.post_page( - project, {"form-submitted-change_paf_status": "", "paf_status": APPROVE} + project, {"paf_status": APPROVE}, view_name="update_pafstatus" ) self.assertEqual(response.status_code, 403) @@ -204,7 +204,7 @@ def test_unassigned_finance_cant_update_paf_status(self): ) response = self.post_page( - project, {"form-submitted-change_paf_status": "", "paf_status": APPROVE} + project, {"paf_status": APPROVE}, view_name="update_pafstatus" ) self.assertEqual(response.status_code, 403) @@ -218,7 +218,9 @@ def test_unassigned_contracting_cant_update_paf_status(self): ) response = self.post_page( - project, {"form-submitted-change_paf_status": "", "paf_status": APPROVE} + project, + {"paf_status": APPROVE}, + view_name="update_pafstatus", ) self.assertEqual(response.status_code, 403) @@ -231,7 +233,9 @@ def test_assigned_approvers_can_approve_paf(self): ) response = self.post_page( - project, {"form-submitted-change_paf_status": "", "paf_status": APPROVE} + project, + {"paf_status": APPROVE}, + view_name="update_pafstatus", ) self.assertEqual(response.status_code, 200) @@ -252,7 +256,8 @@ def test_assigned_approvers_can_reject_paf(self): response = self.post_page( project, - {"form-submitted-change_paf_status": "", "paf_status": REQUEST_CHANGE}, + {"paf_status": REQUEST_CHANGE}, + view_name="update_pafstatus", ) self.assertEqual(response.status_code, 200) @@ -519,26 +524,31 @@ class TestUploadDocumentView(BaseViewTestCase): url_name = "funds:projects:{}" user_factory = StaffFactory + def setUp(self): + super().setUp() + self.category = DocumentCategoryFactory() + def get_kwargs(self, instance): - return {"pk": instance.id} + return {"pk": instance.id, "category_pk": self.category.id} def test_upload_document(self): - category = DocumentCategoryFactory() project = ProjectFactory() test_doc = BytesIO(b"somebinarydata") test_doc.name = "test_document.pdf" + self.assertEqual(project.packet_files.count(), 0) + response = self.post_page( project, { - "form-submitted-document_form": "", "title": "test document", - "category": category.id, + "category": self.category.id, "document": test_doc, }, + view_name="supporting_doc_upload", ) - self.assertEqual(response.status_code, 200) + self.assertEqual(response.status_code, 204) project.refresh_from_db() diff --git a/hypha/apply/projects/urls.py b/hypha/apply/projects/urls.py index ce4b964f40..65790a3484 100644 --- a/hypha/apply/projects/urls.py +++ b/hypha/apply/projects/urls.py @@ -3,6 +3,7 @@ from .views import ( CategoryTemplatePrivateMediaView, + ChangePAFStatusView, ContractDocumentPrivateMediaView, ContractPrivateMediaView, CreateInvoiceView, @@ -19,14 +20,21 @@ ProjectPrivateMediaView, ProjectSOWDownloadView, ProjectSOWView, + RemoveDocumentView, ReportDetailView, ReportListView, ReportPrivateMedia, ReportSkipView, ReportUpdateView, + SendForApprovalView, + SkipPAFApprovalProcessView, + UpdateAssignApproversView, + UpdatePAFApproversView, + UploadDocumentView, get_invoices_status_counts, get_project_status_counts, partial_project_activities, + partial_supporting_documents, ) app_name = "projects" @@ -50,6 +58,44 @@ name="partial-activities", ), path("edit/", ProjectFormEditView.as_view(), name="edit"), + path( + "paf/skip/", SkipPAFApprovalProcessView.as_view(), name="paf_skip" + ), + path( + "documents/submit/", + SendForApprovalView.as_view(), + name="submit_project_for_approval", + ), + path( + "pafapprovers/assign/", + UpdateAssignApproversView.as_view(), + name="assign_pafapprovers", + ), + path( + "pafapprovers/update/", + UpdatePAFApproversView.as_view(), + name="update_pafapprovers", + ), + path( + "pafstatus/update/", + ChangePAFStatusView.as_view(), + name="update_pafstatus", + ), + path( + "document//upload/", + UploadDocumentView.as_view(), + name="supporting_doc_upload", + ), + path( + "document//remove/", + RemoveDocumentView.as_view(), + name="remove_supporting_document", + ), + path( + "partial/documents/", + partial_supporting_documents, + name="supporting_documents", + ), path( "documents/", ProjectPrivateMediaView.as_view(), diff --git a/hypha/apply/projects/views/__init__.py b/hypha/apply/projects/views/__init__.py index 89cb0272d6..d73407f9aa 100644 --- a/hypha/apply/projects/views/__init__.py +++ b/hypha/apply/projects/views/__init__.py @@ -13,6 +13,7 @@ ApproveContractView, BaseProjectDetailView, CategoryTemplatePrivateMediaView, + ChangePAFStatusView, ContractDocumentPrivateMediaView, ContractPrivateMediaView, ProjectDetailApprovalView, @@ -26,7 +27,10 @@ RemoveDocumentView, SelectDocumentView, SendForApprovalView, + SkipPAFApprovalProcessView, + UpdateAssignApproversView, UpdateLeadView, + UpdatePAFApproversView, UploadContractView, UploadDocumentView, ) @@ -34,6 +38,7 @@ get_invoices_status_counts, get_project_status_counts, partial_project_activities, + partial_supporting_documents, ) from .report import ( ReportDetailView, @@ -46,11 +51,16 @@ __all__ = [ "partial_project_activities", + "partial_supporting_documents", "get_invoices_status_counts", "get_project_status_counts", "ChangeInvoiceStatusView", "SendForApprovalView", + "SkipPAFApprovalProcessView", + "UpdatePAFApproversView", + "ChangePAFStatusView", "UploadDocumentView", + "UpdateAssignApproversView", "RemoveDocumentView", "SelectDocumentView", "UpdateLeadView", diff --git a/hypha/apply/projects/views/project.py b/hypha/apply/projects/views/project.py index e1f0487bb6..8c68bf556d 100644 --- a/hypha/apply/projects/views/project.py +++ b/hypha/apply/projects/views/project.py @@ -1,6 +1,7 @@ import copy import datetime import io +import json from django.conf import settings from django.contrib import messages @@ -11,7 +12,7 @@ from django.db import transaction from django.db.models import Q from django.http import Http404, HttpResponse, HttpResponseRedirect -from django.shortcuts import get_object_or_404, redirect +from django.shortcuts import get_object_or_404, redirect, render from django.template.loader import get_template from django.urls import reverse from django.utils import timezone @@ -29,6 +30,9 @@ ) from django.views.generic.detail import SingleObjectMixin from django_filters.views import FilterView +from django_htmx.http import ( + HttpResponseClientRefresh, +) from django_tables2 import SingleTableMixin from docx import Document from htmldocx import HtmlToDocx @@ -78,7 +82,6 @@ ProjectForm, ProjectSOWForm, RemoveContractDocumentForm, - RemoveDocumentForm, SelectDocumentForm, SetPendingForm, SkipPAFApprovalProcessForm, @@ -119,40 +122,98 @@ @method_decorator(staff_required, name="dispatch") -class SendForApprovalView(DelegatedViewMixin, UpdateView): - context_name = "request_approval_form" +class SendForApprovalView(View): form_class = SetPendingForm model = Project + template_name = "application_projects/modals/send_for_approval.html" - def form_valid(self, form): - project = self.kwargs["object"] - old_stage = project.status - - response = super().form_valid(form) + def dispatch(self, request, *args, **kwargs): + self.object = get_object_or_404(Project, id=kwargs.get("pk")) + # permission check + return super().dispatch(request, *args, **kwargs) - # remove PAF submission task for staff group - remove_tasks_for_user( - code=PROJECT_SUBMIT_PAF, - user=self.object.lead, - related_obj=self.object, + def get(self, *args, **kwargs): + form = self.form_class(instance=self.object) + project_settings = ProjectSettings.for_request(self.request) + return render( + self.request, + self.template_name, + context={ + "form": form, + "project_settings": project_settings, + "paf_approvals": PAFApprovals.objects.filter(project=self.object), + "remaining_document_categories": DocumentCategory.objects.filter( + ~Q(packet_files__project=self.object) + ), + "object": self.object, + }, ) - # remove PAF rejection task for staff if exists - remove_tasks_for_user( - code=PAF_REQUIRED_CHANGES, - user=self.object.lead, - related_obj=self.object, + def post(self, *args, **kwargs): + form = self.form_class( + self.request.POST, user=self.request.user, instance=self.object ) - project_settings = ProjectSettings.for_request(self.request) + if form.is_valid(): + project = self.object + old_stage = project.status + form.save() + + # remove PAF submission task for staff group + remove_tasks_for_user( + code=PROJECT_SUBMIT_PAF, + user=self.object.lead, + related_obj=self.object, + ) + + # remove PAF rejection task for staff if exists + remove_tasks_for_user( + code=PAF_REQUIRED_CHANGES, + user=self.object.lead, + related_obj=self.object, + ) - paf_approvals = self.object.paf_approvals.filter(approved=False) + paf_approvals = self.object.paf_approvals.filter(approved=False) - if project_settings.paf_approval_sequential: - if paf_approvals: - user = paf_approvals.first().user - if user: - # notify only if first user/approver is updated + if project_settings.paf_approval_sequential: + if paf_approvals: + user = paf_approvals.first().user + if user: + # notify only if first user/approver is updated + messenger( + MESSAGES.SEND_FOR_APPROVAL, + request=self.request, + user=self.request.user, + source=self.object, + ) + messenger( + MESSAGES.APPROVE_PAF, + request=self.request, + user=self.request.user, + source=self.object, + related=[paf_approvals.first()], + ) + # add PAF waiting approval task for paf_approval user + add_task_to_user( + code=PAF_WAITING_APPROVAL, + user=user, + related_obj=self.object, + ) + else: + messenger( + MESSAGES.ASSIGN_PAF_APPROVER, + request=self.request, + user=self.request.user, + source=self.object, + ) + # add PAF waiting assignee task for paf_approval reviewer_roles + add_task_to_user_group( + code=PAF_WAITING_ASSIGNEE, + user_group=paf_approvals.first().paf_reviewer_role.user_roles.all(), + related_obj=self.object, + ) + else: + if paf_approvals.filter(user__isnull=False).exists(): messenger( MESSAGES.SEND_FOR_APPROVAL, request=self.request, @@ -164,130 +225,152 @@ def form_valid(self, form): request=self.request, user=self.request.user, source=self.object, - related=[paf_approvals.first()], - ) - # add PAF waiting approval task for paf_approval user - add_task_to_user( - code=PAF_WAITING_APPROVAL, user=user, related_obj=self.object + related=paf_approvals.filter(user__isnull=False), ) - else: + # add PAF waiting approval task for paf_approvals users + for paf_approval in paf_approvals.filter(user__isnull=False): + add_task_to_user( + code=PAF_WAITING_APPROVAL, + user=paf_approval.user, + related_obj=self.object, + ) + if paf_approvals.filter(user__isnull=True).exists(): messenger( MESSAGES.ASSIGN_PAF_APPROVER, request=self.request, user=self.request.user, source=self.object, ) - # add PAF waiting assignee task for paf_approval reviewer_roles - add_task_to_user_group( - code=PAF_WAITING_ASSIGNEE, - user_group=paf_approvals.first().paf_reviewer_role.user_roles.all(), - related_obj=self.object, - ) - else: - if paf_approvals.filter(user__isnull=False).exists(): - messenger( - MESSAGES.SEND_FOR_APPROVAL, - request=self.request, - user=self.request.user, - source=self.object, - ) - messenger( - MESSAGES.APPROVE_PAF, - request=self.request, - user=self.request.user, - source=self.object, - related=paf_approvals.filter(user__isnull=False), - ) - # add PAF waiting approval task for paf_approvals users - for paf_approval in paf_approvals.filter(user__isnull=False): - add_task_to_user( - code=PAF_WAITING_APPROVAL, - user=paf_approval.user, - related_obj=self.object, - ) - if paf_approvals.filter(user__isnull=True).exists(): - messenger( - MESSAGES.ASSIGN_PAF_APPROVER, - request=self.request, - user=self.request.user, - source=self.object, - ) - # add PAF waiting assignee task for paf_approvals reviewer_roles - for paf_approval in paf_approvals.filter(user__isnull=True): - add_task_to_user_group( - code=PAF_WAITING_ASSIGNEE, - user_group=paf_approval.paf_reviewer_role.user_roles.all(), - related_obj=self.object, - ) + # add PAF waiting assignee task for paf_approvals reviewer_roles + for paf_approval in paf_approvals.filter(user__isnull=True): + add_task_to_user_group( + code=PAF_WAITING_ASSIGNEE, + user_group=paf_approval.paf_reviewer_role.user_roles.all(), + related_obj=self.object, + ) - project.status = INTERNAL_APPROVAL - project.save(update_fields=["status"]) + project.status = INTERNAL_APPROVAL + project.save(update_fields=["status"]) - messenger( - MESSAGES.PROJECT_TRANSITION, - request=self.request, - user=self.request.user, - source=project, - related=old_stage, - ) + messenger( + MESSAGES.PROJECT_TRANSITION, + request=self.request, + user=self.request.user, + source=project, + related=old_stage, + ) - messages.success( + messages.success( + self.request, + _("PAF has been submitted for approval"), + extra_tags=PROJECT_ACTION_MESSAGE_TAG, + ) + return HttpResponseClientRefresh() + return render( self.request, - _("PAF has been submitted for approval"), - extra_tags=PROJECT_ACTION_MESSAGE_TAG, + self.template_name, + context={ + "form": form, + "project_settings": project_settings, + "paf_approvals": PAFApprovals.objects.filter(project=self.object), + "remaining_document_categories": DocumentCategory.objects.filter( + ~Q(packet_files__project=self.object) + ), + "object": self.object, + }, ) - return response # PROJECT DOCUMENTS @method_decorator(staff_required, name="dispatch") -class UploadDocumentView(DelegatedViewMixin, CreateView): - context_name = "document_form" +class UploadDocumentView(CreateView): form_class = UploadDocumentForm model = Project + template_name = "application_projects/modals/supporting_documents_upload.html" - def form_valid(self, form): - project = self.kwargs["object"] - form.instance.project = project - response = super().form_valid(form) - - messenger( - MESSAGES.UPLOAD_DOCUMENT, - request=self.request, - user=self.request.user, - source=project, + def dispatch(self, request, *args, **kwargs): + self.project = get_object_or_404(Project, id=kwargs.get("pk")) + self.category = get_object_or_404( + DocumentCategory, id=kwargs.get("category_pk") ) + # permission check + return super().dispatch(request, *args, **kwargs) - messages.success( + def get(self, *args, **kwargs): + upload_document_form = self.form_class( + instance=self.project, initial={"category": self.category} + ) + return render( self.request, - _("Document has been uploaded"), - extra_tags=PROJECT_ACTION_MESSAGE_TAG, + self.template_name, + context={ + "form": upload_document_form, + "value": _("Submit"), + "category": self.category, + "object": self.project, + }, ) - return response + def post(self, request, *args, **kwargs): + form = self.form_class( + self.request.POST, + request.FILES, + instance=self.project, + initial={"category": self.category}, + ) + if form.is_valid(): + form.instance.project = self.project + form.save() + messenger( + MESSAGES.UPLOAD_DOCUMENT, + request=self.request, + user=self.request.user, + source=self.project, + ) + return HttpResponse( + status=204, + headers={ + "HX-Trigger": json.dumps( + { + "supportingDocumentUpload": None, + "showMessage": "Document has been uploaded", + } + ), + }, + ) + return render( + self.request, + self.template_name, + context={"form": form, "value": _("Submit"), "object": self.project}, + status=400, + ) @method_decorator(staff_required, name="dispatch") -class RemoveDocumentView(DelegatedViewMixin, FormView): - context_name = "remove_document_form" - form_class = RemoveDocumentForm +class RemoveDocumentView(View): model = Project - def form_valid(self, form): - document_id = form.cleaned_data["id"] - project = self.kwargs["object"] - - try: - project.packet_files.get(pk=document_id).delete() - except PacketFile.DoesNotExist: - pass + def delete(self, *args, **kwargs): + self.project = get_object_or_404(Project, id=kwargs.get("pk")) + self.object = self.project.packet_files.get(pk=kwargs.get("document_pk")) + self.object.delete() messages.success( self.request, _("Document has been removed"), extra_tags=PROJECT_ACTION_MESSAGE_TAG, ) - return redirect(project) + return HttpResponse( + status=204, + headers={ + "HX-Trigger": json.dumps( + { + "supportingDocumentRemove": None, + "showMessage": "Document has been removed", + } + ), + }, + ) @method_decorator(login_required, name="dispatch") @@ -663,17 +746,21 @@ def form_valid(self, form): return response -class SkipPAFApprovalProcessView(DelegatedViewMixin, UpdateView): - context_name = "skip_paf_approval_form" +class SkipPAFApprovalProcessView(UpdateView): model = Project form_class = SkipPAFApprovalProcessForm + def dispatch(self, request, *args, **kwargs): + self.object = get_object_or_404(Project, id=kwargs.get("pk")) + # permissions + return super().dispatch(request, *args, **kwargs) + def form_valid(self, form): - project = self.kwargs["object"] + project = self.object old_stage = project.status project.is_locked = True project.status = CONTRACTING - response = super().form_valid(form) + super().form_valid(form) # remove PAF submission task for staff group remove_tasks_for_user( @@ -709,7 +796,7 @@ def form_valid(self, form): user_group=Group.objects.filter(name=CONTRACTING_GROUP_NAME), related_obj=self.object, ) - return response + return HttpResponseClientRefresh() @method_decorator(login_required, name="dispatch") @@ -796,13 +883,13 @@ def form_valid(self, form): @method_decorator(login_required, name="dispatch") -class ChangePAFStatusView(DelegatedViewMixin, UpdateView): +class ChangePAFStatusView(View): form_class = ChangePAFStatusForm - context_name = "change_paf_status" model = Project + template_name = "application_projects/modals/pafstatus_update.html" def dispatch(self, request, *args, **kwargs): - self.object = self.get_object() + self.object = get_object_or_404(Project, pk=self.kwargs["pk"]) permission, _ = has_permission( "paf_status_update", self.request.user, @@ -812,57 +899,132 @@ def dispatch(self, request, *args, **kwargs): ) return super().dispatch(request, *args, **kwargs) - def form_valid(self, form): - response = super().form_valid(form) - project_settings = ProjectSettings.for_request(self.request) - paf_approval = self.request.user.paf_approvals.filter( - project=self.object, approved=False - ).first() - if not paf_approval: - # get paf project form for not-assigned case - if project_settings.paf_approval_sequential: - paf_approval = self.object.paf_approvals.filter(approved=False).first() - else: - for approval in self.object.paf_approvals.filter(approved=False): - if self.request.user.id in [ - role_user.id - for role_user in get_users_for_groups( - list(approval.paf_reviewer_role.user_roles.all()), - exact_match=True, - ) - ]: - paf_approval = approval - break + def get(self, *args, **kwargs): + form = self.form_class(instance=self.object) + return render( + self.request, + self.template_name, + context={ + "form": form, + "value": _("Update Status"), + "object": self.object, + }, + ) + + def post(self, *args, **kwargs): + form = self.form_class(self.request.POST, instance=self.object) + if form.is_valid(): + form.save() + project_settings = ProjectSettings.for_request(self.request) + paf_approval = self.request.user.paf_approvals.filter( + project=self.object, approved=False + ).first() + if not paf_approval: + # get paf project form for not-assigned case + if project_settings.paf_approval_sequential: + paf_approval = self.object.paf_approvals.filter( + approved=False + ).first() else: - # should never be the case but still to avoid 500. - raise PermissionDenied("User don't have PAF approver roles") + for approval in self.object.paf_approvals.filter(approved=False): + if self.request.user.id in [ + role_user.id + for role_user in get_users_for_groups( + list(approval.paf_reviewer_role.user_roles.all()), + exact_match=True, + ) + ]: + paf_approval = approval + break + else: + # should never be the case but still to avoid 500. + raise PermissionDenied("User don't have PAF approver roles") - paf_status = form.cleaned_data.get("paf_status") - comment = form.cleaned_data.get("comment", "") + paf_status = form.cleaned_data.get("paf_status") + comment = form.cleaned_data.get("comment", "") - paf_status_update_message = _( - "

    {role} has updated PAF status to {paf_status}.

    " - ).format( - role=paf_approval.paf_reviewer_role.label, - paf_status=get_paf_status_display(paf_status).lower(), - ) - Activity.objects.create( - user=self.request.user, - type=ACTION, - source=self.object, - timestamp=timezone.now(), - message=paf_status_update_message, - visibility=TEAM, - ) + paf_status_update_message = _( + "

    {role} has updated PAF status to {paf_status}.

    " + ).format( + role=paf_approval.paf_reviewer_role.label, + paf_status=get_paf_status_display(paf_status).lower(), + ) + Activity.objects.create( + user=self.request.user, + type=ACTION, + source=self.object, + timestamp=timezone.now(), + message=paf_status_update_message, + visibility=TEAM, + ) - if paf_status == REQUEST_CHANGE: - old_stage = self.object.status - self.object.status = DRAFT - self.object.save(update_fields=["status"]) - paf_approval.save() + if paf_status == REQUEST_CHANGE: + old_stage = self.object.status + self.object.status = DRAFT + self.object.save(update_fields=["status"]) + paf_approval.save() - # remove PAF waiting assignee/approval task for paf approval user/reviewer roles. - if project_settings.paf_approval_sequential: + # remove PAF waiting assignee/approval task for paf approval user/reviewer roles. + if project_settings.paf_approval_sequential: + if paf_approval.user: + remove_tasks_for_user( + code=PAF_WAITING_APPROVAL, + user=paf_approval.user, + related_obj=self.object, + ) + else: + remove_tasks_for_user_group( + code=PAF_WAITING_ASSIGNEE, + user_group=paf_approval.paf_reviewer_role.user_roles.all(), + related_obj=self.object, + ) + else: + for approval in self.object.paf_approvals.filter(approved=False): + if approval.user: + remove_tasks_for_user( + code=PAF_WAITING_APPROVAL, + user=approval.user, + related_obj=self.object, + ) + else: + remove_tasks_for_user_group( + code=PAF_WAITING_ASSIGNEE, + user_group=approval.paf_reviewer_role.user_roles.all(), + related_obj=self.object, + ) + + if not paf_approval.user: + paf_approval.user = self.request.user + paf_approval.save(update_fields=["user"]) + + messenger( + MESSAGES.REQUEST_PROJECT_CHANGE, + request=self.request, + user=self.request.user, + source=self.object, + comment=comment, + ) + messenger( + MESSAGES.PROJECT_TRANSITION, + request=self.request, + user=self.request.user, + source=self.object, + related=old_stage, + ) + # add PAF required changes task to staff user group + add_task_to_user( + code=PAF_REQUIRED_CHANGES, + user=self.object.lead, + related_obj=self.object, + ) + + messages.success( + self.request, + _("PAF status has been updated"), + extra_tags=PROJECT_ACTION_MESSAGE_TAG, + ) + elif paf_status == APPROVE: + # remove task for paf approval user/user_group related to this paf_approval of project if paf_approval.user: remove_tasks_for_user( code=PAF_WAITING_APPROVAL, @@ -875,149 +1037,99 @@ def form_valid(self, form): user_group=paf_approval.paf_reviewer_role.user_roles.all(), related_obj=self.object, ) - else: - for approval in self.object.paf_approvals.filter(approved=False): - if approval.user: - remove_tasks_for_user( - code=PAF_WAITING_APPROVAL, - user=approval.user, - related_obj=self.object, - ) - else: - remove_tasks_for_user_group( - code=PAF_WAITING_ASSIGNEE, - user_group=approval.paf_reviewer_role.user_roles.all(), - related_obj=self.object, - ) - - if not paf_approval.user: + paf_approval.approved = True + paf_approval.approved_at = timezone.now() paf_approval.user = self.request.user - paf_approval.save(update_fields=["user"]) + paf_approval.save(update_fields=["approved", "approved_at", "user"]) + if project_settings.paf_approval_sequential: + # notify next approver + if self.object.paf_approvals.filter(approved=False).exists(): + next_paf_approval = self.object.paf_approvals.filter( + approved=False + ).first() + if next_paf_approval.user: + messenger( + MESSAGES.APPROVE_PAF, + request=self.request, + user=self.request.user, + source=self.object, + related=[next_paf_approval], + ) + # add PAF waiting approval task for next paf approval user + add_task_to_user( + code=PAF_WAITING_APPROVAL, + user=next_paf_approval.user, + related_obj=self.object, + ) + else: + messenger( + MESSAGES.ASSIGN_PAF_APPROVER, + request=self.request, + user=self.request.user, + source=self.object, + ) + # add PAF waiting assignee task for nex paf approval reviewer roles + add_task_to_user_group( + code=PAF_WAITING_ASSIGNEE, + user_group=next_paf_approval.paf_reviewer_role.user_roles.all(), + related_obj=self.object, + ) + messages.success( + self.request, + _("PAF has been approved"), + extra_tags=PROJECT_ACTION_MESSAGE_TAG, + ) - messenger( - MESSAGES.REQUEST_PROJECT_CHANGE, - request=self.request, - user=self.request.user, - source=self.object, - comment=comment, - ) - messenger( - MESSAGES.PROJECT_TRANSITION, - request=self.request, - user=self.request.user, - source=self.object, - related=old_stage, - ) - # add PAF required changes task to staff user group - add_task_to_user( - code=PAF_REQUIRED_CHANGES, - user=self.object.lead, - related_obj=self.object, - ) - - messages.success( - self.request, - _("PAF status has been updated"), - extra_tags=PROJECT_ACTION_MESSAGE_TAG, - ) - elif paf_status == APPROVE: - # remove task for paf approval user/user_group related to this paf_approval of project - if paf_approval.user: - remove_tasks_for_user( - code=PAF_WAITING_APPROVAL, - user=paf_approval.user, - related_obj=self.object, - ) - else: - remove_tasks_for_user_group( - code=PAF_WAITING_ASSIGNEE, - user_group=paf_approval.paf_reviewer_role.user_roles.all(), - related_obj=self.object, - ) - paf_approval.approved = True - paf_approval.approved_at = timezone.now() - paf_approval.user = self.request.user - paf_approval.save(update_fields=["approved", "approved_at", "user"]) - if project_settings.paf_approval_sequential: - # notify next approver - if self.object.paf_approvals.filter(approved=False).exists(): - next_paf_approval = self.object.paf_approvals.filter( - approved=False - ).first() - if next_paf_approval.user: - messenger( - MESSAGES.APPROVE_PAF, - request=self.request, - user=self.request.user, - source=self.object, - related=[next_paf_approval], - ) - # add PAF waiting approval task for next paf approval user - add_task_to_user( - code=PAF_WAITING_APPROVAL, - user=next_paf_approval.user, - related_obj=self.object, - ) - else: - messenger( - MESSAGES.ASSIGN_PAF_APPROVER, - request=self.request, - user=self.request.user, - source=self.object, - ) - # add PAF waiting assignee task for nex paf approval reviewer roles - add_task_to_user_group( - code=PAF_WAITING_ASSIGNEE, - user_group=next_paf_approval.paf_reviewer_role.user_roles.all(), - related_obj=self.object, - ) - messages.success( - self.request, - _("PAF has been approved"), - extra_tags=PROJECT_ACTION_MESSAGE_TAG, - ) + if form.cleaned_data["comment"]: + comment = f"

    \"{form.cleaned_data['comment']}.\"

    " - if form.cleaned_data["comment"]: - comment = f"

    \"{form.cleaned_data['comment']}.\"

    " + message = paf_status_update_message + comment - message = paf_status_update_message + comment - - Activity.objects.create( - user=self.request.user, - type=COMMENT, - source=self.object, - timestamp=timezone.now(), - message=message, - visibility=TEAM, - ) + Activity.objects.create( + user=self.request.user, + type=COMMENT, + source=self.object, + timestamp=timezone.now(), + message=message, + visibility=TEAM, + ) - if self.object.is_approved_by_all_paf_reviewers: - old_stage = self.object.status - self.object.is_locked = True - self.object.status = CONTRACTING - self.object.save(update_fields=["is_locked", "status"]) + if self.object.is_approved_by_all_paf_reviewers: + old_stage = self.object.status + self.object.is_locked = True + self.object.status = CONTRACTING + self.object.save(update_fields=["is_locked", "status"]) - messenger( - MESSAGES.PROJECT_TRANSITION, - request=self.request, - user=self.request.user, - source=self.object, - related=old_stage, - ) - # add project waiting contract task to staff/contracting groups - if settings.STAFF_UPLOAD_CONTRACT: - add_task_to_user( - code=PROJECT_WAITING_CONTRACT, - user=self.object.lead, - related_obj=self.object, - ) - else: - add_task_to_user_group( - code=PROJECT_WAITING_CONTRACT, - user_group=Group.objects.filter(name=CONTRACTING_GROUP_NAME), - related_obj=self.object, + messenger( + MESSAGES.PROJECT_TRANSITION, + request=self.request, + user=self.request.user, + source=self.object, + related=old_stage, ) - return response + # add project waiting contract task to staff/contracting groups + if settings.STAFF_UPLOAD_CONTRACT: + add_task_to_user( + code=PROJECT_WAITING_CONTRACT, + user=self.object.lead, + related_obj=self.object, + ) + else: + add_task_to_user_group( + code=PROJECT_WAITING_CONTRACT, + user_group=Group.objects.filter(name=CONTRACTING_GROUP_NAME), + related_obj=self.object, + ) + return HttpResponseClientRefresh() + return render( + self.request, + self.template_name, + context={ + "form": form, + "value": _("Update Status"), + "object": self.object, + }, + ) class ChangeProjectstatusView(DelegatedViewMixin, UpdateView): @@ -1070,10 +1182,10 @@ def form_valid(self, form): @method_decorator(login_required, name="dispatch") -class UpdateAssignApproversView(DelegatedViewMixin, UpdateView): - context_name = "assign_approvers_form" +class UpdateAssignApproversView(View): form_class = AssignApproversForm model = Project + template_name = "application_projects/modals/assign_pafapprovers.html" def dispatch(self, request, *args, **kwargs): self.project = get_object_or_404(Project, pk=self.kwargs["pk"]) @@ -1086,70 +1198,102 @@ def dispatch(self, request, *args, **kwargs): ) return super().dispatch(request, *args, **kwargs) - def form_valid(self, form): + def get(self, *args, **kwargs): from ..forms.project import get_latest_project_paf_approval_via_roles - project = self.kwargs["object"] + form = self.form_class(user=self.request.user, instance=self.project) + paf_approval = get_latest_project_paf_approval_via_roles( + project=self.project, roles=self.request.user.groups.all() + ) + return render( + self.request, + self.template_name, + context={ + "form": form, + "value": _("Submit"), + "pafapprover_exists": True if paf_approval.user else False, + "object": self.project, + }, + ) + + def post(self, *args, **kwargs): + from ..forms.project import get_latest_project_paf_approval_via_roles + + form = self.form_class( + self.request.POST, user=self.request.user, instance=self.project + ) old_paf_approval = get_latest_project_paf_approval_via_roles( - project=project, roles=self.request.user.groups.all() + project=self.project, roles=self.request.user.groups.all() ) - response = super().form_valid(form) + if form.is_valid(): + form.save() - # remove current task of user/user_group related to latest paf_approval of project - if old_paf_approval.user: - remove_tasks_for_user( - code=PAF_WAITING_APPROVAL, - user=old_paf_approval.user, - related_obj=project, - ) - else: - remove_tasks_for_user_group( - code=PAF_WAITING_ASSIGNEE, - user_group=old_paf_approval.paf_reviewer_role.user_roles.all(), - related_obj=project, + # remove current task of user/user_group related to latest paf_approval of project + if old_paf_approval.user: + remove_tasks_for_user( + code=PAF_WAITING_APPROVAL, + user=old_paf_approval.user, + related_obj=self.project, + ) + else: + remove_tasks_for_user_group( + code=PAF_WAITING_ASSIGNEE, + user_group=old_paf_approval.paf_reviewer_role.user_roles.all(), + related_obj=self.project, + ) + + paf_approval = get_latest_project_paf_approval_via_roles( + project=self.project, roles=self.request.user.groups.all() ) - paf_approval = get_latest_project_paf_approval_via_roles( - project=project, roles=self.request.user.groups.all() - ) + if paf_approval.user: + messenger( + MESSAGES.APPROVE_PAF, + request=self.request, + user=self.request.user, + source=self.project, + related=[paf_approval], + ) + # add PAF waiting approval task to updated paf_approval user + add_task_to_user( + code=PAF_WAITING_APPROVAL, + user=paf_approval.user, + related_obj=self.project, + ) + else: + messenger( + MESSAGES.ASSIGN_PAF_APPROVER, + request=self.request, + user=self.request.user, + source=self.project, + ) + # add paf waiting for assignee task + add_task_to_user_group( + code=PAF_WAITING_ASSIGNEE, + user_group=paf_approval.paf_reviewer_role.user_roles.all(), + related_obj=self.project, + ) - if paf_approval.user: - messenger( - MESSAGES.APPROVE_PAF, - request=self.request, - user=self.request.user, - source=self.object, - related=[paf_approval], - ) - # add PAF waiting approval task to updated paf_approval user - add_task_to_user( - code=PAF_WAITING_APPROVAL, - user=paf_approval.user, - related_obj=self.object, - ) - else: - messenger( - MESSAGES.ASSIGN_PAF_APPROVER, - request=self.request, - user=self.request.user, - source=self.object, - ) - # add paf waiting for assignee task - add_task_to_user_group( - code=PAF_WAITING_ASSIGNEE, - user_group=paf_approval.paf_reviewer_role.user_roles.all(), - related_obj=self.object, - ) + return HttpResponseClientRefresh() - return response + return render( + self.request, + self.template_name, + context={ + "form": form, + "value": _("Submit"), + "pafapprover_exists": True if old_paf_approval.user else False, + "object": self.project, + }, + ) -class UpdatePAFApproversView(DelegatedViewMixin, UpdateView): - context_name = "update_approvers_form" +class UpdatePAFApproversView(View): form_class = ApproversForm model = Project + template_name = "application_projects/modals/update_pafapprovers.html" def dispatch(self, request, *args, **kwargs): self.project = get_object_or_404(Project, pk=self.kwargs["pk"]) @@ -1162,88 +1306,136 @@ def dispatch(self, request, *args, **kwargs): ) return super().dispatch(request, *args, **kwargs) - def form_valid(self, form): - project = self.kwargs["object"] + def get(self, *args, **kwargs): + form = self.form_class(instance=self.project) + project_settings = ProjectSettings.for_request(self.request) + return render( + self.request, + self.template_name, + context={ + "form": form, + "value": _("Submit"), + "project_settings": project_settings, + "object": self.project, + }, + ) + + def post(self, *args, **kwargs): + form = self.form_class(self.request.POST, instance=self.project) project_settings = ProjectSettings.for_request(self.request) - old_approvers = None - if self.object.paf_approvals.exists(): - old_approvers = list( - project.paf_approvals.filter(approved=False).values_list( - "user__id", flat=True - ) - ) - # remove PAF waiting assignee/approval task for paf approval user/reviewer roles. - if project_settings.paf_approval_sequential: - paf_approval = project.paf_approvals.filter(approved=False).first() - if paf_approval.user: - remove_tasks_for_user( - code=PAF_WAITING_APPROVAL, - user=paf_approval.user, - related_obj=project, - ) - else: - remove_tasks_for_user_group( - code=PAF_WAITING_ASSIGNEE, - user_group=paf_approval.paf_reviewer_role.user_roles.all(), - related_obj=project, + if form.is_valid(): + old_approvers = None + if self.project.paf_approvals.exists(): + old_approvers = list( + self.project.paf_approvals.filter(approved=False).values_list( + "user__id", flat=True + ) ) - else: - for approval in project.paf_approvals.filter(approved=False): - if approval.user: + # remove PAF waiting assignee/approval task for paf approval user/reviewer roles. + if project_settings.paf_approval_sequential: + paf_approval = self.project.paf_approvals.filter(approved=False).first() + if paf_approval.user: remove_tasks_for_user( code=PAF_WAITING_APPROVAL, - user=approval.user, - related_obj=project, + user=paf_approval.user, + related_obj=self.project, ) else: remove_tasks_for_user_group( code=PAF_WAITING_ASSIGNEE, - user_group=approval.paf_reviewer_role.user_roles.all(), - related_obj=project, + user_group=paf_approval.paf_reviewer_role.user_roles.all(), + related_obj=self.project, ) + else: + for approval in self.project.paf_approvals.filter(approved=False): + if approval.user: + remove_tasks_for_user( + code=PAF_WAITING_APPROVAL, + user=approval.user, + related_obj=self.project, + ) + else: + remove_tasks_for_user_group( + code=PAF_WAITING_ASSIGNEE, + user_group=approval.paf_reviewer_role.user_roles.all(), + related_obj=self.project, + ) - response = super().form_valid(form) + form.save() - paf_approvals = self.object.paf_approvals.filter(approved=False) + paf_approvals = self.project.paf_approvals.filter(approved=False) - if old_approvers and paf_approvals: - # if approvers exists already - if project_settings.paf_approval_sequential: - user = paf_approvals.first().user - if user and user.id != old_approvers[0]: - # notify only if first user/approver is updated - messenger( - MESSAGES.APPROVE_PAF, - request=self.request, - user=self.request.user, - source=self.object, - related=[paf_approvals.first()], - ) - # add PAF waiting approval task to paf_approval user - add_task_to_user( - code=PAF_WAITING_APPROVAL, user=user, related_obj=self.object - ) - elif not user: - messenger( - MESSAGES.ASSIGN_PAF_APPROVER, - request=self.request, - user=self.request.user, - source=self.object, - ) - # add PAF waiting assignee to paf_approvals reviewer roles - add_task_to_user_group( - code=PAF_WAITING_ASSIGNEE, - user_group=paf_approvals.first().paf_reviewer_role.user_roles.all(), - related_obj=self.object, - ) - else: + if old_approvers and paf_approvals: + # if approvers exists already + if project_settings.paf_approval_sequential: + user = paf_approvals.first().user + if user and user.id != old_approvers[0]: + # notify only if first user/approver is updated + messenger( + MESSAGES.APPROVE_PAF, + request=self.request, + user=self.request.user, + source=self.project, + related=[paf_approvals.first()], + ) + # add PAF waiting approval task to paf_approval user + add_task_to_user( + code=PAF_WAITING_APPROVAL, + user=user, + related_obj=self.project, + ) + elif not user: + messenger( + MESSAGES.ASSIGN_PAF_APPROVER, + request=self.request, + user=self.request.user, + source=self.project, + ) + # add PAF waiting assignee to paf_approvals reviewer roles + add_task_to_user_group( + code=PAF_WAITING_ASSIGNEE, + user_group=paf_approvals.first().paf_reviewer_role.user_roles.all(), + related_obj=self.project, + ) + else: + if paf_approvals.filter(user__isnull=False).exists(): + messenger( + MESSAGES.APPROVE_PAF, + request=self.request, + user=self.request.user, + source=self.project, + related=paf_approvals.filter(user__isnull=False), + ) + # add PAF waiting approval task for paf_approvals users + for paf_approval in paf_approvals.filter(user__isnull=False): + add_task_to_user( + code=PAF_WAITING_APPROVAL, + user=paf_approval.user, + related_obj=self.project, + ) + if paf_approvals.filter(user__isnull=True).exists(): + messenger( + MESSAGES.ASSIGN_PAF_APPROVER, + request=self.request, + user=self.request.user, + source=self.project, + ) + # add PAF waiting assignee task for paf_approvals reviewer_roles + for paf_approval in paf_approvals.filter(user__isnull=True): + add_task_to_user_group( + code=PAF_WAITING_ASSIGNEE, + user_group=paf_approval.paf_reviewer_role.user_roles.all(), + related_obj=self.project, + ) + elif paf_approvals: + # :todo: check if this is covering any case(might be a duplicate of SendForApprovalView) if paf_approvals.filter(user__isnull=False).exists(): messenger( MESSAGES.APPROVE_PAF, request=self.request, user=self.request.user, - source=self.object, + source=self.project, related=paf_approvals.filter(user__isnull=False), ) # add PAF waiting approval task for paf_approvals users @@ -1251,60 +1443,39 @@ def form_valid(self, form): add_task_to_user( code=PAF_WAITING_APPROVAL, user=paf_approval.user, - related_obj=self.object, + related_obj=self.project, ) if paf_approvals.filter(user__isnull=True).exists(): messenger( MESSAGES.ASSIGN_PAF_APPROVER, request=self.request, user=self.request.user, - source=self.object, + source=self.project, ) # add PAF waiting assignee task for paf_approvals reviewer_roles for paf_approval in paf_approvals.filter(user__isnull=True): add_task_to_user_group( code=PAF_WAITING_ASSIGNEE, user_group=paf_approval.paf_reviewer_role.user_roles.all(), - related_obj=self.object, + related_obj=self.project, ) - elif paf_approvals: - # :todo: check if this is covering any case(might be a duplicate of SendForApprovalView) - if paf_approvals.filter(user__isnull=False).exists(): - messenger( - MESSAGES.APPROVE_PAF, - request=self.request, - user=self.request.user, - source=self.object, - related=paf_approvals.filter(user__isnull=False), - ) - # add PAF waiting approval task for paf_approvals users - for paf_approval in paf_approvals.filter(user__isnull=False): - add_task_to_user( - code=PAF_WAITING_APPROVAL, - user=paf_approval.user, - related_obj=self.object, - ) - if paf_approvals.filter(user__isnull=True).exists(): - messenger( - MESSAGES.ASSIGN_PAF_APPROVER, - request=self.request, - user=self.request.user, - source=self.object, - ) - # add PAF waiting assignee task for paf_approvals reviewer_roles - for paf_approval in paf_approvals.filter(user__isnull=True): - add_task_to_user_group( - code=PAF_WAITING_ASSIGNEE, - user_group=paf_approval.paf_reviewer_role.user_roles.all(), - related_obj=self.object, - ) - messages.success( + messages.success( + self.request, + _("PAF approvers have been updated"), + extra_tags=PROJECT_ACTION_MESSAGE_TAG, + ) + return HttpResponseClientRefresh() + return render( self.request, - _("PAF approvers have been updated"), - extra_tags=PROJECT_ACTION_MESSAGE_TAG, + self.template_name, + context={ + "form": form, + "value": _("Submit"), + "project_settings": project_settings, + "object": self.project, + }, ) - return response class BaseProjectDetailView(ReportingMixin, DetailView): @@ -1332,20 +1503,13 @@ class AdminProjectDetailView( form_views = [ ApproveContractView, CommentFormView, - RemoveDocumentView, SelectDocumentView, - SendForApprovalView, - UpdatePAFApproversView, ReportFrequencyUpdate, UpdateLeadView, UpdateProjectTitleView, UploadContractView, - UploadDocumentView, - UpdateAssignApproversView, - ChangePAFStatusView, ChangeProjectstatusView, ChangeInvoiceStatusView, - SkipPAFApprovalProcessView, ] model = Project template_name_suffix = "_admin_detail" @@ -1366,10 +1530,6 @@ def get_context_data(self, **kwargs): project_settings = ProjectSettings.for_request(self.request) context["project_settings"] = project_settings context["paf_approvals"] = PAFApprovals.objects.filter(project=self.object) - context["all_document_categories"] = DocumentCategory.objects.all() - context["remaining_document_categories"] = DocumentCategory.objects.filter( - ~Q(packet_files__project=self.object) - ) context["all_contract_document_categories"] = ( ContractDocumentCategory.objects.all() ) @@ -1409,7 +1569,6 @@ class ApplicantProjectDetailView( CommentFormView, SelectDocumentView, UploadContractView, - UploadDocumentView, UploadContractDocumentView, RemoveContractDocumentView, SubmitContractDocumentsView, @@ -1573,8 +1732,7 @@ def test_func(self): @method_decorator(staff_or_finance_or_contracting_required, name="dispatch") -class ProjectDetailApprovalView(DelegateableView, DetailView): - form_views = [ChangePAFStatusView, UpdateAssignApproversView] +class ProjectDetailApprovalView(DetailView): model = Project template_name_suffix = "_approval_detail" diff --git a/hypha/apply/projects/views/project_partials.py b/hypha/apply/projects/views/project_partials.py index fb1ebd1d40..2763da5024 100644 --- a/hypha/apply/projects/views/project_partials.py +++ b/hypha/apply/projects/views/project_partials.py @@ -1,7 +1,7 @@ from urllib.parse import parse_qs, urlparse from django.contrib.auth.decorators import login_required -from django.db.models import Count +from django.db.models import Count, Q from django.shortcuts import get_object_or_404, render from django.urls import reverse_lazy from django.utils.translation import gettext as _ @@ -14,7 +14,7 @@ from ..constants import statuses_and_table_statuses_mapping from ..models.payment import Invoice -from ..models.project import Project +from ..models.project import DocumentCategory, Project from ..permissions import has_permission from ..utils import get_project_status_choices @@ -28,6 +28,20 @@ def partial_project_activities(request, pk): return render(request, "activity/include/action_list.html", ctx) +@login_required +@require_GET +def partial_supporting_documents(request, pk): + project = get_object_or_404(Project, pk=pk) + ctx = {"object": project} + ctx["all_document_categories"] = DocumentCategory.objects.all() + ctx["remaining_document_categories"] = DocumentCategory.objects.filter( + ~Q(packet_files__project=project) + ) + return render( + request, "application_projects/partials/supporting_documents.html", ctx + ) + + @login_required @require_GET def get_project_status_counts(request):