Merge pull request #1260 from dod-ccpo/to-signature-page

To signature page

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()],
+    )

styles/elements/_inputs.scss

@@ -165,6 +165,15 @@
         margin-top: 0;
         margin-bottom: 0;
       }
+
+      label {
+        margin-left: 3rem;
+
+        &:before {
+          position: absolute;
+          left: -3rem;
+        }
+      }
     }
 
     select {

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 {

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) %}
   <div class="task-order__header">
-    <div class="h2">
-      {{ title }}
-    </div>
+    {% if title -%}
+      <div class="h2">
+        {{ title }}
+      </div>
+    {%- endif %}
     {% if to_number %}
       <p>
         <strong>Task Order Number:</strong> {{ to_number }}

templates/task_orders/step_5.html

@@ -10,11 +10,16 @@
 {% 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
-  ) %}
+  {{ TOFormStepHeader('task_orders.form.step_5.description' | translate, to_number=task_order.number) }}
+  <div class="task-order__confirmation">
     {{ CheckboxInput(form.signature) }}
-  {% endcall %}
+    {{ CheckboxInput(form.confirm) }}
+  </div>
+  <hr>
+  <h5>
+    {{ "task_orders.sign.acknowledge.title" | translate }}
+  </h5>
+  <p>
+    {{ "task_orders.sign.acknowledge.text" | translate }}
+  </p>
 {% endblock %}

translations.yaml

@@ -525,7 +525,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'
@@ -542,7 +542,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: