From ca409cae6c6f1614802c6f2596b0436d7eb35bb7 Mon Sep 17 00:00:00 2001 From: leigh-mil Date: Thu, 9 Jan 2020 10:47:42 -0500 Subject: [PATCH] Display TO number on Step 4 of TO builder --- templates/task_orders/form_header.html | 10 ++++++---- templates/task_orders/step_4.html | 2 ++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/templates/task_orders/form_header.html b/templates/task_orders/form_header.html index 05f9116a..3356a8c9 100644 --- a/templates/task_orders/form_header.html +++ b/templates/task_orders/form_header.html @@ -1,4 +1,4 @@ -{% macro TOFormStepHeader(description, title=None, to_number=None) %} +{% macro TOFormStepHeader(description=None, title=None, to_number=None) %}
{% if title -%}
@@ -10,8 +10,10 @@ Task Order Number: {{ to_number }}

{% endif %} -

- {{ description }} -

+ {% if description %} +

+ {{ description }} +

+ {% endif %}
{% endmacro %} diff --git a/templates/task_orders/step_4.html b/templates/task_orders/step_4.html index c862ad94..770a40c4 100644 --- a/templates/task_orders/step_4.html +++ b/templates/task_orders/step_4.html @@ -1,6 +1,7 @@ {% extends "task_orders/builder_base.html" %} {% from "task_orders/fragments/task_order_view.html" import TaskOrderView %} +{% from 'task_orders/form_header.html' import TOFormStepHeader %} {% 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) %} @@ -16,5 +17,6 @@ {% endblock %} {% block to_builder_form_field %} + {{ TOFormStepHeader(to_number=task_order.number) }} {{ TaskOrderView(task_order, portfolio, builder_mode=True) }} {% endblock %}