{% endmacro %}
\ No newline at end of file
diff --git a/templates/portfolios/reports/application_and_env_spending.html b/templates/portfolios/reports/application_and_env_spending.html
new file mode 100644
index 00000000..d969a767
--- /dev/null
+++ b/templates/portfolios/reports/application_and_env_spending.html
@@ -0,0 +1,82 @@
+{% from "components/empty_state.html" import EmptyState %}
+{% from "components/icon.html" import Icon %}
+
+
+
Funds Expended per Application and Environment
+ {% set current_month_index = current_month.strftime('%m/%Y') %}
+ {% set prev_month_index = prev_month.strftime('%m/%Y') %}
+
+ {% if not portfolio.applications %}
+
+ {% set can_create_applications = user_can(permissions.CREATE_APPLICATION) %}
+ {% set message = ('portfolios.reports.empty_state.sub_message.can_create_applications' | translate)
+ if can_create_applications
+ else ('portfolios.reports.empty_state.sub_message.cannot_create_applications' | translate)
+ %}
+
+ {{ EmptyState(
+ ('portfolios.reports.empty_state.message' | translate),
+ action_label= ('portfolios.reports.empty_state.action_label' | translate) if can_create_applications else None,
+ action_href=url_for('applications.create_new_application_step_1', portfolio_id=portfolio.id) if can_create_applications else None,
+ icon='chart',
+ sub_message=message,
+ add_perms=can_create_applications
+ ) }}
+ {% else %}
+
+
+
+
+
+
Applications and Environments
+
Current Month
+
Last Month
+
Total Spent
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {% endif %}
+
\ No newline at end of file
diff --git a/templates/portfolios/reports/expired_task_orders.html b/templates/portfolios/reports/expired_task_orders.html
new file mode 100644
index 00000000..d7dd843a
--- /dev/null
+++ b/templates/portfolios/reports/expired_task_orders.html
@@ -0,0 +1,34 @@
+{% from "components/accordion.html" import Accordion %}
+
+
+
+
+ {% include "portfolios/reports/portfolio_summary.html" %}
+
+ {% include "portfolios/reports/obligated_funds.html" %}
+ {% include "portfolios/reports/expired_task_orders.html" %}
+
+ {% include "portfolios/reports/application_and_env_spending.html" %}
-
- {% set portfolio_totals = monthly_totals['portfolio'] %}
- {% set current_month_index = current_month.strftime('%m/%Y') %}
- {% set prev_month_index = prev_month.strftime('%m/%Y') %}
- {% set two_months_ago_index = two_months_ago.strftime('%m/%Y') %}
- {% set reports_url = url_for("portfolios.reports", portfolio_id=portfolio.id) %}
-
- {% if not portfolio.applications %}
-
- {% set can_create_applications = user_can(permissions.CREATE_APPLICATION) %}
- {% set message = 'This portfolio has no cloud environments set up, so there is no spending data to report. Create an application with some cloud environments to get started.'
- if can_create_applications
- else 'This portfolio has no cloud environments set up, so there is no spending data to report. Contact the portfolio owner to set up some cloud environments.'
- %}
-
- {{ EmptyState(
- 'Nothing to report',
- action_label='Add a new application' if can_create_applications else None,
- action_href=url_for('applications.create_new_application_step_1', portfolio_id=portfolio.id) if can_create_applications else None,
- icon='chart',
- sub_message=message,
- add_perms=can_create_applications
- ) }}
- {% else %}
-
-
-
-
+ Days Remaining
+ {{Tooltip(("common.lorem" | translate), title="")}}
+
+
{{ portfolio.days_to_funding_expiration }} days
+
+
\ No newline at end of file
diff --git a/tests/domain/test_reports.py b/tests/domain/test_reports.py
index d0e3a24e..e11b8dee 100644
--- a/tests/domain/test_reports.py
+++ b/tests/domain/test_reports.py
@@ -1,27 +1,22 @@
from atst.domain.reports import Reports
-
-from tests.factories import PortfolioFactory
+from tests.factories import *
-def test_portfolio_totals():
- portfolio = PortfolioFactory.create()
- report = Reports.portfolio_totals(portfolio)
- assert report == {"budget": 0, "spent": 0}
-
-
-# this is sketched in until we do real reporting
+# this is sketched out until we do real reporting
def test_monthly_totals():
- portfolio = PortfolioFactory.create()
- monthly = Reports.monthly_totals(portfolio)
-
- assert not monthly["environments"]
- assert not monthly["applications"]
- assert not monthly["portfolio"]
+ pass
-# this is sketched in until we do real reporting
-def test_cumulative_budget():
- portfolio = PortfolioFactory.create()
- months = Reports.cumulative_budget(portfolio)
+# this is sketched out until we do real reporting
+def test_current_obligated_funds():
+ pass
- assert len(months["months"]) >= 12
+
+# this is sketched out until we do real reporting
+def test_expired_task_orders():
+ pass
+
+
+# this is sketched out until we do real reporting
+def test_obligated_funds_by_JEDI_clin():
+ pass
diff --git a/tests/routes/portfolios/test_index.py b/tests/routes/portfolios/test_index.py
index 153ea406..ef368c3d 100644
--- a/tests/routes/portfolios/test_index.py
+++ b/tests/routes/portfolios/test_index.py
@@ -110,7 +110,6 @@ def test_portfolio_reports_with_mock_portfolio(client, user_session):
response = client.get(url_for("portfolios.reports", portfolio_id=portfolio.id))
assert response.status_code == 200
assert portfolio.name in response.data.decode()
- assert "$251,626.00 Total spend to date" in response.data.decode()
def test_delete_portfolio_success(client, user_session):
diff --git a/translations.yaml b/translations.yaml
index fddf9524..ea0ddca9 100644
--- a/translations.yaml
+++ b/translations.yaml
@@ -449,6 +449,14 @@ portfolios:
name: Name
portfolio_mgmt: Portfolio management
reporting: Reporting
+ reports:
+ empty_state:
+ message: Nothing to report.
+ sub_message:
+ can_create_applications: This portfolio has no cloud environments set up, so there is no spending data to report. Create an application with some cloud environments to get started.
+ cannot_create_applications: This portfolio has no cloud environments set up, so there is no spending data to report. Contact the portfolio owner to set up some cloud environments.
+ action_label: 'Add a new application'
+
task_orders:
review:
pdf_title: Approved Task Order