Merge pull request #227 from alphagov/poll-job-page

Make job page poll for updates

app/main/views/jobs.py

@@ -4,7 +4,8 @@ import time
 
 from flask import (
     render_template,
-    abort
+    abort,
+    jsonify
 )
 from flask_login import login_required
 from notifications_python_client.errors import HTTPError
@@ -15,8 +16,6 @@ from app.main import main
 from app.main.dao import templates_dao
 from app.main.dao import services_dao
 
-now = time.strftime('%H:%M')
-
 
 @main.route("/services/<service_id>/jobs")
 @login_required
@@ -24,7 +23,7 @@ def view_jobs(service_id):
     try:
         jobs = job_api_client.get_job(service_id)['data']
         return render_template(
-            'views/jobs.html',
+            'views/jobs/jobs.html',
             jobs=jobs,
             service_id=service_id
         )
@@ -44,16 +43,16 @@ def view_job(service_id, job_id):
         notifications = notification_api_client.get_notifications_for_service(service_id, job_id)
         finished = job['status'] == 'finished'
         return render_template(
-            'views/job.html',
+            'views/jobs/job.html',
             notifications=notifications['notifications'],
             counts={
                 'queued': 0 if finished else job['notification_count'],
                 'sent': job['notification_count'] if finished else 0,
-                'failed': 0
+                'failed': 0,
+                'cost': u'£0.00'
             },
             uploaded_at=job['created_at'],
             finished_at=job['updated_at'] if finished else None,
-            cost=u'£0.00',
             uploaded_file_name=job['original_file_name'],
             template=Template(
                 templates_dao.get_service_template_or_404(service_id, job['template'])['data'],
@@ -70,9 +69,47 @@ def view_job(service_id, job_id):
             raise e
 
 
+@main.route("/services/<service_id>/jobs/<job_id>.json")
+@login_required
+def view_job_updates(service_id, job_id):
+    service = services_dao.get_service_by_id_or_404(service_id)
+    try:
+        job = job_api_client.get_job(service_id, job_id)['data']
+        notifications = notification_api_client.get_notifications_for_service(service_id, job_id)
+        finished = job['status'] == 'finished'
+        return jsonify(**{
+            'counts': render_template(
+                'partials/jobs/count.html',
+                counts={
+                    'queued': 0 if finished else job['notification_count'],
+                    'sent': job['notification_count'] if finished else 0,
+                    'failed': 0,
+                    'cost': u'£0.00'
+                }
+            ),
+            'notifications': render_template(
+                'partials/jobs/notifications.html',
+                notifications=notifications['notifications']
+            ),
+            'status': render_template(
+                'partials/jobs/status.html',
+                uploaded_at=job['created_at'],
+                finished_at=job['updated_at'] if finished else None
+            ),
+        })
+    except HTTPError as e:
+        if e.status_code == 404:
+            abort(404)
+        else:
+            raise e
+
+
 @main.route("/services/<service_id>/jobs/<job_id>/notification/<string:notification_id>")
 @login_required
 def view_notification(service_id, job_id, notification_id):
+
+    now = time.strftime('%H:%M')
+
     return render_template(
         'views/notification.html',
         message=[

app/main/views/send.py

@@ -234,7 +234,6 @@ def check_messages(service_id, upload_id):
             else:
                 raise e
 
-        flash('We’ve started sending your messages', 'default_with_tick')
         return redirect(
             url_for('main.view_job', service_id=service_id, job_id=upload_id)
         )