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

portfolio value should include upcoming $obligated

Browse Source 
Previously, we were displaying the total_portfolio_value as just
currently obligated funds. Instead, this value should be obligated funds
in current task orders and signed, upcoming task orders
This commit is contained in:
graham-dds 2020-02-11 11:33:23 -05:00
parent e553a673b1
commit 68e7c27aed
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,8 +50,10 @@ def reports(portfolio_id):
return render_template( return render_template(
"portfolios/reports/index.html", "portfolios/reports/index.html",
portfolio=portfolio, portfolio=portfolio,
# wrapped in str() because the sum of obligated funds returns a Decimal object # wrapped in str() because this sum returns a Decimal object
total_portfolio_value=str(portfolio.total_obligated_funds), total_portfolio_value=str(
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=datetime.now(), # mocked datetime of reporting data retrival retrieved=datetime.now(), # mocked datetime of reporting data retrival

2
translations.yaml
View File

@ -508,7 +508,7 @@ portfolios:
estimate_warning: Reports displayed in JEDI are estimates and not a system of record. estimate_warning: Reports displayed in JEDI are estimates and not a system of record.
total_value: total_value:
header: Total Portfolio Value header: Total Portfolio Value
tooltip: Total portfolio value is all obligated and projected funds for all task orders in this portfolio. tooltip: Total portfolio value is all obligated funds for current and upcoming 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: