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

Merge pull request #1434 from dod-ccpo/bugfix/171243757-fix-report-header-inconsistency

Browse Source 
Tweak what "total portfolio value" represents
This commit is contained in:
graham-dds 2020-02-19 13:43:33 -05:00 committed by GitHub
commit ad08160bfb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
atst/routes/portfolios/index.py
View File

@ -50,9 +50,7 @@ def reports(portfolio_id):
"portfolios/reports/index.html", "portfolios/reports/index.html",
portfolio=portfolio, portfolio=portfolio,
# wrapped in str() because this sum returns a Decimal object # wrapped in str() because this sum returns a Decimal object
total_portfolio_value=str( total_portfolio_value=str(portfolio.total_obligated_funds),
portfolio.total_obligated_funds + portfolio.upcoming_obligated_funds
),
current_obligated_funds=current_obligated_funds, current_obligated_funds=current_obligated_funds,
expired_task_orders=Reports.expired_task_orders(portfolio), expired_task_orders=Reports.expired_task_orders(portfolio),
retrieved=pendulum.now(), # mocked datetime of reporting data retrival retrieved=pendulum.now(), # mocked datetime of reporting data retrival

2
translations.yaml
View File

@ -516,7 +516,7 @@ portfolios:
estimate_warning: Reports displayed in JEDI are estimates and not a system of record. To manage your costs, go to Azure by selecting the Login to Azure button above. estimate_warning: Reports displayed in JEDI are estimates and not a system of record. To manage your costs, go to Azure by selecting the Login to Azure button above.
total_value: total_value:
header: Total Portfolio Value header: Total Portfolio Value
tooltip: Total portfolio value is all obligated funds for current and upcoming task orders in this portfolio. tooltip: Total portfolio value is all obligated funds for active task orders in this portfolio.
task_orders: task_orders:
add_new_button: Add New Task Order add_new_button: Add New Task Order
review: review: