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

Support multiple SMS rates per month on usage page

Browse Source
This commit is contained in:
Ben Thorner
2022-05-03 13:13:29 +01:00
parent 75e0d53e76
commit 3449ccd923
4 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -398,13 +398,9 @@ def get_monthly_usage_breakdown(year, monthly_usage):
for month in get_months_for_financial_year(year):
monthly_sms = [row for row in sms if row['month'] == month]
sms_charged = sum(row['sms_charged'] for row in monthly_sms)
sms_free_allowance_used = sum(row['sms_free_allowance_used'] for row in monthly_sms)
sms_cost = sum(row['sms_cost'] for row in monthly_sms)
# makes the assumption that there is either no item in `monthly_sms` because they
# have not sent any SMS or that they have sent SMS and that there is only a single
# item in `monthly_sms` because they have only been sent at a single rate
sms_rate = monthly_sms[0]['rate'] if len(monthly_sms) else 0
sms_breakdown = [row for row in monthly_sms if row['sms_charged']]
monthly_letters = [row for row in letters if row['month'] == month]
letter_cost = sum(row['letter_cost'] for row in monthly_letters)
@@ -414,9 +410,8 @@ def get_monthly_usage_breakdown(year, monthly_usage):
'month': month,
'letter_cost': letter_cost,
'letter_breakdown': list(letter_breakdown),
'sms_charged': sms_charged,
'sms_free_allowance_used': sms_free_allowance_used,
'sms_rate': sms_rate,
'sms_breakdown': sms_breakdown,
'sms_cost': sms_cost,
}