diff --git a/atst/forms/poc.py b/atst/forms/poc.py index cd57add1..7d5388f2 100644 --- a/atst/forms/poc.py +++ b/atst/forms/poc.py @@ -1,15 +1,27 @@ from wtforms.fields import StringField +from wtforms.fields.html5 import EmailField from wtforms.validators import Required, Email, Length from .forms import ValidatedForm from .validators import IsNumber, Alphabet class POCForm(ValidatedForm): - fname_poc = StringField("POC First Name", validators=[Required(), Alphabet()]) - lname_poc = StringField("POC Last Name", validators=[Required(), Alphabet()]) + fname_poc = StringField( + "POC First Name", + # validators=[Required(), Alphabet()] + ) - email_poc = StringField("POC Email Address", validators=[Required(), Email()]) + lname_poc = StringField( + "POC Last Name", + # validators=[Required(), Alphabet()] + ) + + email_poc = EmailField( + "POC Email Address", + # validators=[Required(), Email()] + ) dodid_poc = StringField( - "DOD ID", validators=[Required(), Length(min=10), IsNumber()] + "DOD ID", + # validators=[Required(), Length(min=10), IsNumber()] ) diff --git a/atst/forms/request.py b/atst/forms/request.py index b777b80c..bb38077f 100644 --- a/atst/forms/request.py +++ b/atst/forms/request.py @@ -1,5 +1,5 @@ from wtforms.fields.html5 import IntegerField -from wtforms.fields import RadioField, StringField, TextAreaField, SelectField, BooleanField, SelectMultipleField +from wtforms.fields import RadioField, StringField, TextAreaField, SelectField from wtforms.validators import NumberRange, InputRequired from .fields import DateField from .forms import ValidatedForm diff --git a/templates/requests/screen-4.html.to b/templates/requests/screen-4.html.to index 048795e0..5ff198e6 100644 --- a/templates/requests/screen-4.html.to +++ b/templates/requests/screen-4.html.to @@ -17,6 +17,23 @@
Before you can submit your request, please take a moment to review the information entered in the form. You may make changes by clicking the edit link on each section. When all information looks right, go ahead and submit.
+ + + + +{{ data['details_of_use']['dod_component'] }} +{{ data['details_of_use']['fname_request'] }} +{{ data['details_of_use']['lname_request'] }} +{{ data['details_of_use']['email_request'] }} +{{ data['details_of_use']['phone_number'] }} +{{ data['details_of_use']['service_branch'] }} +{{ data['details_of_use']['citizenship'] }} +{{ data['details_of_use']['designation'] }} +{{ data['details_of_use']['date_latest_training'] }} + + + +