diff --git a/atst/models/task_order.py b/atst/models/task_order.py index 0b3c27ba..d2a63964 100644 --- a/atst/models/task_order.py +++ b/atst/models/task_order.py @@ -1,5 +1,4 @@ from enum import Enum -from decimal import Decimal from sqlalchemy import Column, DateTime, ForeignKey, String from sqlalchemy.ext.hybrid import hybrid_property @@ -141,14 +140,6 @@ class TaskOrder(Base, mixins.TimestampsMixin): def total_contract_amount(self): return sum((clin.total_amount for clin in self.clins if clin.total_amount)) - @property - def invoiced_funds(self): - # TODO: implement this using reporting data from the CSP - if self.is_active: - return self.total_obligated_funds * Decimal(0.75) - else: - return 0 - @property def display_status(self): if self.status == Status.UNSIGNED: diff --git a/templates/task_orders/fragments/task_order_view.html b/templates/task_orders/fragments/task_order_view.html index 796bbfa6..c78434ee 100644 --- a/templates/task_orders/fragments/task_order_view.html +++ b/templates/task_orders/fragments/task_order_view.html @@ -8,8 +8,8 @@ {% set expended_funds = task_order.invoiced_funds %}
-
-
+
+

{{ 'task_orders.summary.total' | translate }} {{ Tooltip(("task_orders.review.tooltip.total_value" | translate), title="", classes="icon-tooltip--tight") }} @@ -18,7 +18,7 @@ {{ contract_amount | dollars }}

-
+

{{ 'task_orders.summary.obligated' | translate }} {{ Tooltip(("task_orders.review.tooltip.obligated_funds" | translate), title="", classes="icon-tooltip--tight") }} @@ -27,15 +27,6 @@ {{ obligated_funds | dollars }}

-
-

- {{ 'task_orders.summary.expended' | translate }} - {{ Tooltip(("task_orders.review.tooltip.expended_funds" | translate), title="", classes="icon-tooltip--tight") }} -

-

- {{ expended_funds | dollars }} -

-

diff --git a/templates/task_orders/index.html b/templates/task_orders/index.html index db91fc22..f643894a 100644 --- a/templates/task_orders/index.html +++ b/templates/task_orders/index.html @@ -34,8 +34,8 @@

{{ to_number }} {{ Icon("caret_right", classes="icon--tiny icon--primary" ) }}

{% if status != 'Expired' -%} -
-
+
+
Current Period of Performance
@@ -45,18 +45,14 @@ {{ task_order.end_date | formattedDate(formatter="%b %d, %Y") }}

-
+
Total Value

{{ task_order.total_contract_amount | dollars }}

-
+
Total Obligated

{{ task_order.total_obligated_funds | dollars }}

-
-
Total Expended
-

{{ task_order.invoiced_funds | dollars }}

-
{%- endif %}
diff --git a/translations.yaml b/translations.yaml index 4229545a..adee11af 100644 --- a/translations.yaml +++ b/translations.yaml @@ -533,7 +533,6 @@ task_orders: tooltip: obligated_funds: Funds committed to fund your portfolio. This may represent 100% of your total Task Order value, or a portion of it. total_value: All obligated and projected funds for the Task Order’s Base and Option CLINs. - expended_funds: All funds spent from the Task Order so far. form: add_clin: Add Another CLIN add_to_header: Enter the Task Order number @@ -593,7 +592,6 @@ task_orders: summary: obligated: Total Obligated total: Total Value - expended: Total Expended JEDICLINType: JEDI_CLIN_1: "IDIQ CLIN 0001 Unclassified IaaS/PaaS" JEDI_CLIN_2: "IDIQ CLIN 0002 Classified IaaS/PaaS"