darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-02-05 10:53:28 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #359 from alphagov/fix_sent_today_bug

Browse Source 
Fix sent today bug and removed unused file.
This commit is contained in:
NIcholas Staples
2016-03-30 12:16:55 +01:00
parent f3507af006 0b2eeb19c5
commit 9de80d685a
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
app/main/dao/__init__.py
View File

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

@@ -4,6 +4,7 @@ from flask import (
flash,
jsonify
)
from datetime import date
from flask_login import login_required
from app.main import main
@@ -61,17 +62,21 @@ def add_rates_to(delivery_statistics):
if not delivery_statistics or not delivery_statistics[0]:
return {}
today = delivery_statistics[0]
today = None
latest_stats = {}
if delivery_statistics[0]['day'] == date.today().strftime('%Y-%m-%d'):
today = delivery_statistics[0]
latest_stats = delivery_statistics[0]
today.update({
latest_stats.update({
'emails_failure_rate': (
"{0:.1f}".format((today['emails_error'] / today['emails_requested'] * 100))
if today['emails_requested'] else 0
"{0:.1f}".format((float(today['emails_error']) / today['emails_requested'] * 100))
if today and today['emails_requested'] else 0
),
'sms_failure_rate': (
"{0:.1f}".format((today['sms_error'] / today['sms_requested'] * 100))
if today['sms_requested'] else 0
"{0:.1f}".format((float(today['sms_error']) / today['sms_requested'] * 100))
if today and today['sms_requested'] else 0
)
})
return today
return latest_stats