darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-17 21:19:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

Moved usage to it's own route to not confuse with dashboard

Browse Source
This commit is contained in:
Beverly Nguyen
2025-10-14 12:27:15 -07:00
parent 0168331390
commit 08d39d7bad
5 changed files with 128 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
app/main/views/organizations.py
View File

@@ -85,13 +85,32 @@ def organization_dashboard(org_id):
return render_template(
"views/organizations/organization/index.html",
services=services,
years=get_tuples_of_financial_years(
partial(url_for, ".organization_dashboard", org_id=current_organization.id),
start=current_financial_year - 2,
end=current_financial_year,
),
selected_year=year,
messages_sent=total_messages_sent,
messages_remaining=total_messages_remaining,
)
@main.route("/organizations/<uuid:org_id>/usage", methods=["GET"])
@user_has_permissions()
def organization_usage(org_id):
year, current_financial_year = requested_and_current_financial_year(request)
services = current_organization.services_and_usage(financial_year=year)["services"]
return render_template(
"views/organizations/organization/usage.html",
services=services,
years=get_tuples_of_financial_years(
partial(url_for, ".organization_usage", org_id=current_organization.id),
start=current_financial_year - 2,
end=current_financial_year,
),
selected_year=year,
search_form=SearchByNameForm() if len(services) > 7 else None,
**{
f"total_{key}": sum(service[key] for service in services)
@@ -100,8 +119,6 @@ def organization_dashboard(org_id):
download_link=url_for(
".download_organization_usage_report", org_id=org_id, selected_year=year
),
messages_sent=total_messages_sent,
messages_remaining=total_messages_remaining,
)