pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow FV to be submitted without newly uploaded pdf

Browse Source
This commit is contained in:
richard-dds 2018-10-22 17:34:57 -04:00
parent a84954799d
commit 1606bad016
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
atst/forms/financial.py
View File

@ -29,6 +29,9 @@ class BaseFinancialForm(ValidatedForm):
""" """
self.uii_ids.process_data(self.uii_ids.data) self.uii_ids.process_data(self.uii_ids.data)
def validate(self, **kwargs):
return super().validate()
def validate_draft(self): def validate_draft(self):
""" """
Another stupid workaround. Maybe there isn't a better way. Another stupid workaround. Maybe there isn't a better way.
@ -109,7 +112,18 @@ class ExtendedFinancialForm(BaseFinancialForm):
def validate(self, *args, **kwargs): def validate(self, *args, **kwargs):
if self.funding_type.data == "OTHER": if self.funding_type.data == "OTHER":
self.funding_type_other.validators.append(InputRequired()) self.funding_type_other.validators.append(InputRequired())
return super().validate(*args, **kwargs)
to_validator = None
if kwargs.get("has_attachment"):
to_validators = list(self.task_order.validators)
self.task_order.validators = []
valid = super().validate(*args, **kwargs)
if to_validator:
self.task_order.validators = to_validators
return valid
funding_type = SelectField( funding_type = SelectField(
description="What is the source of funding?", description="What is the source of funding?",

7
atst/routes/requests/financial_verification.py
View File

@ -21,6 +21,7 @@ def fv_extended(_http_request):
class FinancialVerificationBase(object): class FinancialVerificationBase(object):
def _get_form(self, request, is_extended, formdata=None): def _get_form(self, request, is_extended, formdata=None):
existing_fv_data = request.financial_verification existing_fv_data = request.financial_verification
@ -153,7 +154,9 @@ class UpdateFinancialVerification(FinancialVerificationBase):
should_submit = True should_submit = True
updated_request = None updated_request = None
if not form.validate(): attachment = self._process_attachment(self.is_extended, form)
if not form.validate(has_attachment=attachment):
should_update = False should_update = False
if not self.pe_validator.validate(self.request, form.pe_id.data): if not self.pe_validator.validate(self.request, form.pe_id.data):
@ -164,8 +167,6 @@ class UpdateFinancialVerification(FinancialVerificationBase):
self._apply_task_order_number_error(form.task_order_number) self._apply_task_order_number_error(form.task_order_number)
should_submit = False should_submit = False
attachment = self._process_attachment(self.is_extended, form)
if should_update: if should_update:
task_order = self._try_create_task_order(form, attachment) task_order = self._try_create_task_order(form, attachment)
updated_request = Requests.update_financial_verification( updated_request = Requests.update_financial_verification(