diff --git a/app/assets/javascripts/activityChart.js b/app/assets/javascripts/activityChart.js index a9e75debd..e2add6117 100644 --- a/app/assets/javascripts/activityChart.js +++ b/app/assets/javascripts/activityChart.js @@ -220,7 +220,7 @@ var url = type === 'service' ? `/services/${currentServiceId}/daily-stats.json?timezone=${encodeURIComponent(userTimezone)}` - : `/services/${currentServiceId}/daily-stats-by-user.json`; + : `/services/${currentServiceId}/daily-stats-by-user.json?timezone=${encodeURIComponent(userTimezone)}`; return fetch(url) diff --git a/app/main/views/dashboard.py b/app/main/views/dashboard.py index 7790d101f..2e18be074 100644 --- a/app/main/views/dashboard.py +++ b/app/main/views/dashboard.py @@ -132,13 +132,18 @@ def get_local_daily_stats_for_last_x_days(stats_utc, user_timezone, days): @user_has_permissions() def get_daily_stats_by_user(service_id): date_range = get_stats_date_range() - stats = service_api_client.get_user_service_notification_statistics_by_day( + days = date_range["days"] + user_timezone = request.args.get("timezone", "UTC") + + stats_utc = service_api_client.get_user_service_notification_statistics_by_day( service_id, user_id=current_user.id, start_date=date_range["start_date"], - days=date_range["days"], + days=days, ) - return jsonify(stats) + + local_stats = get_local_daily_stats_for_last_x_days(stats_utc, user_timezone, days) + return jsonify(local_stats) @main.route("/services//template-usage")