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

use a flash error message on the platform admin usage report

Browse Source 
that makes more sense than attaching the error to a field

also fix tests and assert csv contents are correct
This commit is contained in:
Leo Hemsted
2019-08-27 16:53:08 +01:00
parent b69321bf7a
commit 6412a4ab33
2 changed files with 31 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -305,10 +305,13 @@ def usage_for_all_services():
"sms_cost", "sms_fragments", "letter_cost", "letter_breakdown"]
result = billing_api_client.get_usage_for_all_services(start_date, end_date)
rows = []
for r in result:
rows.append([r['organisation_id'], r["organisation_name"], r["service_id"], r["service_name"],
r["sms_cost"], r['sms_fragments'], r["letter_cost"], r["letter_breakdown"].strip()])
rows = [
[
r['organisation_id'], r["organisation_name"], r["service_id"], r["service_name"],
r["sms_cost"], r['sms_fragments'], r["letter_cost"], r["letter_breakdown"].strip()
]
for r in result
]
if rows:
return Spreadsheet.from_rows([headers] + rows).as_csv_data, 200, {
'Content-Type': 'text/csv; charset=utf-8',
@@ -317,7 +320,7 @@ def usage_for_all_services():
)
}
else:
form.errors['start_date'] = 'no results for date'
flash('No results for dates')
return render_template('views/platform-admin/usage_for_all_services.html', form=form)