diff --git a/app/assets/javascripts/activityChart.js b/app/assets/javascripts/activityChart.js index f12774c68..efdda477f 100644 --- a/app/assets/javascripts/activityChart.js +++ b/app/assets/javascripts/activityChart.js @@ -4,6 +4,7 @@ let currentType = 'service'; const tableContainer = document.getElementById('activityContainer'); const currentUserName = tableContainer.getAttribute('data-currentUserName'); + const currentServiceId = tableContainer.getAttribute('data-currentServiceId'); const COLORS = { delivered: '#0076d6', failed: '#fa9441', @@ -212,7 +213,7 @@ return; } - var url = type === 'service' ? `/daily_stats.json` : `/daily_stats_by_user.json`; + var url = type === 'service' ? `/services/${currentServiceId}/daily-stats.json` : `/services/${currentServiceId}/daily-stats-by-user.json`; return fetch(url) .then(response => { if (!response.ok) { diff --git a/app/main/views/dashboard.py b/app/main/views/dashboard.py index 1f8cac573..f20af83e8 100644 --- a/app/main/views/dashboard.py +++ b/app/main/views/dashboard.py @@ -76,25 +76,22 @@ def service_dashboard(service_id): ) -@main.route("/daily_stats.json") -def get_daily_stats(): - service_id = session.get("service_id") +@main.route("/services//daily-stats.json") +def get_daily_stats(service_id): date_range = get_stats_date_range() - stats = service_api_client.get_service_notification_statistics_by_day( service_id, start_date=date_range["start_date"], days=date_range["days"] ) return jsonify(stats) -@main.route("/daily_stats_by_user.json") -def get_daily_stats_by_user(): +@main.route("/services//daily-stats-by-user.json") +def get_daily_stats_by_user(service_id): service_id = session.get("service_id") date_range = get_stats_date_range() - user_id = current_user.id stats = service_api_client.get_user_service_notification_statistics_by_day( service_id, - user_id, + user_id=current_user.id, start_date=date_range["start_date"], days=date_range["days"], ) diff --git a/app/templates/views/dashboard/activity-table.html b/app/templates/views/dashboard/activity-table.html index a40840033..7a8bd7736 100644 --- a/app/templates/views/dashboard/activity-table.html +++ b/app/templates/views/dashboard/activity-table.html @@ -18,7 +18,7 @@
-
+

Service activity