diff --git a/app/main/views/organizations.py b/app/main/views/organizations.py index 3c1e447ff..e9e757630 100644 --- a/app/main/views/organizations.py +++ b/app/main/views/organizations.py @@ -5,7 +5,12 @@ from functools import partial from flask import flash, redirect, render_template, request, url_for from flask_login import current_user -from app import current_organization, org_invite_api_client, organizations_client +from app import ( + current_organization, + org_invite_api_client, + organizations_client, + service_api_client, +) from app.main import main from app.main.forms import ( AdminBillingDetailsForm, @@ -67,6 +72,17 @@ def add_organization(): def organization_dashboard(org_id): year, current_financial_year = requested_and_current_financial_year(request) services = current_organization.services_and_usage(financial_year=year)["services"] + + total_messages_sent = 0 + total_messages_remaining = 0 + + for service in services: + service_message_ratio = service_api_client.get_service_message_ratio( + service["service_id"] + ) + total_messages_sent += service_message_ratio.get("messages_sent", 0) + total_messages_remaining += service_message_ratio.get("messages_remaining", 0) + return render_template( "views/organizations/organization/index.html", services=services, @@ -84,6 +100,8 @@ 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, ) diff --git a/app/templates/views/organizations/organization/index.html b/app/templates/views/organizations/organization/index.html index e0520a968..ff2f8f69c 100644 --- a/app/templates/views/organizations/organization/index.html +++ b/app/templates/views/organizations/organization/index.html @@ -17,8 +17,43 @@
Combined totals across all services in {{ current_org.name }}