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

Merge pull request #899 from alphagov/handle-new-jobs-api

Browse Source 
Handle new jobs api
This commit is contained in:
minglis
2016-08-25 09:56:30 +01:00
committed by GitHub
parent ae3c4fe1fc c61199d17d
commit 9a60cf49a4
4 changed files with 171 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -78,13 +78,12 @@ def view_job(service_id, job_id):
filter_args = _parse_filter_args(request.args)
filter_args['status'] = _set_status_filters(filter_args)
total_notifications = job.get('notification_count', 0)
processed_notifications = job.get('notifications_delivered', 0) + job.get('notifications_failed', 0)
return render_template(
'views/jobs/job.html',
finished=job.get('notifications_sent', 0) and ((
job.get('notifications_sent', 0) -
job.get('notifications_delivered', 0) -
job.get('notifications_failed', 0)
) == 0),
finished=(total_notifications == processed_notifications),
uploaded_file_name=job['original_file_name'],
template=Template(
service_api_client.get_service_template(