darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-07 03:48:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Updated frontend call to include local timezone

Browse Source
This commit is contained in:
alexjanousekGSA
2025-01-30 17:24:29 -05:00
parent dafe86aad6
commit c844b9981b
3 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/assets/javascripts/activityChart.js
View File

@@ -201,15 +201,22 @@
return; return;
} }
var url = type === 'service' ? `/daily_stats.json` : `/daily_stats_by_user.json`; // get local timezone
var userTimezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
var url = type === 'service'
? `/daily_stats.json?timezone=${encodeURIComponent(userTimezone)}`
: `/daily_stats_by_user.json`;
return fetch(url) return fetch(url)
.then(response => { .then(response => {
if (!response.ok) { if (!response.ok) {
throw new Error('Network response was not ok'); throw new Error('Network response was not ok');
} }
console.log(response)
return response.json(); return response.json();
}) })
.then(data => { .then(data => {
console.log(data)
labels = []; labels = [];
deliveredData = []; deliveredData = [];
failedData = []; failedData = [];

6
app/main/views/dashboard.py
View File

@@ -99,8 +99,12 @@ def get_daily_stats():
service_id = session.get("service_id") service_id = session.get("service_id")
date_range = get_stats_date_range() date_range = get_stats_date_range()
# Get timezone from request (default to UTC if not provided)
user_timezone = request.args.get("timezone", "UTC")
print(f"Detected User Timezone test124: {user_timezone}")
stats = service_api_client.get_service_notification_statistics_by_day( stats = service_api_client.get_service_notification_statistics_by_day(
service_id, start_date=date_range["start_date"], days=date_range["days"] service_id, start_date=date_range["start_date"], days=date_range["days"], timezone=user_timezone
) )
return jsonify(stats) return jsonify(stats)

4
app/notify_client/service_api_client.py
View File

@@ -45,13 +45,13 @@ class ServiceAPIClient(NotifyAdminAPIClient):
)["data"] )["data"]
def get_service_notification_statistics_by_day( def get_service_notification_statistics_by_day(
self, service_id, start_date=None, days=None self, service_id, start_date=None, days=None, timezone="UTC"
): ):
if start_date is None: if start_date is None:
start_date = datetime.now().strftime("%Y-%m-%d") start_date = datetime.now().strftime("%Y-%m-%d")
return self.get( return self.get(
"/service/{0}/statistics/{1}/{2}".format(service_id, start_date, days), "/service/{0}/statistics/{1}/{2}?timezone={3}".format(service_id, start_date, days, timezone),
)["data"] )["data"]
def get_user_service_notification_statistics_by_day( def get_user_service_notification_statistics_by_day(