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): 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) %}
- {{ description }} -
+ {% if description %} ++ {{ description }} +
+ {% endif %}- {{ contract_amount | dollars }} -
- {% else %} --
- {% endif %} ++ {{ contract_amount | dollars }} +