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

Formatting

Browse Source
This commit is contained in:
richard-dds 2018-10-19 15:03:53 -04:00
parent c81ce71eb9
commit 99a61aa9a6
5 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
atst/domain/requests/requests.py
View File

@ -161,7 +161,9 @@ class Requests(object):
return Requests.status_count(RequestStatus.APPROVED) return Requests.status_count(RequestStatus.APPROVED)
@classmethod @classmethod
def update_financial_verification(cls, request_id, financial_data, extended=False, task_order=None): def update_financial_verification(
cls, request_id, financial_data, extended=False, task_order=None
):
request = RequestsQuery.get_with_lock(request_id) request = RequestsQuery.get_with_lock(request_id)
# request_data = financial_data.copy() # request_data = financial_data.copy()

2
atst/forms/financial.py
View File

@ -182,5 +182,5 @@ class ExtendedFinancialForm(BaseFinancialForm):
FileAllowed(["pdf"], "Only PDF documents can be uploaded."), FileAllowed(["pdf"], "Only PDF documents can be uploaded."),
InputRequired(), InputRequired(),
], ],
render_kw={"required": False} render_kw={"required": False},
) )

2
atst/models/request.py
View File

@ -100,7 +100,7 @@ class Request(Base, mixins.TimestampsMixin, mixins.AuditableMixin):
"uii_ids", "uii_ids",
"treasury_code", "treasury_code",
"ba_code", "ba_code",
"extended" "extended",
] ]
@property @property

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

@ -29,7 +29,9 @@ class FinancialVerificationBase(object):
task_order_dict.update( task_order_dict.update(
{ {
"task_order_number": request.task_order.number, "task_order_number": request.task_order.number,
"funding_type": getattr_path(request, "task_order.funding_type.value") "funding_type": getattr_path(
request, "task_order.funding_type.value"
),
} }
) )
existing_fv_data = {**existing_fv_data, **task_order_dict} existing_fv_data = {**existing_fv_data, **task_order_dict}
@ -57,7 +59,9 @@ class FinancialVerificationBase(object):
) )
elif isinstance(form.task_order.data, str): elif isinstance(form.task_order.data, str):
try: try:
attachment = Attachment.get_for_resource("task_order", self.request.id) attachment = Attachment.get_for_resource(
"task_order", self.request.id
)
except NotFoundError: except NotFoundError:
pass pass
@ -147,7 +151,10 @@ class UpdateFinancialVerification(FinancialVerificationBase):
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(
self.request.id, form.data, extended=self.is_extended, task_order=task_order self.request.id,
form.data,
extended=self.is_extended,
task_order=task_order,
) )
if should_submit: if should_submit:
return Requests.submit_financial_verification(updated_request) return Requests.submit_financial_verification(updated_request)
@ -206,7 +213,9 @@ class SaveFinancialVerificationDraft(FinancialVerificationBase):
@requests_bp.route("/requests/verify/<string:request_id>", methods=["GET"]) @requests_bp.route("/requests/verify/<string:request_id>", methods=["GET"])
def financial_verification(request_id): def financial_verification(request_id):
request = Requests.get(g.current_user, request_id) request = Requests.get(g.current_user, request_id)
is_extended = fv_extended(http_request) or request.financial_verification.get("extended", False) is_extended = fv_extended(http_request) or request.financial_verification.get(
"extended", False
)
form = GetFinancialVerificationForm( form = GetFinancialVerificationForm(
g.current_user, request, is_extended=is_extended g.current_user, request, is_extended=is_extended

1
atst/utils/__init__.py
View File

@ -1,5 +1,6 @@
import re import re
def first_or_none(predicate, lst): def first_or_none(predicate, lst):
return next((x for x in lst if predicate(x)), None) return next((x for x in lst if predicate(x)), None)