diff --git a/templates/task_orders/fragments/task_order_view.html b/templates/task_orders/fragments/task_order_view.html index 32fb4644..2ec2a738 100644 --- a/templates/task_orders/fragments/task_order_view.html +++ b/templates/task_orders/fragments/task_order_view.html @@ -7,30 +7,11 @@ {% set contract_amount = task_order.total_contract_amount %} {% set expended_funds = task_order.invoiced_funds %} - {% if builder_mode -%} - {% set obligated = 'task_orders.form.step_4.obligated' %} - {% set total = 'task_orders.form.step_4.total' %} - {% set expended = 'task_orders.form.step_4.expended' %} - {% else %} - {% set obligated = 'task_orders.review.summary.obligated' %} - {% set total = 'task_orders.review.summary.total' %} - {% set expended = 'task_orders.review.summary.expended' %} - {%- endif %} -

- {{ obligated | translate }} - {{ Tooltip(("task_orders.review.tooltip.obligated_funds" | translate), title="", classes="summary-item__header-icon") }} -

-

- {{ obligated_funds | dollars }} -

-
-
-

- {{ total | translate }} + {{ 'task_orders.summary.total' | translate }} {{ Tooltip(("task_orders.review.tooltip.total_value" | translate), title="", classes="summary-item__header-icon") }}

@@ -39,7 +20,16 @@

- {{ expended | translate }} + {{ 'task_orders.summary.obligated' | translate }} + {{ Tooltip(("task_orders.review.tooltip.obligated_funds" | translate), title="", classes="summary-item__header-icon") }} +

+

+ {{ obligated_funds | dollars }} +

+
+
+

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

diff --git a/translations.yaml b/translations.yaml index 2601da37..87c584e2 100644 --- a/translations.yaml +++ b/translations.yaml @@ -496,10 +496,6 @@ task_orders: JEDI_CLIN_2: 'Classified IaaS and PaaS (IDIQ CLIN 0002)' JEDI_CLIN_3: 'Unclassified Cloud Support Package (IDIQ CLIN 0003)' JEDI_CLIN_4: 'Classified Cloud Support Package (IDIQ CLIN 0004)' - summary: - obligated: Total obligated funds - total: Total Task Order value - expended: Total expended funds 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. @@ -534,9 +530,6 @@ task_orders: next_button: 'Next: Review Task Order' percent_obligated: '% of Funds Obligated' step_4: - obligated: Total Obligated - total: Total Value - expended: Total Expended documents: Documents clins: CLIN Summary step_5: @@ -559,6 +552,10 @@ task_orders: text: I acknowledge, by executing the confirmation above and submitting this verification, that I am subject to potential penalties that may include fines, imprisonment, or both, under the U.S. law and regulations for any false statement or misrepresentation in association with this Task Order submission or on any accompanying documentation. status_empty_state: 'This Portfolio has no {status} Task Orders.' status_list_title: '{status} 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'