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

Add funding type for task order

Browse Source
This commit is contained in:
richard-dds 2018-10-15 15:16:20 -04:00
parent e80ae4c092
commit ed7d508e30
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
atst/domain/task_orders.py
View File

@ -2,7 +2,7 @@ from sqlalchemy.orm.exc import NoResultFound
from flask import current_app as app from flask import current_app as app
from atst.database import db from atst.database import db
from atst.models.task_order import TaskOrder, Source from atst.models.task_order import TaskOrder, Source, FundingType
from atst.models.attachment import Attachment from atst.models.attachment import Attachment
from .exceptions import NotFoundError from .exceptions import NotFoundError
@ -29,7 +29,7 @@ class TaskOrders(object):
to_data = TaskOrders._client().get_contract(order_number, status="y") to_data = TaskOrders._client().get_contract(order_number, status="y")
if to_data: if to_data:
# TODO: we need to determine exactly what we're getting and storing from the EDA client # TODO: we need to determine exactly what we're getting and storing from the EDA client
return TaskOrders.create(source=Source.EDA, **to_data) return TaskOrders.create(number=to_data["contract_no"], source=Source.EDA, funding_type=FundingType.PROC)
else: else:
raise NotFoundError("task_order") raise NotFoundError("task_order")

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

@ -19,6 +19,11 @@ class GetFinancialVerificationForm(object):
def _get_form(self): def _get_form(self):
data = {} data = {}
fv_data = self.request.body.get("financial_verification")
if fv_data:
data = {**data, **fv_data}
if self.request.task_order: if self.request.task_order:
task_order_dict = self.request.task_order.to_dictionary() task_order_dict = self.request.task_order.to_dictionary()
task_order_dict.update({ task_order_dict.update({