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

Merge pull request #515 from alphagov/align-dashboard-stats

Browse Source 
Show sent, not pending numbers on the dashboard
This commit is contained in:
Chris Hill-Scott
2016-04-27 17:06:28 +01:00
parent 4da63f2876 00507fc7be
commit 43b95b0473
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -99,14 +99,19 @@ def add_rates_to(delivery_statistics):
delivery_statistics delivery_statistics
) )
sum_of_statistics.update({
'emails_sent': sum_of_statistics['emails_failed'] + sum_of_statistics['emails_delivered'],
'sms_sent': sum_of_statistics['sms_failed'] + sum_of_statistics['sms_delivered']
})
return dict( return dict(
emails_failure_rate=( emails_failure_rate=(
"{0:.1f}".format((float(sum_of_statistics['emails_failed']) / sum_of_statistics['emails_requested'] * 100)) "{0:.1f}".format((float(sum_of_statistics['emails_failed']) / sum_of_statistics['emails_sent'] * 100))
if sum_of_statistics.get('emails_requested') else 0 if sum_of_statistics.get('emails_sent') else 0
), ),
sms_failure_rate=( sms_failure_rate=(
"{0:.1f}".format((float(sum_of_statistics['sms_failed']) / sum_of_statistics['sms_requested'] * 100)) "{0:.1f}".format((float(sum_of_statistics['sms_failed']) / sum_of_statistics['sms_sent'] * 100))
if sum_of_statistics.get('sms_requested') else 0 if sum_of_statistics.get('sms_sent') else 0
), ),
**sum_of_statistics **sum_of_statistics
) )

12
app/templates/views/dashboard/today.html
View File

@@ -13,9 +13,9 @@
<div class="grid-row bottom-gutter"> <div class="grid-row bottom-gutter">
<div class="column-half"> <div class="column-half">
{{ big_number_with_status( {{ big_number_with_status(
statistics.get('emails_delivered', 0), statistics.emails_sent,
'email' if statistics.get('emails_delivered') == 1 else 'emails', 'email' if statistics.emails_sent == 1 else 'emails',
statistics.get('emails_failed'), statistics.emails_failed,
statistics.get('emails_failure_rate', 0.0), statistics.get('emails_failure_rate', 0.0),
statistics.get('emails_failure_rate', 0)|float > 3, statistics.get('emails_failure_rate', 0)|float > 3,
failure_link=url_for(".view_notifications", service_id=current_service.id, template_type='email', status='failed') failure_link=url_for(".view_notifications", service_id=current_service.id, template_type='email', status='failed')
@@ -23,9 +23,9 @@
</div> </div>
<div class="column-half"> <div class="column-half">
{{ big_number_with_status( {{ big_number_with_status(
statistics.get('sms_requested', 0), statistics.sms_sent,
'text message' if statistics.get('sms_requested') == 1 else 'text messages', 'text message' if statistics.sms_sent == 1 else 'text messages',
statistics.get('sms_failed'), statistics.sms_failed,
statistics.get('sms_failure_rate', 0.0), statistics.get('sms_failure_rate', 0.0),
statistics.get('sms_failure_rate', 0)|float > 3, statistics.get('sms_failure_rate', 0)|float > 3,
failure_link=url_for(".view_notifications", service_id=current_service.id, template_type='sms', status='failed') failure_link=url_for(".view_notifications", service_id=current_service.id, template_type='sms', status='failed')