Merge pull request #542 from alphagov/previous-weeks

Add a page to show delivery rates week-by-week

app/templates/components/big-number.html

@@ -26,7 +26,9 @@
   failure_percentage,
   danger_zone=False,
   failure_link=None,
-  label_link=None
+  label_link=None,
+  show_more_link=None,
+  show_more_text=''
 ) %}
   <div class="big-number-with-status">
     {{ big_number(number, label, label_link) }}
@@ -44,4 +46,7 @@
       {% endif %}
     </div>
   </div>
+  {% if show_more_link and show_more_text %}
+    <a href="{{ show_more_link }}" class="big-number-with-status-show-more-link">{{ show_more_text }}</a>
+  {% endif %}
 {% endmacro %}

app/templates/views/dashboard/dashboard.html

@@ -20,6 +20,9 @@
       {% include 'views/dashboard/no-permissions-banner.html' %}
     {% endif %}
 
+    <h1 class="heading-medium">
+      In the last 7 days
+    </h1>
     {% include 'views/dashboard/today.html' %}
 
   </div>

app/templates/views/dashboard/template-statistics.html

@@ -1,21 +1,23 @@
 {% from "components/table.html" import list_table, field, hidden_field_heading, right_aligned_field_heading %}
+
 {% call(item, row_number) list_table(
   template_statistics,
-  caption="By template",
-  caption_visible=False,
+  caption="Templates",
+  caption_visible=True,
   empty_message='You haven’t used any templates {}'.format(period),
-  field_headings=['Template', hidden_field_heading('Type'), right_aligned_field_heading('Messages sent')]
+  field_headings=['Template', hidden_field_heading('Type'), hidden_field_heading('Messages sent')],
+  field_headings_visible=False
 ) %}
   {% call field() %}
     <a href="{{ url_for('.view_template', service_id=current_service.id, template_id=item.template.id) }}">
       {{ item.template.name }}
     </a>
   {% endcall %}
-  {% call field() %}
-    {{'Text message' if 'sms' == item.template.template_type else 'Email'}}
-  {% endcall %}
   {% call field(align='right') %}
     {{ item.usage_count }}
   {% endcall %}
+  {% call field() %}
+    {{'text messages sent' if 'sms' == item.template.template_type else 'emails sent'}}
+  {% endcall %}
 {% endcall %}
 

app/templates/views/dashboard/today.html

@@ -7,10 +7,7 @@
   data-interval-seconds="2"
   aria-live="polite"
 >
-  <h2 class="heading-medium">
-    In the last 7 days
-  </h2>
-  <div class="grid-row bottom-gutter">
+  <div class="grid-row">
     <div class="column-half">
       {{ big_number_with_status(
         statistics.emails_requested,
@@ -33,6 +30,9 @@
         label_link=url_for(".view_notifications", service_id=current_service.id, template_type='sms', status='delivered,failed')
       ) }}
     </div>
+    <div class="column-whole">
+      <a class="big-number-with-status-show-more-link" href="{{ url_for('.weekly', service_id=current_service.id) }}">Compare to previous weeks</a>
+    </div>
   </div>
   {% with period = "in the last 7 days" %}
     {% include 'views/dashboard/template-statistics.html' %}

app/templates/views/weekly.html

@@ -0,0 +1,50 @@
+{% from "components/table.html" import list_table, field, hidden_field_heading, right_aligned_field_heading %}
+
+{% extends "withnav_template.html" %}
+
+{% block page_title %}
+  Daily – GOV.UK Notify
+{% endblock %}
+
+{% block maincolumn_content %}
+
+  <h1 class="heading-large">
+    Previous weeks
+  </h1>
+  {% call(item, row_number) list_table(
+    days,
+    caption="Daily",
+    caption_visible=False,
+    empty_message='No data found',
+    field_headings=[
+      hidden_field_heading('Day'),
+      right_aligned_field_heading('Emails'),
+      right_aligned_field_heading('Failure rate'),
+      right_aligned_field_heading('Text messages'),
+      right_aligned_field_heading('Failure rate')
+    ]
+  ) %}
+    {% call field() %}
+      {{ item.week_start|format_date_short }} to
+      {% if item.week_end_datetime > now %}
+        today
+      {% else %}
+        {{ item.week_end|format_date_short }}
+      {% endif %}
+    {% endcall %}
+    {% call field(align='right') %}
+      {{ item.emails_requested }}
+    {% endcall %}
+    {% call field(align='right') %}
+      {{ item.emails_failure_rate }}%
+    {% endcall %}
+    {% call field(align='right') %}
+      {{ item.sms_requested }}
+    {% endcall %}
+    {% call field(align='right') %}
+      {{ item.sms_failure_rate }}%
+    {% endcall %}
+  {% endcall %}
+
+
+{% endblock %}