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

Split out unit and monetary columns

Browse Source 
This is so we can treat them slightly differently later on.
This commit is contained in:
Chris Hill-Scott
2021-11-25 10:04:21 +00:00
parent ded7fa524f
commit 0e13cda9e5
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -175,15 +175,22 @@ def download_organisation_usage_report(org_id):
financial_year=selected_year financial_year=selected_year
)['services'] )['services']
column_names = OrderedDict([ unit_column_names = OrderedDict([
('service_id', 'Service ID'), ('service_id', 'Service ID'),
('service_name', 'Service Name'), ('service_name', 'Service Name'),
('emails_sent', 'Emails sent'), ('emails_sent', 'Emails sent'),
('sms_remainder', 'Free text message allowance remaining'), ('sms_remainder', 'Free text message allowance remaining'),
])
monetary_column_names = OrderedDict([
('sms_cost', 'Spent on text messages (£)'), ('sms_cost', 'Spent on text messages (£)'),
('letter_cost', 'Spent on letters (£)') ('letter_cost', 'Spent on letters (£)')
]) ])
column_names = OrderedDict(
list(unit_column_names.items()) + list(monetary_column_names.items())
)
org_usage_data = [[x for x in column_names.values()]] org_usage_data = [[x for x in column_names.values()]]
for service in services_usage: for service in services_usage: