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

Merge pull request #942 from dod-ccpo/to-form-fixes

Browse Source 
TO Form fixes
This commit is contained in:
dandds 2019-06-18 14:41:54 -04:00 committed by GitHub
commit a91d438d1c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
atst/routes/task_orders/new.py
View File

@ -20,10 +20,8 @@ def render_task_orders_edit(portfolio_id=None, task_order_id=None, form=None):
else: else:
render_args["form"] = form or TaskOrderForm() render_args["form"] = form or TaskOrderForm()
render_args["cancel_url"] = ( render_args["cancel_url"] = url_for(
http_request.referrer "task_orders.portfolio_funding", portfolio_id=portfolio_id
if http_request.referrer
else url_for("task_orders.portfolio_funding", portfolio_id=portfolio_id)
) )
return render_template("task_orders/edit.html", **render_args) return render_template("task_orders/edit.html", **render_args)

8
templates/components/totals_box.html
View File

@ -6,15 +6,15 @@
{% set contract_amount = task_order.total_contract_amount %} {% set contract_amount = task_order.total_contract_amount %}
{% endif %} {% endif %}
<div class="h4">Total obligated funds</div> <div class="h4">{{ 'components.totals_box.obligated_funds' | translate }}</div>
<div class="h3">{{ obligated_funds | dollars }}</div> <div class="h3">{{ obligated_funds | dollars }}</div>
<div>This is the funding allocated to cloud services. It may be 100% or a portion of the total task order budget.</div> <div>{{ 'components.totals_box.obligated_text' | translate }}</div>
<hr> <hr>
<div class="h4">Total contract amount</div> <div class="h4">{{ 'components.totals_box.total_amount' | translate }}</div>
<div class="h3">{{ contract_amount | dollars }}</div> <div class="h3">{{ contract_amount | dollars }}</div>
<div>This is the value of all funds obligated for this contract, including -- but not limited to -- funds obligated for the cloud.</div> <div>{{ 'components.totals_box.total_text' | translate }}</div>
</div> </div>

8
templates/task_orders/edit.html
View File

@ -419,15 +419,15 @@
v-bind:contract-amount='total' v-bind:contract-amount='total'
> >
<div class="col totals-box"> <div class="col totals-box">
<div class="h4">Total obligated funds</div> <div class="h4">{{ 'components.totals_box.obligated_funds' | translate }}</div>
<div class="h3" v-html="formattedObligated"></div> <div class="h3" v-html="formattedObligated"></div>
<div>This is the funding allocated to cloud services. It may be 100% or a portion of the total task order budget.</div> <div>{{ 'components.totals_box.obligated_text' | translate }}</div>
<hr> <hr>
<div class="h4">Total contract amount</div> <div class="h4">{{ 'components.totals_box.total_amount' | translate }}</div>
<div class="h3" v-html="formattedContractAmount"></div> <div class="h3" v-html="formattedContractAmount"></div>
<div>This is the value of all funds obligated for this contract, including -- but not limited to -- funds obligated for the cloud.</div> <div>{{ 'components.totals_box.total_text' | translate }}</div>
</div> </div>
</totals-box> </totals-box>

5
translations.yaml
View File

@ -50,6 +50,11 @@ components:
modal: modal:
destructive_message: You will no longer be able to access this {resource} destructive_message: You will no longer be able to access this {resource}
destructive_title: Warning! This action is permanent destructive_title: Warning! This action is permanent
totals_box:
obligated_funds: Funds obligated for cloud
obligated_text: This is the funding allocated to cloud services. It may be 100% or a portion of the total task order budget.
total_amount: Total contract amount
total_text: This is the value of all funds obligated for this contract, including -- but not limited to -- funds obligated for the cloud.
usa_header: usa_header:
flag_image_alt: U.S. Flag flag_image_alt: U.S. Flag
official_message: An official website of the United States government official_message: An official website of the United States government