darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-19 05:59:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #558 from alphagov/template-stats-2

Browse Source 
Make template usage on dashboard easier to scan
This commit is contained in:
Chris Hill-Scott
2016-05-17 11:26:49 +01:00
parent c4de547b74 c3d78f5652
commit 5625ef6eee
13 changed files with 203 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -71,10 +71,14 @@ def service_dashboard_updates(service_id):
@login_required
@user_has_permissions('view_activity', admin_override=True)
def template_history(service_id):
template_statistics = aggregate_usage(
template_statistics_client.get_template_statistics_for_service(service_id)
)
return render_template(
'views/dashboard/all-template-statistics.html',
template_statistics=aggregate_usage(
template_statistics_client.get_template_statistics_for_service(service_id)
template_statistics=template_statistics,
most_used_template_count=max(
[row['usage_count'] for row in template_statistics] or [0]
)
)
@@ -197,12 +201,17 @@ def get_dashboard_statistics_for_service(service_id):
sms_sent = usage['data'].get('sms_count', 0)
emails_sent = usage['data'].get('email_count', 0)
template_statistics = aggregate_usage(
template_statistics_client.get_template_statistics_for_service(service_id, limit_days=7)
)
return {
'statistics': add_rates_to(sum_of_statistics(
statistics_api_client.get_statistics_for_service(service_id, limit_days=7)['data']
)),
'template_statistics': aggregate_usage(
template_statistics_client.get_template_statistics_for_service(service_id, limit_days=7)
'template_statistics': template_statistics,
'most_used_template_count': max(
[row['usage_count'] for row in template_statistics] or [0]
),
'emails_sent': emails_sent,
'sms_free_allowance': sms_free_allowance,