From 380340187b477c90dbe0e48192657762f19ccf79 Mon Sep 17 00:00:00 2001 From: Martyn Inglis Date: Mon, 5 Sep 2016 13:38:33 +0100 Subject: [PATCH] Fixe formatting pep8 issues --- app/main/views/jobs.py | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/app/main/views/jobs.py b/app/main/views/jobs.py index 0982f1a7a..a9ff685cc 100644 --- a/app/main/views/jobs.py +++ b/app/main/views/jobs.py @@ -73,7 +73,6 @@ def view_jobs(service_id): @login_required @user_has_permissions('view_activity', admin_override=True) def view_job(service_id, job_id): - job = job_api_client.get_job(service_id, job_id)['data'] filter_args = _parse_filter_args(request.args) filter_args['status'] = _set_status_filters(filter_args) @@ -230,14 +229,13 @@ def view_notifications(service_id, message_type): @login_required @user_has_permissions('view_activity', admin_override=True) def view_notification(service_id, job_id, notification_id): - now = time.strftime('%H:%M') return render_template( 'views/notification.html', message=[ message for message in messages if message['id'] == notification_id - ][0], + ][0], delivered_at=now, uploaded_at=now, job_id=job_id @@ -269,7 +267,7 @@ def get_status_filters(service, message_type, statistics): stats[key] ) for key, label, option in filters - ] + ] def _get_job_counts(job, help_argument): @@ -287,25 +285,25 @@ def _get_job_counts(job, help_argument): count ) for label, query_param, count in [ [ - 'total', '', - job.get('notification_count', 0) + 'total', '', + job.get('notification_count', 0) ], [ - 'sending', 'sending', - job.get('notification_count', 0) - - job.get('notifications_delivered', 0) - - job.get('notifications_failed', 0) + 'sending', 'sending', + job.get('notification_count', 0) - + job.get('notifications_delivered', 0) - + job.get('notifications_failed', 0) ], [ - 'delivered', 'delivered', - job.get('notifications_delivered', 0) + 'delivered', 'delivered', + job.get('notifications_delivered', 0) ], [ - 'failed', 'failed', - job.get('notifications_failed', 0) + 'failed', 'failed', + job.get('notifications_failed', 0) ] ] - ] + ] def get_job_partials(job):