From 1516a2c47d5259e144cb6a1463b571d7dbe040fa Mon Sep 17 00:00:00 2001 From: Montana Date: Fri, 18 Jan 2019 13:21:59 -0500 Subject: [PATCH] Toggle SO Invite checkbox --- atst/forms/task_order.py | 2 +- js/components/forms/oversight.js | 6 ++++-- templates/task_orders/new/oversight.html | 24 +++++++++++++----------- 3 files changed, 18 insertions(+), 14 deletions(-) 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_title" | translate }}

-

{{ "task_orders.new.oversight.cor_info_paragraph" | translate }}

+

{{ "task_orders.new.oversight.cor_info_title" | translate }}

+

{{ "task_orders.new.oversight.cor_info_paragraph" | translate }}

{{ CheckboxInput(form.am_cor) }} + +
+ +

{{ "task_orders.new.oversight.so_info_title" | translate }}

+

{{ "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) }} + -
- -

{{ "task_orders.new.oversight.so_info_title" | translate }}

-

{{ "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 %}