pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Standardize copy in TO builder and TO view page

Browse Source
This commit is contained in:
leigh-mil 2020-01-21 11:40:41 -05:00
parent 2d32e9c79b
commit d2b9577e3b
2 changed files with 15 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
templates/task_orders/fragments/task_order_view.html
View File

@ -7,30 +7,11 @@
{% set contract_amount = task_order.total_contract_amount %} {% set contract_amount = task_order.total_contract_amount %}
{% set expended_funds = task_order.invoiced_funds %} {% 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 %}
<div> <div>
<section class="row"> <section class="row">
<div class='col col--grow summary-item'> <div class='col col--grow summary-item'>
<h4 class="summary-item__header"> <h4 class="summary-item__header">
<span class="summary-item__header-text">{{ obligated | translate }}</span> <span class="summary-item__header-text">{{ 'task_orders.summary.total' | translate }}</span>
{{ Tooltip(("task_orders.review.tooltip.obligated_funds" | translate), title="", classes="summary-item__header-icon") }}
</h4>
<p class="summary-item__value--large">
{{ obligated_funds | dollars }}
</p>
</div>
<div class='col col--grow summary-item'>
<h4 class="summary-item__header">
<span class="summary-item__header-text">{{ total | translate }}</span>
{{ Tooltip(("task_orders.review.tooltip.total_value" | translate), title="", classes="summary-item__header-icon") }} {{ Tooltip(("task_orders.review.tooltip.total_value" | translate), title="", classes="summary-item__header-icon") }}
</h4> </h4>
<p class="summary-item__value--large"> <p class="summary-item__value--large">
@ -39,7 +20,16 @@
</div> </div>
<div class='col col--grow summary-item'> <div class='col col--grow summary-item'>
<h4 class="summary-item__header"> <h4 class="summary-item__header">
<span class="summary-item__header-text">{{ expended | translate }}</span> <span class="summary-item__header-text">{{ 'task_orders.summary.obligated' | translate }}</span>
{{ Tooltip(("task_orders.review.tooltip.obligated_funds" | translate), title="", classes="summary-item__header-icon") }}
</h4>
<p class="summary-item__value--large">
{{ obligated_funds | dollars }}
</p>
</div>
<div class='col col--grow summary-item'>
<h4 class="summary-item__header">
<span class="summary-item__header-text">{{ 'task_orders.summary.expended' | translate }}</span>
{{ Tooltip(("task_orders.review.tooltip.expended_funds" | translate), title="", classes="summary-item__header-icon") }} {{ Tooltip(("task_orders.review.tooltip.expended_funds" | translate), title="", classes="summary-item__header-icon") }}
</h4> </h4>
<p class="summary-item__value--large"> <p class="summary-item__value--large">

11
translations.yaml
View File

@ -496,10 +496,6 @@ task_orders:
JEDI_CLIN_2: 'Classified IaaS and PaaS (IDIQ CLIN 0002)' JEDI_CLIN_2: 'Classified IaaS and PaaS (IDIQ CLIN 0002)'
JEDI_CLIN_3: 'Unclassified Cloud Support Package (IDIQ CLIN 0003)' JEDI_CLIN_3: 'Unclassified Cloud Support Package (IDIQ CLIN 0003)'
JEDI_CLIN_4: 'Classified Cloud Support Package (IDIQ CLIN 0004)' 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: tooltip:
obligated_funds: Funds committed to fund your portfolio. This may represent 100% of your total Task Order value, or a portion of it. 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. 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' next_button: 'Next: Review Task Order'
percent_obligated: '% of Funds Obligated' percent_obligated: '% of Funds Obligated'
step_4: step_4:
obligated: Total Obligated
total: Total Value
expended: Total Expended
documents: Documents documents: Documents
clins: CLIN Summary clins: CLIN Summary
step_5: 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. 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_empty_state: 'This Portfolio has no {status} Task Orders.'
status_list_title: '{status} Task Orders' status_list_title: '{status} Task Orders'
summary:
obligated: Total Obligated
total: Total Value
expended: Total Expended
JEDICLINType: JEDICLINType:
JEDI_CLIN_1: 'IDIQ CLIN 0001 Unclassified IaaS/PaaS' JEDI_CLIN_1: 'IDIQ CLIN 0001 Unclassified IaaS/PaaS'
JEDI_CLIN_2: 'IDIQ CLIN 0002 Classified IaaS/PaaS' JEDI_CLIN_2: 'IDIQ CLIN 0002 Classified IaaS/PaaS'