From 0bf0e9dcb292c2f4aad6c0d79ec59a73b8f9f4eb Mon Sep 17 00:00:00 2001
From: leigh-mil <leigh-ctr@friends.dds.mil>
Date: Thu, 9 Jan 2020 10:36:27 -0500
Subject: [PATCH 1/3] Remove unnecessary if statement that was preventing TO
 total value from being displayed.

---
 templates/task_orders/fragments/task_order_view.html | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/templates/task_orders/fragments/task_order_view.html b/templates/task_orders/fragments/task_order_view.html
index cfa2fcb3..31e95519 100644
--- a/templates/task_orders/fragments/task_order_view.html
+++ b/templates/task_orders/fragments/task_order_view.html
@@ -23,14 +23,9 @@
           <span class="summary-item__header-text">Total Task Order value</span>
           {{ Tooltip(("task_orders.review.tooltip.total_value" | translate), title="", classes="summary-item__header-icon") }}
         </h4>
-        {% set earliest_pop_start_date, latest_pop_end_date = portfolio.funding_duration %}
-        {% if earliest_pop_start_date and latest_pop_end_date  %}
-          <p class="summary-item__value--large">
-            {{ contract_amount | dollars }}
-          </p>
-        {% else %}
-          <p class="summary-item__value--large"> - </p>
-        {% endif %}
+        <p class="summary-item__value--large">
+          {{ contract_amount | dollars }}
+        </p>
       </div>
       <div class='col col--grow summary-item'>
         <h4 class="summary-item__header">

From 34cb9daca62bccbcee52b72299d37ffb43cde6b3 Mon Sep 17 00:00:00 2001
From: leigh-mil <leigh-ctr@friends.dds.mil>
Date: Thu, 9 Jan 2020 10:37:54 -0500
Subject: [PATCH 2/3] Only fake expended funds if the TO is active

---
 atst/models/task_order.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/atst/models/task_order.py b/atst/models/task_order.py
index 36ba905e..789a7e3f 100644
--- a/atst/models/task_order.py
+++ b/atst/models/task_order.py
@@ -140,7 +140,10 @@ class TaskOrder(Base, mixins.TimestampsMixin):
     @property
     def invoiced_funds(self):
         # TODO: implement this using reporting data from the CSP
-        return self.total_obligated_funds * Decimal(0.75)
+        if self.is_active:
+            return self.total_obligated_funds * Decimal(0.75)
+        else:
+            return 0
 
     @property
     def display_status(self):

From ca409cae6c6f1614802c6f2596b0436d7eb35bb7 Mon Sep 17 00:00:00 2001
From: leigh-mil <leigh-ctr@friends.dds.mil>
Date: Thu, 9 Jan 2020 10:47:42 -0500
Subject: [PATCH 3/3] 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) %}
   <div class="task-order__header">
     {% if title -%}
       <div class="h2">
@@ -10,8 +10,10 @@
         <strong>Task Order Number:</strong> {{ to_number }}
       </p>
     {% endif %}
-    <p>
-      {{ description }}
-    </p>
+    {% if description %}
+      <p>
+        {{ description }}
+      </p>
+    {% endif %}
   </div>
 {% 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 %}