From 66cfaaa6c3e5a30e82931a884df5083986276f82 Mon Sep 17 00:00:00 2001 From: leigh-mil Date: Wed, 18 Dec 2019 11:29:34 -0500 Subject: [PATCH 1/2] Update copy on TO signature page --- atst/forms/task_order.py | 3 +++ templates/task_orders/form_header.html | 10 ++++++---- templates/task_orders/step_5.html | 17 ++++++++++------- translations.yaml | 12 ++++++++---- 4 files changed, 27 insertions(+), 15 deletions(-) diff --git a/atst/forms/task_order.py b/atst/forms/task_order.py index a5e02e8b..1c324736 100644 --- a/atst/forms/task_order.py +++ b/atst/forms/task_order.py @@ -151,3 +151,6 @@ class SignatureForm(BaseForm): translate("task_orders.sign.digital_signature_description"), validators=[Required()], ) + confirm = BooleanField( + translate("task_orders.sign.confirmation_description"), validators=[Required()], + ) diff --git a/templates/task_orders/form_header.html b/templates/task_orders/form_header.html index 79821bf7..05f9116a 100644 --- a/templates/task_orders/form_header.html +++ b/templates/task_orders/form_header.html @@ -1,8 +1,10 @@ -{% macro TOFormStepHeader(title, description, to_number=None) %} +{% macro TOFormStepHeader(description, title=None, to_number=None) %}
-
- {{ title }} -
+ {% if title -%} +
+ {{ title }} +
+ {%- endif %} {% if to_number %}

Task Order Number: {{ to_number }} diff --git a/templates/task_orders/step_5.html b/templates/task_orders/step_5.html index 2d19c35b..365174d9 100644 --- a/templates/task_orders/step_5.html +++ b/templates/task_orders/step_5.html @@ -10,11 +10,14 @@ {% set step = "5" %} {% block to_builder_form_field %} - {{ TOFormStepHeader('task_orders.form.step_5.title' | translate, 'task_orders.form.step_5.description' | translate, task_order.number) }} - - {% call Alert('', - message="task_orders.form.step_5.alert_message" | translate - ) %} - {{ CheckboxInput(form.signature) }} - {% endcall %} + {{ TOFormStepHeader('task_orders.form.step_5.description' | translate, to_number=task_order.number) }} + {{ CheckboxInput(form.signature) }} + {{ CheckboxInput(form.confirm) }} +

+
+ {{ "task_orders.sign.acknowledge.title" | translate }} +
+

+ {{ "task_orders.sign.acknowledge.text" | translate }} +

{% endblock %} diff --git a/translations.yaml b/translations.yaml index 6a678f48..1efb8a29 100644 --- a/translations.yaml +++ b/translations.yaml @@ -199,7 +199,7 @@ forms:

- defense_component: + defense_component: label: "Select DoD component(s) funding your Portfolio:" choices: air_force: Air Force @@ -211,7 +211,7 @@ forms: help_text: |

Select the DOD component(s) that will fund all Applications within this Portfolio. - In JEDI, multiple DoD organizations can fund the same Portfolio.
+ In JEDI, multiple DoD organizations can fund the same Portfolio.
Select all that apply.

attachment: @@ -523,7 +523,7 @@ task_orders: next_button: 'Next: Review Task Order' step_5: title: Confirm Signature - description: Finally, plase confirm that your uploaded document representing the information you've entered contains the required signature from your Contracting Officer. You will be informed as soon as CCPO completes their review. + description: Prior to submitting the Task Order, you must acknowledge, by marking the appropriate box below, that the uploaded Task Order is signed by an appropriate, duly warranted Contracting Officer who has the authority to execute the uploaded Task Order on your Agency’s behalf and has authorized you to upload the Task Order in accordance with Agency policy and procedures. You must further acknowledge, by marking the appropriate box below, that all information entered herein matches that of the submitted Task Order. alert_message: All task orders require a Contracting Officer signature. next_button: 'Confirm & Submit' sticky_header_text: 'Add Task Order (step {step} of 5)' @@ -539,7 +539,11 @@ task_orders: subtitle: Who will be involved in the work funded by this task order? team_title: Your team sign: - digital_signature_description: I acknowledge that the uploaded task order contains the required KO signature. + digital_signature_description: I confirm the uploaded Task Order is signed by the appropriate, duly warranted Agency Contracting Officer who authorized me to upload the Task Order. + confirmation_description: I confirm that the information entered here in matches that of the submitted Task Order. + acknowledge: + title: Acknowledge Statement + text: I acknowledge, by executing the confirmation above and submitting this verification, that I am subject to potential penalties that may include fines, imprisonment, or both, under the U.S. law and regulations for any false statement or misrepresentation in association with this Task Order submission or on any accompanying documentation. status_empty_state: 'This Portfolio has no {status} Task Orders.' status_list_title: '{status} Task Orders' JEDICLINType: From 72bb3009131f2f4b79169b92a541a04b4a2f8434 Mon Sep 17 00:00:00 2001 From: leigh-mil Date: Wed, 18 Dec 2019 12:00:09 -0500 Subject: [PATCH 2/2] Styling for TO signature page --- styles/elements/_inputs.scss | 9 +++++++++ styles/sections/_task_order.scss | 9 +++++---- templates/task_orders/step_5.html | 6 ++++-- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/styles/elements/_inputs.scss b/styles/elements/_inputs.scss index 47cc4f3c..a5040e41 100644 --- a/styles/elements/_inputs.scss +++ b/styles/elements/_inputs.scss @@ -165,6 +165,15 @@ margin-top: 0; margin-bottom: 0; } + + label { + margin-left: 3rem; + + &:before { + position: absolute; + left: -3rem; + } + } } select { diff --git a/styles/sections/_task_order.scss b/styles/sections/_task_order.scss index 228bf126..c09f49a7 100644 --- a/styles/sections/_task_order.scss +++ b/styles/sections/_task_order.scss @@ -20,10 +20,7 @@ } &__header { - .h2, - p { - margin-bottom: $gap * 0.5; - } + margin-bottom: $gap * 6; } .col { @@ -155,6 +152,10 @@ } } } + + &__confirmation { + margin-left: $gap * 8; + } } .task-order__modal-cancel { diff --git a/templates/task_orders/step_5.html b/templates/task_orders/step_5.html index 365174d9..e5ce9189 100644 --- a/templates/task_orders/step_5.html +++ b/templates/task_orders/step_5.html @@ -11,8 +11,10 @@ {% block to_builder_form_field %} {{ TOFormStepHeader('task_orders.form.step_5.description' | translate, to_number=task_order.number) }} - {{ CheckboxInput(form.signature) }} - {{ CheckboxInput(form.confirm) }} +
+ {{ CheckboxInput(form.signature) }} + {{ CheckboxInput(form.confirm) }} +
{{ "task_orders.sign.acknowledge.title" | translate }}