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

Merge pull request #940 from dod-ccpo/display-clin-type

Browse Source 
Fix CLIN type display
This commit is contained in:
dandds 2019-06-18 11:44:36 -04:00 committed by GitHub
commit c0da5d482f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
atst/forms/task_order.py
View File

@ -18,8 +18,18 @@ from atst.forms.validators import FileLength
from atst.utils.localization import translate from atst.utils.localization import translate
def coerce_enum(enum_inst):
if getattr(enum_inst, "value", None):
return enum_inst.value
else:
return enum_inst
class CLINForm(FlaskForm): class CLINForm(FlaskForm):
jedi_clin_type = SelectField("CLIN type", choices=JEDI_CLIN_TYPES) jedi_clin_type = SelectField(
"CLIN type", choices=JEDI_CLIN_TYPES, coerce=coerce_enum
)
number = StringField(label="CLIN", validators=[Required()]) number = StringField(label="CLIN", validators=[Required()])
start_date = DateField( start_date = DateField(
translate("forms.task_order.start_date_label"), translate("forms.task_order.start_date_label"),

2
atst/models/__init__.py
View File

@ -8,7 +8,7 @@ from .application_invitation import ApplicationInvitation
from .application_role import ApplicationRole, Status as ApplicationRoleStatus from .application_role import ApplicationRole, Status as ApplicationRoleStatus
from .attachment import Attachment from .attachment import Attachment
from .audit_event import AuditEvent from .audit_event import AuditEvent
from .clin import CLIN from .clin import CLIN, JEDICLINType
from .environment import Environment from .environment import Environment
from .environment_role import EnvironmentRole, CSPRole from .environment_role import EnvironmentRole, CSPRole
from .notification_recipient import NotificationRecipient from .notification_recipient import NotificationRecipient

2
atst/routes/task_orders/new.py
View File

@ -14,7 +14,7 @@ def render_task_orders_edit(portfolio_id=None, task_order_id=None, form=None):
if task_order_id: if task_order_id:
task_order = TaskOrders.get(task_order_id) task_order = TaskOrders.get(task_order_id)
portfolio_id = task_order.portfolio_id portfolio_id = task_order.portfolio_id
render_args["form"] = form or TaskOrderForm(**task_order.to_dictionary()) render_args["form"] = form or TaskOrderForm(obj=task_order)
render_args["task_order_id"] = task_order_id render_args["task_order_id"] = task_order_id
render_args["task_order"] = task_order render_args["task_order"] = task_order
else: else:

2
templates/task_orders/edit.html
View File

@ -169,7 +169,7 @@
<hr v-if="clinIndex !== 0"> <hr v-if="clinIndex !== 0">
<clin-fields <clin-fields
v-bind:initial-clin-index='clinIndex' v-bind:initial-clin-index='clinIndex'
v-bind:initial-clin-type="'JEDICLINType.JEDI_CLIN_1'" v-bind:initial-clin-type="'JEDI_CLIN_1'"
inline-template> inline-template>
<div> <div>
<div class="form-row"> <div class="form-row">

11
tests/forms/test_task_order.py Normal file
View File

@ -0,0 +1,11 @@
from atst.forms.task_order import CLINForm
from atst.models import JEDICLINType
import tests.factories as factories
def test_clin_form_jedi_clin_type():
jedi_type = JEDICLINType.JEDI_CLIN_2
clin = factories.CLINFactory.create(jedi_clin_type=jedi_type)
clin_form = CLINForm(obj=clin)
assert clin_form.jedi_clin_type.data == jedi_type.value