Change TO fragment to a macro to make it reusable in the builder and view page, final tweaks to review and view pages

templates/task_orders/builder_base.html

@@ -9,7 +9,7 @@
       {{ form.csrf_token }}
 
       {{ StickyCTA(
-        text='task_orders.form.sticky_header_text' | translate,
+        text=sticky_cta_text,
         context=('task_orders.form.sticky_header_context' | translate({"step": step}) )) }}
 
       {% call Modal(name='cancel', dismissable=True) %}

templates/task_orders/fragments/task_order_view.html

@@ -2,12 +2,12 @@
 {% from "components/semi_collapsible_text.html" import SemiCollapsibleText %}
 {% from "components/tooltip.html" import Tooltip %}
 
+{% macro TaskOrderView(task_order, portfolio, builder_mode=False) %}
+  {% set obligated_funds = task_order.total_obligated_funds %}
+  {% set contract_amount = task_order.total_contract_amount %}
+  {% set expended_funds = task_order.invoiced_funds %}
 
-{% set obligated_funds = task_order.total_obligated_funds %}
+  <div>
-{% set contract_amount = task_order.total_contract_amount %}
-{% set expended_funds = task_order.invoiced_funds %}
-
-<div>
     <section class="row">
       <div class='col col--grow reporting-summary-item'>
         <h4 class="reporting-summary-item__header">
@@ -46,6 +46,9 @@
     <section>
       <h4>Documents</h4>
       <div class="panel panel__content">
+        {% if builder_mode %}
+          {{ Icon('ok', classes="icon--green icon--medium") }}
+        {% endif %}
         <a href="{{ pdf_download_url }}">
           {{ task_order.pdf.filename }}
           {{ Icon('link', classes="icon--primary icon--medium") }}
@@ -84,4 +87,5 @@
         </tbody>
       </table>
     </section>
-</div>
+  </div>
+{% endmacro %}

templates/task_orders/step_1.html

@@ -12,6 +12,7 @@
 
 {% set next_button_text = "Next: Add TO Number" %}
 {% set step = "1" %}
+{% set sticky_cta_text = 'task_orders.form.sticky_header_text' | translate %}
 
 {% block to_builder_form_field %}
   {{ TOFormStepHeader(

templates/task_orders/step_2.html

@@ -7,6 +7,7 @@
 {% set next_button_text = "Next: Add Base CLIN" %}
 {% set previous_button_link = url_for("task_orders.form_step_one_add_pdf", task_order_id=task_order_id) %}
 {% set step = "2" %}
+{% set sticky_cta_text = 'task_orders.form.sticky_header_text' | translate %}
 
 {% block to_builder_form_field %}
   {{ TOFormStepHeader(

templates/task_orders/step_3.html

@@ -8,6 +8,7 @@
 {% set next_button_text = "task_orders.form.step_3.next_button" | translate %}
 {% set previous_button_link = url_for("task_orders.form_step_two_add_number", task_order_id=task_order_id) %}
 {% set step = "3" %}
+{% set sticky_cta_text = 'task_orders.form.sticky_header_text' | translate %}
 
 
 {% block to_builder_form_field %}

templates/task_orders/step_4.html

@@ -1,17 +1,20 @@
 {% extends "task_orders/builder_base.html" %}
 
+{% from "task_orders/fragments/task_order_view.html" import TaskOrderView %}
+
 {% set action = url_for('task_orders.form_step_five_confirm_signature', task_order_id=task_order_id) %}
 {% set previous_button_link = url_for("task_orders.form_step_three_add_clins", task_order_id=task_order_id) %}
 {% set step = "4" %}
+{% set sticky_cta_text = 'task_orders.form.sticky_header_review_text' | translate %}
 
 {% block next_button %}
   <a
     href="{{ action }}"
     class="usa-button usa-button-primary">
-    Next: Submit Task Order
+    Next: Confirm
   </a>
 {% endblock %}
 
 {% block to_builder_form_field %}
-    {% include "task_orders/fragments/task_order_view.html" %}
+  {{ TaskOrderView(task_order, portfolio, builder_mode=True) }}
 {% endblock %}

templates/task_orders/step_5.html

@@ -8,6 +8,7 @@
 {% set next_button_text = 'task_orders.form.step_5.next_button' | translate %}
 {% set previous_button_link = url_for("task_orders.form_step_four_review", task_order_id=task_order_id) %}
 {% set step = "5" %}
+{% set sticky_cta_text = 'task_orders.form.sticky_header_text' | translate %}
 
 {% block to_builder_form_field %}
   {{ TOFormStepHeader(

templates/task_orders/view.html

@@ -1,4 +1,5 @@
 {% from "components/sticky_cta.html" import StickyCTA %}
+{% from "task_orders/fragments/task_order_view.html" import TaskOrderView %}
 
 {% extends 'portfolios/base.html' %}
 
@@ -11,6 +12,6 @@
   {% endcall %}
 
   <div class="task-order">
-    {% include "task_orders/fragments/task_order_view.html" %}
+    {{ TaskOrderView(task_order, portfolio) }}
   </div>
 {% endblock %}

translations.yaml

@@ -531,7 +531,8 @@ task_orders:
       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'
+    sticky_header_text: 'Add a Task Order'
+    sticky_header_review_text: Review Changes
     sticky_header_context: 'Step {step} of 5'
   empty_state:
     header: Add approved task orders