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

Merge branch 'master' into new-api-for-deleting-templates

Browse Source
This commit is contained in:
Martyn Inglis
2016-08-23 09:31:05 +01:00
parent 9d25f326b0 74c0c3e132
commit c44a6cb65d
27 changed files with 351 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -66,11 +66,12 @@ 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=template_statistics,
most_used_template_count=max(
[row['usage_count'] for row in template_statistics] or [0]
[row['count'] for row in template_statistics] or [0]
)
)
@@ -98,31 +99,9 @@ def weekly(service_id):
def aggregate_usage(template_statistics):
immutable_template = namedtuple('Template', ['template_type', 'name', 'id'])
# grouby requires the list to be sorted by template first
statistics_sorted_by_template = sorted(
(
(
immutable_template(**row['template']),
row['usage_count']
)
for row in template_statistics
),
key=lambda items: items[0]
)
# then group and sort the result by usage
return sorted(
(
{
'usage_count': sum(usage[1] for usage in usages),
'template': template
}
for template, usages in groupby(statistics_sorted_by_template, lambda items: items[0])
),
key=lambda row: row['usage_count'],
template_statistics,
key=lambda template_statistic: template_statistic['count'],
reverse=True
)
@@ -149,7 +128,7 @@ def get_dashboard_partials(service_id):
'views/dashboard/template-statistics.html',
template_statistics=template_statistics,
most_used_template_count=max(
[row['usage_count'] for row in template_statistics] or [0]
[row['count'] for row in template_statistics] or [0]
),
),
'has_template_statistics': bool(template_statistics),