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

Refactor letters code for usage page

Browse Source 
No functional changes, but this changes the letter details that are
used for the usage page from a tuple to a named tuple since this makes
it easier to understand.
This commit is contained in:
Katie Smith
2020-07-03 17:39:45 +01:00
parent 0f29b3d64c
commit 2a6691f665
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,5 @@
import calendar
from collections import namedtuple
from datetime import datetime
from functools import partial
from itertools import groupby
@@ -416,15 +417,21 @@ def get_free_paid_breakdown_for_billable_units(year, free_sms_fragment_limit, bi
free_sms_fragment_limit, cumulative, previous_cumulative,
[billing_month for billing_month in sms_units if billing_month['month'] == month]
)
letter_billing = [(x['billing_units'], x['rate'], (x['billing_units'] * x['rate']), x['postage'])
LetterDetails = namedtuple('LetterDetails', ['billing_units', 'rate', 'cost', 'postage'])
letter_billing = [LetterDetails(billing_units=x['billing_units'],
rate=x['rate'],
cost=(x['billing_units'] * x['rate']),
postage=x['postage'])
for x in letter_units if x['month'] == month]
if letter_billing:
letter_billing.sort(key=lambda x: (x[3], x[1]))
letter_billing.sort(key=lambda x: (x.postage, x.rate))
letter_total = 0
for x in letter_billing:
letter_total += x[2]
letter_total += x.cost
letter_cumulative += letter_total
yield {
'name': month,

6
app/templates/views/usage.html
View File

@@ -108,9 +108,9 @@
{{- ' {:.2f}p'.format(sms_rate * 100) }}</li>
{% endif %}
{% for letter in month.letters%}
{% if letter[0] %}
<li class="tabular-numbers">{{ "{:,} {}".format(letter[0], letter[3])}} class {{ message_count_label(letter[0], 'letter', '') }}at
{{ '{:.0f}p'.format(letter[1] * 100) }}</li>
{% if letter.billing_units %}
<li class="tabular-numbers">{{ "{:,} {}".format(letter.billing_units, letter.postage)}} class {{ message_count_label(letter.billing_units, 'letter', '') }}at
{{ '{:.0f}p'.format(letter.rate * 100) }}</li>
{% endif %}
{% endfor %}
{% if not (month.free or month.paid or month.letters) %}