darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-10 18:22:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2418 from GSA/feat/text-by-user-update

Browse Source 
Updated FE to allow stats by user
This commit is contained in:
ccostino
2025-03-19 11:13:14 -04:00
committed by GitHub
parent 051114157d 61c37687a2
commit dc03a3f0d1
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/assets/javascripts/activityChart.js
+1 -1
View File
@@ -220,7 +220,7 @@
var url = type === 'service' var url = type === 'service'
? `/services/${currentServiceId}/daily-stats.json?timezone=${encodeURIComponent(userTimezone)}` ? `/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) return fetch(url)
app/main/views/dashboard.py
+8 -3
View File
@@ -132,13 +132,18 @@ def get_local_daily_stats_for_last_x_days(stats_utc, user_timezone, days):
@user_has_permissions() @user_has_permissions()
def get_daily_stats_by_user(service_id): def get_daily_stats_by_user(service_id):
date_range = get_stats_date_range() 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, service_id,
user_id=current_user.id, user_id=current_user.id,
start_date=date_range["start_date"], 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/<uuid:service_id>/template-usage") @main.route("/services/<uuid:service_id>/template-usage")