diff --git a/atst/forms/task_order.py b/atst/forms/task_order.py index 6714b5ad..51cd4306 100644 --- a/atst/forms/task_order.py +++ b/atst/forms/task_order.py @@ -145,7 +145,7 @@ class OversightForm(CacheableForm): ) so_dod_id = StringField( translate("forms.task_order.oversight_dod_id_label"), - validators=[Required(), Length(min=10), IsNumber()], + validators=[RequiredIf("so_invite"), Length(min=10), IsNumber()], ) ko_invite = BooleanField( diff --git a/js/components/forms/oversight.js b/js/components/forms/oversight.js index ef3f924b..fe217bbc 100644 --- a/js/components/forms/oversight.js +++ b/js/components/forms/oversight.js @@ -22,12 +22,14 @@ export default { data: function () { const { am_cor = false, - ko_invite = false + ko_invite = false, + so_invite = false, } = this.initialData return { am_cor, - ko_invite + ko_invite, + so_invite, } } } diff --git a/templates/task_orders/new/oversight.html b/templates/task_orders/new/oversight.html index 05c15bab..e784e80b 100644 --- a/templates/task_orders/new/oversight.html +++ b/templates/task_orders/new/oversight.html @@ -21,25 +21,27 @@ {{ TextInput(form.ko_dod_id, placeholder="1234567890", tooltip="Why", tooltip_title='Why', validation='dodId')}} -
{{ "task_orders.new.oversight.cor_info_paragraph" | translate }}
+{{ "task_orders.new.oversight.cor_info_paragraph" | translate }}
{{ CheckboxInput(form.am_cor) }} {{ UserInfo(form.cor_first_name, form.cor_last_name, form.cor_email, form.cor_phone_number) }} {{ CheckboxInput(form.cor_invite) }} {{ TextInput(form.cor_dod_id, placeholder="1234567890", tooltip="Why", tooltip_title='Why', validation='dodId')}} + +{{ "task_orders.new.oversight.so_info_paragraph" | translate }}
+ {{ UserInfo(form.so_first_name, form.so_last_name, form.so_email, form.so_phone_number) }} + {{ CheckboxInput(form.so_invite) }} + + {{ TextInput(form.so_dod_id, placeholder="1234567890", tooltip="Why", tooltip_title='Why', validation='dodId')}} + -{{ "task_orders.new.oversight.so_info_paragraph" | translate }}
-{{ UserInfo(form.so_first_name, form.so_last_name, form.so_email, form.so_phone_number) }} -{{ CheckboxInput(form.so_invite) }} -{{ TextInput(form.so_dod_id, placeholder="1234567890", tooltip="Why", tooltip_title='Why', validation='dodId')}} - {% endblock %}