From a3e9400a0ddd6e364ab3132f834d885ed78e4540 Mon Sep 17 00:00:00 2001 From: graham-dds Date: Wed, 19 Feb 2020 10:26:38 -0500 Subject: [PATCH] Tweak what "total portfolio value" represents On the reports page, "total portfolio value" should represent the sum of obligated funds for active task orders. --- atst/routes/portfolios/index.py | 4 +--- translations.yaml | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/atst/routes/portfolios/index.py b/atst/routes/portfolios/index.py index 6472fca1..02805480 100644 --- a/atst/routes/portfolios/index.py +++ b/atst/routes/portfolios/index.py @@ -50,9 +50,7 @@ def reports(portfolio_id): "portfolios/reports/index.html", portfolio=portfolio, # wrapped in str() because this sum returns a Decimal object - total_portfolio_value=str( - portfolio.total_obligated_funds + portfolio.upcoming_obligated_funds - ), + total_portfolio_value=str(portfolio.total_obligated_funds), current_obligated_funds=current_obligated_funds, expired_task_orders=Reports.expired_task_orders(portfolio), retrieved=pendulum.now(), # mocked datetime of reporting data retrival diff --git a/translations.yaml b/translations.yaml index 7e6da323..bc4e1479 100644 --- a/translations.yaml +++ b/translations.yaml @@ -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. total_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: add_new_button: Add New Task Order review: