Merge branch 'master' into add_proxy_header_check

app/assets/stylesheets/components/big-number.scss

@@ -85,7 +85,8 @@
       outline: 3px solid $yellow;
     }
 
-    .big-number {
+    .big-number,
+    .big-number-smaller {
       background: transparent;
     }
 

app/main/views/dashboard.py

@@ -10,7 +10,6 @@ from flask import (
     Response,
 )
 from flask_login import login_required
-
 from notifications_utils.recipients import format_phone_number_human_readable
 
 from app.main import main
@@ -106,6 +105,61 @@ def template_history(service_id):
     )
 
 
+@main.route("/services/<service_id>/template-usage")
+@login_required
+@user_has_permissions(admin_override=True)
+def template_usage(service_id):
+
+    year, current_financial_year = requested_and_current_financial_year(request)
+    stats = template_statistics_client.get_monthly_template_usage_for_service(service_id, year)
+
+    stats = sorted(stats, key=lambda x: (x['count']), reverse=True)
+
+    stats_by_month = list()
+
+    for month in get_months_for_financial_year(year, time_format='%Y-%m'):
+        long_month = yyyy_mm_to_datetime(month).strftime('%B')
+
+        template_used = list()
+
+        for stat in stats:
+            if long_month == datetime(1900, stat['month'], 1).strftime("%B"):
+                template_used.append(
+                    {
+                        'name': stat['name'],
+                        'type': stat['type'],
+                        'requested_count': stat['count']
+                    }
+                )
+
+        stats_by_month.append(
+            {
+                'name': long_month,
+                'templates_used': template_used
+            }
+        )
+
+    months = stats_by_month
+
+    return render_template(
+        'views/dashboard/all-template-statistics.html',
+        months=months,
+        stats=stats,
+        most_used_template_count=max(
+            max((
+                template['requested_count']
+                for template in month['templates_used']
+            ), default=0)
+            for month in months
+        ),
+        years=get_tuples_of_financial_years(
+            partial(url_for, '.template_history', service_id=service_id),
+            end=current_financial_year,
+        ),
+        selected_year=year
+    )
+
+
 @main.route("/services/<service_id>/usage")
 @login_required
 @user_has_permissions('manage_settings', admin_override=True)
@@ -248,7 +302,18 @@ def get_dashboard_partials(service_id):
         for job in job_api_client.get_jobs(service_id, limit_days=7, statuses=statuses_to_display)['data']
     ]
     service = service_api_client.get_detailed_service(service_id)
-    column_width = 'column-third' if 'letter' in current_service['permissions'] else 'column-half'
+    column_width, max_notifiction_count = get_column_properties(
+        number_of_columns=(
+            3 if 'letter' in current_service['permissions'] else 2
+        )
+    )
+    dashboard_totals = get_dashboard_totals(service['data']['statistics']),
+    highest_notification_count = max(
+        sum(
+            value[key] for key in {'requested', 'failed', 'delivered'}
+        )
+        for key, value in dashboard_totals[0].items()
+    )
 
     return {
         'upcoming': render_template(
@@ -265,8 +330,11 @@ def get_dashboard_partials(service_id):
         'totals': render_template(
             'views/dashboard/_totals.html',
             service_id=service_id,
-            statistics=get_dashboard_totals(service['data']['statistics']),
-            column_width=column_width
+            statistics=dashboard_totals[0],
+            column_width=column_width,
+            smaller_font_size=(
+                highest_notification_count > max_notifiction_count
+            ),
         ),
         'template-statistics': render_template(
             'views/dashboard/template-statistics.html',
@@ -441,3 +509,10 @@ def get_tuples_of_financial_years(
         )
         for year in range(start, end + 1)
     )
+
+
+def get_column_properties(number_of_columns):
+    return {
+        2: ('column-half', 999999999),
+        3: ('column-third', 99999),
+    }.get(number_of_columns)

app/notify_client/template_statistics_api_client.py

@@ -26,6 +26,12 @@ class TemplateStatisticsApiClient(NotifyAdminAPIClient):
             url='/service/{}/notifications/templates/monthly?year={}'.format(service_id, year)
         )['data']
 
+    def get_monthly_template_usage_for_service(self, service_id, year):
+
+        return self.get(
+            url='/service/{}/notifications/templates_usage/monthly?year={}'.format(service_id, year)
+        )['stats']
+
     def get_template_statistics_for_template(self, service_id, template_id):
 
         return self.get(

app/templates/views/dashboard/_totals.html

@@ -11,7 +11,8 @@
         statistics['email']['failed_percentage'],
         statistics['email']['show_warning'],
         failure_link=url_for(".view_notifications", service_id=service_id, message_type='email', status='failed'),
-        link=url_for(".view_notifications", service_id=service_id, message_type='email', status='sending,delivered,failed')
+        link=url_for(".view_notifications", service_id=service_id, message_type='email', status='sending,delivered,failed'),
+        smaller=smaller_font_size
       ) }}
     </div>
     <div id="total-sms" class="{{column_width}}">
@@ -22,7 +23,8 @@
         statistics['sms']['failed_percentage'],
         statistics['sms']['show_warning'],
         failure_link=url_for(".view_notifications", service_id=service_id, message_type='sms', status='failed'),
-        link=url_for(".view_notifications", service_id=service_id, message_type='sms', status='sending,delivered,failed')
+        link=url_for(".view_notifications", service_id=service_id, message_type='sms', status='sending,delivered,failed'),
+        smaller=smaller_font_size
       ) }}
     </div>
     {% if 'letter' in current_service['permissions'] %}
@@ -34,7 +36,8 @@
           statistics['letter']['failed_percentage'],
           statistics['letter']['show_warning'],
           failure_link=url_for(".view_notifications", service_id=service_id, message_type='letter', status='failed'),
-          link=url_for(".view_notifications", service_id=service_id, message_type='letter', status='')
+          link=url_for(".view_notifications", service_id=service_id, message_type='letter', status=''),
+          smaller=smaller_font_size
         ) }}
       </div>
     {% endif %}

app/templates/views/signedout.html

@@ -120,12 +120,12 @@
       <div class="grid-row bottom-gutter">
         <div class="column-half">
           <h3 class="visually-hidden">Services</h3>
-          <div class="product-page-big-number">104</div>
+          <div class="product-page-big-number">109</div>
           services
         </div>
         <div class="column-half">
           <h3 class="visually-hidden">Organisations</h3>
-          <div class="product-page-big-number">45</div>
+          <div class="product-page-big-number">46</div>
           organisations
         </div>
       </div>