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

validate dod id for task order officers

Browse Source
This commit is contained in:
dandds 2019-01-07 12:14:42 -05:00
parent 7c5f0fa27d
commit c1f3f6bb62
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
atst/forms/task_order.py
View File

@ -9,6 +9,9 @@ from wtforms.fields import (
) )
from wtforms.fields.html5 import DateField from wtforms.fields.html5 import DateField
from wtforms.widgets import ListWidget, CheckboxInput from wtforms.widgets import ListWidget, CheckboxInput
from wtforms.validators import Required, Length
from atst.forms.validators import IsNumber
from .forms import CacheableForm from .forms import CacheableForm
from .data import ( from .data import (
@ -87,15 +90,23 @@ class OversightForm(CacheableForm):
ko_first_name = StringField("First Name") ko_first_name = StringField("First Name")
ko_last_name = StringField("Last Name") ko_last_name = StringField("Last Name")
ko_email = StringField("Email") ko_email = StringField("Email")
ko_dod_id = StringField("DOD ID") ko_dod_id = StringField(
"DOD ID", validators=[Required(), Length(min=10), IsNumber()]
)
cor_first_name = StringField("First Name") cor_first_name = StringField("First Name")
cor_last_name = StringField("Last Name") cor_last_name = StringField("Last Name")
cor_email = StringField("Email") cor_email = StringField("Email")
cor_dod_id = StringField("DOD ID") cor_dod_id = StringField(
"DOD ID", validators=[Required(), Length(min=10), IsNumber()]
)
so_first_name = StringField("First Name") so_first_name = StringField("First Name")
so_last_name = StringField("Last Name") so_last_name = StringField("Last Name")
so_email = StringField("Email") so_email = StringField("Email")
so_dod_id = StringField("DOD ID") so_dod_id = StringField(
"DOD ID", validators=[Required(), Length(min=10), IsNumber()]
)
ko_invite = BooleanField( ko_invite = BooleanField(
"Invite KO to Task Order Builder", "Invite KO to Task Order Builder",

2
templates/components/user_info.html
View File

@ -17,7 +17,7 @@
</div> </div>
<div class='form-col form-col--half'> <div class='form-col form-col--half'>
{{ TextInput(dod_id, placeholder='1234567890') }} {{ TextInput(dod_id, placeholder='1234567890', validation='dodId') }}
</div> </div>
</div> </div>
{% endmacro %} {% endmacro %}

2
tests/routes/workspaces/test_invitations.py
View File

@ -225,6 +225,8 @@ def test_task_order_officer_accepts_invite(monkeypatch, client, user_session):
"ko_last_name": user_info["last_name"], "ko_last_name": user_info["last_name"],
"ko_email": user_info["email"], "ko_email": user_info["email"],
"ko_dod_id": user_info["dod_id"], "ko_dod_id": user_info["dod_id"],
"so_dod_id": task_order.so_dod_id,
"cor_dod_id": task_order.cor_dod_id,
"ko_invite": True, "ko_invite": True,
}, },
) )