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

Job notification download now includes all notifications.

Browse Source 
Get row number to match excel format.

Fix for no job_row_number.
This commit is contained in:
Nicholas Staples
2016-05-31 10:21:40 +01:00
parent 01884655c7
commit 5ef5920c17
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/main/views/jobs.py
View File

@@ -79,7 +79,11 @@ def view_job(service_id, job_id):
finished = job['status'] == 'finished' finished = job['status'] == 'finished'
if 'download' in request.args and request.args['download'] == 'csv': if 'download' in request.args and request.args['download'] == 'csv':
csv_content = generate_notifications_csv( csv_content = generate_notifications_csv(
notification_api_client.get_notifications_for_service(service_id, job_id)['notifications']) notification_api_client.get_notifications_for_service(
service_id,
job_id,
page_size=job['notification_count']
)['notifications'])
return csv_content, 200, { return csv_content, 200, {
'Content-Type': 'text/csv; charset=utf-8', 'Content-Type': 'text/csv; charset=utf-8',
'Content-Disposition': 'inline; filename="{} - {}.csv"'.format( 'Content-Disposition': 'inline; filename="{} - {}.csv"'.format(

3
app/utils.py
View File

@@ -98,9 +98,10 @@ def generate_notifications_csv(json_list):
retval = None retval = None
with content as csvfile: with content as csvfile:
csvwriter = csv.writer(csvfile) csvwriter = csv.writer(csvfile)
csvwriter.writerow(['Recipient', 'Template', 'Type', 'Job', 'Status', 'Time']) csvwriter.writerow(['Row number', 'Recipient', 'Template', 'Type', 'Job', 'Status', 'Time'])
for x in json_list: for x in json_list:
csvwriter.writerow([ csvwriter.writerow([
int(x['job_row_number']) + 2 if 'job_row_number' in x and x['job_row_number'] else '',
x['to'], x['to'],
x['template']['name'], x['template']['name'],
x['template']['template_type'], x['template']['template_type'],