From 5937842ca40d1af6a3810a2950815d02fb7ae4e4 Mon Sep 17 00:00:00 2001 From: Richard Chapman Date: Tue, 21 Nov 2017 16:48:37 +0000 Subject: [PATCH] Fixes to the template usage page - When a year contains no data ensure a default set of months is returned so that all months can be seen in the UI - Add the template id so the user can click through to the template --- app/main/views/dashboard.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/app/main/views/dashboard.py b/app/main/views/dashboard.py index 63a0389d9..8717f5312 100644 --- a/app/main/views/dashboard.py +++ b/app/main/views/dashboard.py @@ -117,9 +117,18 @@ def template_usage(service_id): stats = sorted(stats, key=lambda x: (x['count']), reverse=True) + months = [ + { + 'name': yyyy_mm_to_datetime(month).strftime('%B'), + 'templates_used': {}, + } + for month in get_months_for_financial_year(year, time_format='%Y-%m') + ] + templates_by_month = defaultdict(list) for stat in stats: templates_by_month[int(stat['month'])].append({ + 'id': stat['template_id'], 'name': stat['name'], 'type': stat['type'], 'requested_count': stat['count']