{% trans "Project Information" %}
+
+
-
+
+
+ {% if object.output_answers %}
+
+
+
+ {% trans "Proposed start date" %}
+{{ object.proposed_start|date:"DATE_FORMAT"|default:"-" }}
+
+
+
+ {% trans "Project Proposed end date" %}
+{{ object.proposed_end|date:"DATE_FORMAT"|default:"-" }}
+
+
+
+ {% trans "Legal name" %}
+{{ object.contact_legal_name|default:"-" }}
+
+
+
+ {% trans "E-mail" %}
+{{ object.contact_email|default:"-" }}
+
+
+
+ {% trans "Address" %}
+{{ object.get_address_display|default:"-"}}
+
+
+
+ {% trans "Phone" %}
+{{ object.phone|default:"-" }}
+
+
+
+ {% if object.sent_to_compliance_at %}
+ {% trans "Value" %}
+{{ CURRENCY_SYMBOL }}{{ object.value|default:"-" }}
+
+
+ {% endif %}
+
+ {% trans "Sent to Compliance" %}
+{{ object.sent_to_compliance_at|date:"DATE_FORMAT" }}
+
+ {{ object.output_answers }}
+
+ {% endif %}
-
{% endblock content %}
+
+{% block extra_js %}
+ {{ block.super }}
+
+
+{% endblock %}
diff --git a/hypha/apply/projects/templatetags/approval_tools.py b/hypha/apply/projects/templatetags/approval_tools.py
index 84dc2891c7..988d70a77d 100644
--- a/hypha/apply/projects/templatetags/approval_tools.py
+++ b/hypha/apply/projects/templatetags/approval_tools.py
@@ -15,7 +15,26 @@ def can_send_for_approval(project, user):
@register.simple_tag
def user_can_approve_project(project, user):
- return user.is_approver and not user_has_approved(project, user)
+ if not user_has_approved(project, user):
+ if user.is_finance or user.is_contracting or user.is_approver:
+ return True
+ return False
+
+
+@register.simple_tag
+def user_can_update_paf_status(project, user):
+ if not project.user == user:
+ if project.can_update_paf_status:
+ if user.is_finance or user.is_contracting or user.is_approver:
+ return True
+ return False
+
+
+@register.simple_tag
+def user_can_final_approve_project(project, user):
+ if user.is_approver and user.is_contracting and project.can_make_final_approval:
+ return True
+ return False
@register.simple_tag
diff --git a/hypha/apply/projects/templatetags/contract_tools.py b/hypha/apply/projects/templatetags/contract_tools.py
index efb2701a38..de991f0d9e 100644
--- a/hypha/apply/projects/templatetags/contract_tools.py
+++ b/hypha/apply/projects/templatetags/contract_tools.py
@@ -1,6 +1,6 @@
from django import template
-from ..models.project import COMMITTED
+from ..models.project import COMMITTED, WAITING_FOR_APPROVAL
register = template.Library()
@@ -8,7 +8,7 @@
@register.simple_tag
def user_can_upload_contract(project, user):
if user.is_apply_staff:
- return project.status != COMMITTED
+ return project.status not in [COMMITTED, WAITING_FOR_APPROVAL]
# Does the Project have any unapproved contracts?
latest_contract = project.contracts.order_by('-created_at').first()
diff --git a/hypha/apply/projects/tests/factories.py b/hypha/apply/projects/tests/factories.py
index 50c7bee415..d781c7cdb5 100644
--- a/hypha/apply/projects/tests/factories.py
+++ b/hypha/apply/projects/tests/factories.py
@@ -19,6 +19,7 @@
Deliverable,
DocumentCategory,
PacketFile,
+ PAFReviewersRole,
Project,
ProjectApprovalForm,
)
@@ -103,6 +104,13 @@ class Params:
)
+class PAFReviewerRoleFactory(factory.django.DjangoModelFactory):
+ role = factory.Faker('name')
+
+ class Meta:
+ model = PAFReviewersRole
+
+
class ContractFactory(factory.django.DjangoModelFactory):
approver = factory.SubFactory(StaffFactory)
project = factory.SubFactory(ProjectFactory)
diff --git a/hypha/apply/projects/tests/test_forms.py b/hypha/apply/projects/tests/test_forms.py
index 769a3d6619..20d2c53d1f 100644
--- a/hypha/apply/projects/tests/test_forms.py
+++ b/hypha/apply/projects/tests/test_forms.py
@@ -5,6 +5,7 @@
from django.core.files.uploadedfile import SimpleUploadedFile
from django.test import TestCase, override_settings
+from hypha.apply.home.factories import ApplySiteFactory
from hypha.apply.users.tests.factories import (
Finance2Factory,
FinanceFactory,
@@ -21,6 +22,8 @@
filter_request_choices,
)
from ..forms.project import (
+ ChangePAFStatusForm,
+ FinalApprovalForm,
ProjectApprovalForm,
StaffUploadContractForm,
UploadContractForm,
@@ -37,9 +40,11 @@
SUBMITTED,
invoice_status_user_choices,
)
+from ..models.project import APPROVE, ProjectSettings
from .factories import (
DocumentCategoryFactory,
InvoiceFactory,
+ PAFReviewerRoleFactory,
ProjectFactory,
SupportingDocumentFactory,
address_to_form_data,
@@ -262,6 +267,56 @@ def test_valid_checks_required_for_approved_by_finance1(self):
self.assertTrue(form.is_valid(), form.errors.as_text())
+class TestChangePAFStatusForm(TestCase):
+
+ @classmethod
+ def setUpTestData(cls):
+ super().setUpTestData()
+ apply_site = ApplySiteFactory()
+ cls.project_setting, _ = ProjectSettings.objects.get_or_create(site_id=apply_site.id)
+ cls.project_setting.use_settings = True
+ cls.project_setting.save()
+ cls.role = PAFReviewerRoleFactory(page=cls.project_setting)
+
+ def test_paf_status_is_required(self):
+ project = ProjectFactory(in_approval=True)
+ user = StaffFactory()
+ form = ChangePAFStatusForm(data={'role': self.role}, instance=project, user=user)
+ self.assertFalse(form.is_valid())
+ self.assertIn('paf_status', form.errors.keys())
+
+ def test_role_is_required(self):
+ project = ProjectFactory(in_approval=True)
+ user = StaffFactory()
+ form = ChangePAFStatusForm(data={'paf_status': APPROVE}, instance=project, user=user)
+ self.assertFalse(form.is_valid())
+ self.assertIn('role', form.errors.keys())
+
+ def test_comment_is_not_required(self):
+ project = ProjectFactory(in_approval=True)
+ user = StaffFactory()
+ form = ChangePAFStatusForm(data={'role': self.role, 'paf_status': APPROVE}, instance=project, user=user)
+ self.assertTrue(form.is_valid())
+ self.assertEqual(form.errors, {})
+
+
+class TestFinalApprovalForm(TestCase):
+ def test_final_approval_status_is_required(self):
+ project = ProjectFactory(in_approval=True)
+ user = StaffFactory()
+ form = FinalApprovalForm(data={'comment': ''}, instance=project, user=user)
+ self.assertFalse(form.is_valid())
+ self.assertNotEqual(form.errors, {})
+ self.assertIn('final_approval_status', form.errors.keys())
+
+ def test_comment_is_not_required(self):
+ project = ProjectFactory(in_approval=True)
+ user = StaffFactory()
+ form = FinalApprovalForm(data={'final_approval_status': APPROVE}, instance=project, user=user)
+ self.assertTrue(form.is_valid())
+ self.assertEqual(form.errors, {})
+
+
class TestProjectApprovalForm(TestCase):
def test_updating_fields_sets_changed_flag(self):
project = ProjectFactory()
diff --git a/hypha/apply/projects/tests/test_views.py b/hypha/apply/projects/tests/test_views.py
index d8c1c6e1d9..163fd6d4a7 100644
--- a/hypha/apply/projects/tests/test_views.py
+++ b/hypha/apply/projects/tests/test_views.py
@@ -9,9 +9,12 @@
from django.utils import timezone
from hypha.apply.funds.tests.factories import LabSubmissionFactory
+from hypha.apply.home.factories import ApplySiteFactory
from hypha.apply.users.tests.factories import (
ApplicantFactory,
ApproverFactory,
+ ContractingApproverFactory,
+ ContractingFactory,
FinanceFactory,
ReviewerFactory,
StaffFactory,
@@ -23,13 +26,22 @@
from ..files import get_files
from ..forms import SetPendingForm
from ..models.payment import CHANGES_REQUESTED_BY_STAFF, SUBMITTED
-from ..models.project import COMMITTED, CONTRACTING, IN_PROGRESS
+from ..models.project import (
+ APPROVE,
+ COMMITTED,
+ CONTRACTING,
+ IN_PROGRESS,
+ REQUEST_CHANGE,
+ WAITING_FOR_APPROVAL,
+ ProjectSettings,
+)
from ..views.project import ContractsMixin, ProjectDetailSimplifiedView
from .factories import (
ContractFactory,
DocumentCategoryFactory,
InvoiceFactory,
PacketFileFactory,
+ PAFReviewerRoleFactory,
ProjectFactory,
ReportFactory,
ReportVersionFactory,
@@ -66,40 +78,181 @@ def test_update_lead_from_none(self):
self.assertEqual(project.lead, new_lead)
-class TestCreateApprovalView(BaseViewTestCase):
+class TestSendForApprovalView(BaseViewTestCase):
base_view_name = 'detail'
url_name = 'funds:projects:{}'
- user_factory = ApproverFactory
+ user_factory = StaffFactory
def get_kwargs(self, instance):
return {'pk': instance.id}
- def test_creating_an_approval_happy_path(self):
- project = ProjectFactory(in_approval=True)
- self.assertEqual(project.approvals.count(), 0)
+ def test_send_for_approval_fails_when_project_is_locked(self):
+ project = ProjectFactory(is_locked=True)
- response = self.post_page(project, {'form-submitted-add_approval_form': '', 'by': self.user.id})
+ # The view doesn't have any custom changes when form validation fails
+ # so check that directly.
+ form = SetPendingForm(instance=project)
+ self.assertFalse(form.is_valid())
+
+ def test_send_for_approval_fails_when_project_is_not_in_committed_state(self):
+ project = ProjectFactory(status='in_progress')
+
+ # The view doesn't have any custom changes when form validation fails
+ # so check that directly.
+ form = SetPendingForm(instance=project)
+ self.assertFalse(form.is_valid())
+
+ def test_send_for_approval_happy_path(self):
+ project = ProjectFactory(is_locked=False, status=COMMITTED)
+
+ response = self.post_page(project, {'form-submitted-request_approval_form': ''})
self.assertEqual(response.status_code, 200)
project.refresh_from_db()
- self.assertEqual(project.approvals.count(), 1)
+
self.assertFalse(project.is_locked)
- self.assertEqual(project.status, 'contracting')
+ self.assertEqual(project.status, WAITING_FOR_APPROVAL)
+
+
+class TestChangePAFStatusView(BaseViewTestCase):
+ base_view_name = 'detail'
+ url_name = 'funds:projects:{}'
+ user_factory = StaffFactory
+
+ @classmethod
+ def setUpTestData(cls):
+ super().setUpTestData()
+ apply_site = ApplySiteFactory()
+ cls.project_setting, _ = ProjectSettings.objects.get_or_create(site_id=apply_site.id)
+ cls.project_setting.use_settings = True
+ cls.project_setting.save()
+ cls.role = PAFReviewerRoleFactory(page=cls.project_setting)
+
+ def get_kwargs(self, instance):
+ return {'pk': instance.id}
+
+ def test_applicant_cant_update_paf_status(self):
+ user = ApplicantFactory()
+ self.client.force_login(user=user)
+ project = ProjectFactory(in_approval=True)
+
+ response = self.post_page(project, {'form-submitted-change_paf_status': '', 'paf_status': APPROVE,
+ 'role': self.role.id})
+ self.assertEqual(response.status_code, 403)
- approval = project.approvals.first()
- self.assertEqual(approval.project_id, project.pk)
+ def test_staff_can_update_paf_status(self):
+ user = StaffFactory()
+ self.client.force_login(user=user)
+ project = ProjectFactory(in_approval=True)
+
+ response = self.post_page(project, {'form-submitted-change_paf_status': '', 'paf_status': APPROVE,
+ 'role': self.role.id})
+ self.assertEqual(response.status_code, 200)
- def test_creating_an_approval_other_approver(self):
+ def test_finance_can_update_paf_status(self):
+ user = FinanceFactory()
+ self.client.force_login(user=user)
project = ProjectFactory(in_approval=True)
- self.assertEqual(project.approvals.count(), 0)
- other = self.user_factory()
- response = self.post_page(project, {'form-submitted-add_approval_form': '', 'by': other.id})
+ response = self.post_page(project, {'form-submitted-change_paf_status': '', 'paf_status': APPROVE,
+ 'role': self.role.id})
+ self.assertEqual(response.status_code, 200)
+
+ def test_contracting_can_update_paf_status(self):
+ user = ContractingFactory()
+ self.client.force_login(user=user)
+ project = ProjectFactory(in_approval=True)
+
+ response = self.post_page(project, {'form-submitted-change_paf_status': '', 'paf_status': APPROVE,
+ 'role': self.role.id})
+ self.assertEqual(response.status_code, 200)
+
+ def test_reviewer_approve_paf(self):
+ # reviewer can be staff, finance or contracting
+ project = ProjectFactory(in_approval=True)
+
+ response = self.post_page(project, {'form-submitted-change_paf_status': '', 'role': self.role.id,
+ 'paf_status': APPROVE})
+ self.assertEqual(response.status_code, 200)
+ project.refresh_from_db()
+ self.assertIn(self.role.role, project.paf_reviews_meta_data.keys())
+ self.assertIn('approve', project.paf_reviews_meta_data[self.role.role]['status'])
+
+ def test_reviewer_rejects_paf(self):
+ # reviewer can be staff, finance or contracting
+ project = ProjectFactory(in_approval=True)
+
+ response = self.post_page(project, {'form-submitted-change_paf_status': '', 'paf_status': REQUEST_CHANGE,
+ 'role': self.role.id})
+ self.assertEqual(response.status_code, 200)
+ project.refresh_from_db()
+ self.assertEqual(project.status, COMMITTED)
+ self.assertIn(self.role.role, project.paf_reviews_meta_data.keys())
+ self.assertEqual('request_change', project.paf_reviews_meta_data[self.role.role]['status'])
+
+
+class TestFinalApprovalView(BaseViewTestCase):
+ base_view_name = 'detail'
+ url_name = 'funds:projects:{}'
+ user_factory = ContractingApproverFactory
+
+ def get_kwargs(self, instance):
+ return {'pk': instance.id}
+
+ def test_final_approver_cant_be_staff(self):
+ user = StaffFactory()
+ self.client.force_login(user)
+ project = ProjectFactory(in_approval=True)
+ response = self.post_page(project, {'form-submitted-final_approval_form': '', 'final_approval_status': APPROVE})
+ self.assertEqual(response.status_code, 403)
+
+ def test_final_approver_cant_be_finance(self):
+ user = FinanceFactory()
+ self.client.force_login(user)
+ project = ProjectFactory(in_approval=True)
+ response = self.post_page(project, {'form-submitted-final_approval_form': '', 'final_approval_status': APPROVE})
+ self.assertEqual(response.status_code, 403)
+
+ def test_final_approver_cant_be_contracting(self):
+ user = ContractingFactory()
+ self.client.force_login(user)
+ project = ProjectFactory(in_approval=True)
+ response = self.post_page(project, {'form-submitted-final_approval_form': '', 'final_approval_status': APPROVE})
+ self.assertEqual(response.status_code, 403)
+
+ def test_final_approver_cant_be_approver(self):
+ user = ApproverFactory()
+ self.client.force_login(user)
+ project = ProjectFactory(in_approval=True)
+ response = self.post_page(project, {'form-submitted-final_approval_form': '', 'final_approval_status': APPROVE})
+ self.assertEqual(response.status_code, 403)
+
+ def test_final_approver_cant_be_applicant(self):
+ user = ApplicantFactory()
+ self.client.force_login(user)
+ project = ProjectFactory(in_approval=True)
+ response = self.post_page(project, {'form-submitted-final_approval_form': '', 'final_approval_status': APPROVE})
+ self.assertEqual(response.status_code, 403)
+
+ def test_final_approval(self):
+ project = ProjectFactory(in_approval=True)
+
+ response = self.post_page(project, {'form-submitted-final_approval_form': '', 'final_approval_status': APPROVE})
self.assertEqual(response.status_code, 200)
project.refresh_from_db()
- self.assertEqual(project.approvals.count(), 0)
self.assertTrue(project.is_locked)
+ self.assertEqual(project.status, CONTRACTING)
+
+ def test_final_rejection(self):
+ project = ProjectFactory(in_approval=True)
+
+ response = self.post_page(project, {'form-submitted-final_approval_form': '', 'final_approval_status': REQUEST_CHANGE})
+ self.assertEqual(response.status_code, 200)
+
+ project.refresh_from_db()
+ self.assertFalse(project.is_locked)
+ self.assertEqual(project.status, COMMITTED)
class BaseProjectDetailTestCase(BaseViewTestCase):
@@ -170,62 +323,6 @@ def test_doesnt_have_access(self):
self.assertEqual(response.status_code, 403)
-class TestStaffProjectRejectView(BaseProjectDetailTestCase):
- user_factory = StaffFactory
-
- def test_cant_reject(self):
- project = ProjectFactory(in_approval=True)
- response = self.post_page(project, {
- 'form-submitted-rejection_form': '',
- 'comment': 'needs to change',
- })
- self.assertEqual(response.status_code, 403)
- project = self.refresh(project)
- self.assertEqual(project.status, COMMITTED)
- self.assertTrue(project.is_locked)
-
-
-class TestApproverProjectRejectView(BaseProjectDetailTestCase):
- user_factory = ApproverFactory
-
- def test_can_reject(self):
- project = ProjectFactory(in_approval=True)
- response = self.post_page(project, {
- 'form-submitted-rejection_form': '',
- 'comment': 'needs to change',
- })
- self.assertEqual(response.status_code, 200)
- project = self.refresh(project)
- self.assertEqual(project.status, COMMITTED)
- self.assertFalse(project.is_locked)
-
- def test_cant_reject_no_comment(self):
- project = ProjectFactory(in_approval=True)
- response = self.post_page(project, {
- 'form-submitted-rejection_form': '',
- 'comment': '',
- })
- self.assertEqual(response.status_code, 200)
- project = self.refresh(project)
- self.assertEqual(project.status, COMMITTED)
- self.assertTrue(project.is_locked)
-
-
-class TestUserProjectRejectView(BaseProjectDetailTestCase):
- user_factory = ApplicantFactory
-
- def test_cant_reject(self):
- project = ProjectFactory(in_approval=True, user=self.user)
- response = self.post_page(project, {
- 'form-submitted-rejection_form': '',
- 'comment': 'needs to change',
- })
- self.assertEqual(response.status_code, 200)
- project = self.refresh(project)
- self.assertEqual(project.status, COMMITTED)
- self.assertTrue(project.is_locked)
-
-
class TestRemoveDocumentView(BaseViewTestCase):
base_view_name = 'detail'
url_name = 'funds:projects:{}'
@@ -255,42 +352,6 @@ def test_remove_non_existent_document(self):
self.assertEqual(response.status_code, 200)
-class TestSendForApprovalView(BaseViewTestCase):
- base_view_name = 'detail'
- url_name = 'funds:projects:{}'
- user_factory = StaffFactory
-
- def get_kwargs(self, instance):
- return {'pk': instance.id}
-
- def test_send_for_approval_fails_when_project_is_locked(self):
- project = ProjectFactory(is_locked=True)
-
- # The view doesn't have any custom changes when form validation fails
- # so check that directly.
- form = SetPendingForm(instance=project)
- self.assertFalse(form.is_valid())
-
- def test_send_for_approval_fails_when_project_is_not_in_committed_state(self):
- project = ProjectFactory(status='in_progress')
-
- # The view doesn't have any custom changes when form validation fails
- # so check that directly.
- form = SetPendingForm(instance=project)
- self.assertFalse(form.is_valid())
-
- def test_send_for_approval_happy_path(self):
- project = ProjectFactory(is_locked=False, status='committed')
-
- response = self.post_page(project, {'form-submitted-request_approval_form': ''})
- self.assertEqual(response.status_code, 200)
-
- project.refresh_from_db()
-
- self.assertTrue(project.is_locked)
- self.assertEqual(project.status, 'committed')
-
-
class TestApplicantUploadContractView(BaseViewTestCase):
base_view_name = 'detail'
url_name = 'funds:projects:{}'
diff --git a/hypha/apply/projects/views/__init__.py b/hypha/apply/projects/views/__init__.py
index ca2ae12b2f..787d33c461 100644
--- a/hypha/apply/projects/views/__init__.py
+++ b/hypha/apply/projects/views/__init__.py
@@ -13,7 +13,7 @@
ApproveContractView,
BaseProjectDetailView,
ContractPrivateMediaView,
- CreateApprovalView,
+ FinalApprovalView,
ProjectApprovalEditView,
ProjectDetailPDFView,
ProjectDetailSimplifiedView,
@@ -21,7 +21,6 @@
ProjectListView,
ProjectOverviewView,
ProjectPrivateMediaView,
- RejectionView,
RemoveDocumentView,
SelectDocumentView,
SendForApprovalView,
@@ -42,8 +41,7 @@
__all__ = [
'ChangeInvoiceStatusView',
'SendForApprovalView',
- 'CreateApprovalView',
- 'RejectionView',
+ 'FinalApprovalView',
'UploadDocumentView',
'RemoveDocumentView',
'SelectDocumentView',
diff --git a/hypha/apply/projects/views/project.py b/hypha/apply/projects/views/project.py
index b436eb3192..0f4f800fe1 100644
--- a/hypha/apply/projects/views/project.py
+++ b/hypha/apply/projects/views/project.py
@@ -27,10 +27,12 @@
from django_tables2 import SingleTableMixin
from hypha.apply.activity.messaging import MESSAGES, messenger
+from hypha.apply.activity.models import ACTION, ALL, COMMENT, Activity
from hypha.apply.activity.views import ActivityContextMixin, CommentFormView
from hypha.apply.stream_forms.models import BaseStreamForm
from hypha.apply.users.decorators import (
- approver_required,
+ contracting_approver_required,
+ staff_or_finance_or_contracting_required,
staff_or_finance_required,
staff_required,
)
@@ -47,9 +49,9 @@
from ..filters import InvoiceListFilter, ProjectListFilter, ReportListFilter
from ..forms import (
ApproveContractForm,
- CreateApprovalForm,
+ ChangePAFStatusForm,
+ FinalApprovalForm,
ProjectApprovalForm,
- RejectionForm,
RemoveDocumentForm,
SelectDocumentForm,
SetPendingForm,
@@ -60,10 +62,12 @@
)
from ..models.payment import Invoice
from ..models.project import (
+ COMMITTED,
CONTRACTING,
IN_PROGRESS,
PROJECT_STATUS_CHOICES,
- Approval,
+ REQUEST_CHANGE,
+ WAITING_FOR_APPROVAL,
Contract,
PacketFile,
Project,
@@ -79,53 +83,35 @@ class SendForApprovalView(DelegatedViewMixin, UpdateView):
form_class = SetPendingForm
model = Project
- def form_valid(self, form):
- # lock project
- response = super().form_valid(form)
-
+ def send_to_compliance(self):
+ """Notify Compliance about this Project."""
messenger(
- MESSAGES.SEND_FOR_APPROVAL,
+ MESSAGES.SENT_TO_COMPLIANCE,
request=self.request,
user=self.request.user,
source=self.object,
)
- return response
-
+ self.object.sent_to_compliance_at = timezone.now()
+ self.object.save(update_fields=['sent_to_compliance_at'])
-@method_decorator(staff_required, name='dispatch')
-class CreateApprovalView(DelegatedViewMixin, CreateView):
- context_name = 'add_approval_form'
- form_class = CreateApprovalForm
- model = Approval
-
- def get_form_kwargs(self):
- kwargs = super().get_form_kwargs()
- kwargs.pop('instance')
- kwargs.get('initial', {}).update({'by': kwargs.get('user')})
- return kwargs
-
- @transaction.atomic()
def form_valid(self, form):
project = self.kwargs['object']
old_stage = project.get_status_display()
- form.instance.project = project
-
response = super().form_valid(form)
messenger(
- MESSAGES.APPROVE_PROJECT,
+ MESSAGES.SEND_FOR_APPROVAL,
request=self.request,
user=self.request.user,
- source=project,
+ source=self.object,
)
- # project.send_to_compliance(self.request)
+ project.status = WAITING_FOR_APPROVAL
+ project.save(update_fields=['status'])
- project.is_locked = False
- project.status = CONTRACTING
- project.save(update_fields=['is_locked', 'status'])
+ self.send_to_compliance()
messenger(
MESSAGES.PROJECT_TRANSITION,
@@ -138,25 +124,86 @@ def form_valid(self, form):
return response
-@method_decorator(approver_required, name='dispatch')
-class RejectionView(DelegatedViewMixin, UpdateView):
- context_name = 'rejection_form'
- form_class = RejectionForm
+@method_decorator(contracting_approver_required, name='dispatch')
+class FinalApprovalView(DelegatedViewMixin, UpdateView):
+ form_class = FinalApprovalForm
+ context_name = 'final_approval_form'
model = Project
def form_valid(self, form):
+ project = self.object
+ old_stage = project.get_status_display()
+
+ response = super().form_valid(form)
+
+ comment = form.cleaned_data.get('comment', '')
+ status = form.cleaned_data['final_approval_status']
+
+ if status == REQUEST_CHANGE:
+ project.status = COMMITTED
+ project.is_locked = False
+ project.paf_reviews_meta_data = {}
+ project.save(update_fields=['status', 'is_locked', 'paf_reviews_meta_data'])
+
+ project_status_message = _(
+ '{% trans "Phone" %}
-{{ object.phone|default:"-" }}
+{% trans "Approvals" %}
+
+
- {% trans "Approver" %}
+ {% with approval=project.approvals.first %} +{{ approval.by }} - {{ approval.created_at|date:"DATE_FORMAT" }}
+ {% endwith %}
-
-
- {% trans "Value" %}
-{{ CURRENCY_SYMBOL }}{{ object.value|default:"-" }}
+{% trans "Review" %}
+
+
- {% if object.sent_to_compliance_at %}
- {% trans "Submission lead" %}
+{{ project.submission.lead }}
+ +{% trans "Reviews" %}
+{% trans "Staff Reviewers" %}
+ {% for review in project.submission.reviews.by_staff %} +
+
+ {{ review.author }}
+ {% if review.author.role %}
+ as {{ review.author.role }}
+ {% endif %}
+ - {{ review.created_at|date:"DATE_FORMAT" }}
+
+
+ {% empty %}
+ {% trans "No reviews" %}
+ {% endfor %}
+ {% trans "External Reviewers" %}
+ {% for review in project.submission.reviews.by_reviewers %} +
+
+ {{ review.author }} - {{ review.created_at|date:"DATE_FORMAT" }}
+
+
+ {% empty %}
+ {% trans "No reviews" %}
+ {% endfor %}
-
-
- {% if object.output_answers %}
- {% trans "Sent to Compliance" %}
-{{ object.sent_to_compliance_at|date:"DATE_FORMAT" }}
+{% trans "Supporting Documents" %}
+
+
+ {% for packet_file in object.packet_files.all %}
+
+ {% endfor %}
+
+ {% user_can_update_paf_status object user as user_can_take_actions %}
+ {% if user_can_take_actions %}
+
- {{ object.output_answers }}
-
- {% endif %}
- {% trans "Approvals" %}
-
-
-
- {% trans "Approver" %}
- {% with approval=project.approvals.first %} -{{ approval.by }} - {{ approval.created_at|date:"DATE_FORMAT" }}
- {% endwith %} -{% trans "Review" %}
-
-
{% trans "Submission lead" %}
-{{ project.submission.lead }}
- -{% trans "Reviews" %}
-{% trans "Staff Reviewers" %}
- {% for review in project.submission.reviews.by_staff %} -
-
- {{ review.author }}
- {% if review.author.role %}
- as {{ review.author.role }}
+
- {% empty %}
- {% trans "No reviews" %}
- {% endfor %}
-
- {% trans "External Reviewers" %}
- {% for review in project.submission.reviews.by_reviewers %} -
-
- {{ review.author }} - {{ review.created_at|date:"DATE_FORMAT" }}
-
- {% empty %}
- {% trans "No reviews" %}
- {% endfor %}
- {% trans "Supporting Documents" %}
-
-
- {% for packet_file in object.packet_files.all %}
-
- {% endfor %}
+
+ {% endif %}
{user} request changes the Project and update status to {project_status}.
').format( + user=self.request.user, + project_status=project.status + ) + + Activity.objects.create( + user=self.request.user, + type=ACTION, + source=project, + timestamp=timezone.now(), + message=project_status_message, + visibility=ALL, + ) + + messenger( + MESSAGES.REQUEST_PROJECT_CHANGE, + request=self.request, + user=self.request.user, + source=self.object, + comment=comment, + ) + return response + messenger( - MESSAGES.REQUEST_PROJECT_CHANGE, + MESSAGES.APPROVE_PROJECT, request=self.request, user=self.request.user, - source=self.object, - comment=form.cleaned_data['comment'], + source=project, ) - self.object.is_locked = False - self.object.save(update_fields=['is_locked']) + project.is_locked = True + project.status = CONTRACTING + project.save(update_fields=['is_locked', 'status']) - return redirect(self.object) + project_status_message = _( + '{user} approved the Project and update status to {project_status}.
').format( + user=self.request.user, + project_status=project.status + ) + + Activity.objects.create( + user=self.request.user, + type=ACTION, + source=project, + timestamp=timezone.now(), + message=project_status_message, + visibility=ALL, + ) + + messenger( + MESSAGES.PROJECT_TRANSITION, + request=self.request, + user=self.request.user, + source=project, + related=old_stage, + ) + + return response # PROJECT DOCUMENTS @@ -412,6 +459,63 @@ def form_valid(self, form): # PROJECT VIEW + +@method_decorator(staff_or_finance_or_contracting_required, name='dispatch') +class ChangePAFStatusView(DelegatedViewMixin, UpdateView): + form_class = ChangePAFStatusForm + context_name = 'change_paf_status' + model = Project + + def form_valid(self, form): + response = super().form_valid(form) + role = form.cleaned_data.get('role') + paf_status = form.cleaned_data.get('paf_status') + comment = form.cleaned_data.get('comment', '') + + self.object.paf_reviews_meta_data.update({str(role.role): {'status': paf_status, 'comment': comment}}) + self.object.save(update_fields=['paf_reviews_meta_data']) + + paf_status_update_message = _('{role} has updated PAF status to {paf_status}.
').format( + role=role, paf_status=paf_status) + Activity.objects.create( + user=self.request.user, + type=ACTION, + source=self.object, + timestamp=timezone.now(), + message=paf_status_update_message, + visibility=ALL, + ) + + if paf_status == REQUEST_CHANGE: + self.object.status = COMMITTED + self.object.save(update_fields=['status']) + + messenger( + MESSAGES.REQUEST_PROJECT_CHANGE, + request=self.request, + user=self.request.user, + source=self.object, + comment=comment, + ) + + if form.cleaned_data['comment']: + + comment = f"{form.cleaned_data['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=ALL, + ) + + return response + + class BaseProjectDetailView(ReportingMixin, DetailView): def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) @@ -429,8 +533,7 @@ class AdminProjectDetailView( form_views = [ ApproveContractView, CommentFormView, - CreateApprovalView, - RejectionView, + FinalApprovalView, RemoveDocumentView, SelectDocumentView, SendForApprovalView, @@ -438,6 +541,7 @@ class AdminProjectDetailView( UpdateLeadView, UploadContractView, UploadDocumentView, + ChangePAFStatusView, ] model = Project template_name_suffix = '_admin_detail' @@ -481,6 +585,7 @@ def dispatch(self, request, *args, **kwargs): class ProjectDetailView(ViewDispatcher): admin_view = AdminProjectDetailView finance_view = AdminProjectDetailView + contracting_view = AdminProjectDetailView applicant_view = ApplicantProjectDetailView @@ -536,13 +641,16 @@ def test_func(self): # PROJECT EDIT -@method_decorator(staff_or_finance_required, name='dispatch') -class ProjectDetailSimplifiedView(DetailView): +@method_decorator(staff_or_finance_or_contracting_required, name='dispatch') +class ProjectDetailSimplifiedView(DelegateableView, DetailView): + form_views = [ + ChangePAFStatusView + ] model = Project template_name_suffix = '_simplified_detail' -@method_decorator(staff_required, name='dispatch') +@method_decorator(staff_or_finance_or_contracting_required, name='dispatch') class ProjectDetailPDFView(SingleObjectMixin, View): model = Project @@ -590,7 +698,7 @@ def get(self, request, *args, **kwargs): ) -@method_decorator(staff_required, name='dispatch') +@method_decorator(staff_or_finance_or_contracting_required, name='dispatch') class ProjectApprovalEditView(BaseStreamForm, UpdateView): submission_form_class = ProjectApprovalForm model = Project @@ -598,7 +706,6 @@ class ProjectApprovalEditView(BaseStreamForm, UpdateView): def buttons(self): yield ('submit', 'primary', _('Submit')) - # yield ('save', 'white', _('Save draft')) def dispatch(self, request, *args, **kwargs): project = self.get_object() diff --git a/hypha/apply/users/decorators.py b/hypha/apply/users/decorators.py index 1017901b08..3bb0fe4ee3 100644 --- a/hypha/apply/users/decorators.py +++ b/hypha/apply/users/decorators.py @@ -31,12 +31,24 @@ def is_apply_staff_or_finance(user): return True +def is_apply_staff_or_finance_or_contracting(user): + if not (user.is_apply_staff or user.is_finance or user.is_contracting): + raise PermissionDenied + return True + + def is_approver(user): if not user.is_approver: raise PermissionDenied return True +def is_contracting_approver(user): + if not user.is_approver or not user.is_contracting: + raise PermissionDenied + return True + + staff_required = [login_required, user_passes_test(is_apply_staff)] finance_required = [login_required, user_passes_test(is_finance)] @@ -45,6 +57,10 @@ def is_approver(user): approver_required = [login_required, user_passes_test(is_approver)] +staff_or_finance_or_contracting_required = [login_required, user_passes_test(is_apply_staff_or_finance_or_contracting)] + +contracting_approver_required = [login_required, user_passes_test(is_contracting_approver)] + def superuser_decorator(fn): check = user_passes_test(lambda user: user.is_superuser) diff --git a/hypha/apply/users/tests/factories.py b/hypha/apply/users/tests/factories.py index 08f1907ab1..284d91896e 100644 --- a/hypha/apply/users/tests/factories.py +++ b/hypha/apply/users/tests/factories.py @@ -9,6 +9,7 @@ APPLICANT_GROUP_NAME, APPROVER_GROUP_NAME, COMMUNITY_REVIEWER_GROUP_NAME, + CONTRACTING_GROUP_NAME, FINANCE_GROUP_NAME, PARTNER_GROUP_NAME, REVIEWER_GROUP_NAME, @@ -130,6 +131,25 @@ def groups(self, create, extracted, **kwargs): ) +class ContractingFactory(UserFactory): + @factory.post_generation + def groups(self, create, extracted, **kwargs): + if create: + self.groups.add( + GroupFactory(name=CONTRACTING_GROUP_NAME), + ) + + +class ContractingApproverFactory(UserFactory): + @factory.post_generation + def groups(self, create, extracted, **kwargs): + if create: + self.groups.add( + GroupFactory(name=CONTRACTING_GROUP_NAME), + GroupFactory(name=APPROVER_GROUP_NAME) + ) + + class SuperUserFactory(StaffFactory): is_superuser = True diff --git a/hypha/apply/utils/views.py b/hypha/apply/utils/views.py index 816d8dc982..351d1b560f 100644 --- a/hypha/apply/utils/views.py +++ b/hypha/apply/utils/views.py @@ -30,6 +30,7 @@ class ViewDispatcher(View): community_view: View = None applicant_view: View = None finance_view: View = None + contracting_view: View = None def admin_check(self, request): return request.user.is_apply_staff @@ -46,6 +47,9 @@ def community_check(self, request): def finance_check(self, request): return request.user.is_finance + def contracting_check(self, request): + return request.user.is_contracting + def dispatch(self, request, *args, **kwargs): view = self.applicant_view @@ -59,6 +63,8 @@ def dispatch(self, request, *args, **kwargs): view = self.community_view elif self.finance_check(request): view = self.finance_view + elif self.contracting_check(request): + view = self.contracting_view if view: return view.as_view()(request, *args, **kwargs)