diff --git a/app/main/views/jobs.py b/app/main/views/jobs.py index dddf838a1..9de227bc3 100644 --- a/app/main/views/jobs.py +++ b/app/main/views/jobs.py @@ -407,6 +407,7 @@ def get_job_partials(job): session["arrived_from_preview_page"] = False arrived_from_preview_page_url = session.get("arrived_from_preview_page", False) + print('job', dir(job)) return { "counts": counts, diff --git a/app/templates/partials/jobs/status.html b/app/templates/partials/jobs/status.html index fb0a745f8..fc94d174a 100644 --- a/app/templates/partials/jobs/status.html +++ b/app/templates/partials/jobs/status.html @@ -21,7 +21,7 @@
- {% if job.still_processing or arrived_from_preview_page_url %} + {% if not job.finished_processing or arrived_from_preview_page_url %} {% if job.scheduled_for %}
- {{ job.template_name }} - {{ current_service.name }} was sent on {% if job.processing_started %} - {{ job.processing_started|format_datetime_table }} {% else %} - {{ job.created_at|format_datetime_table }} {% endif %} by {{ job.created_by.name }} -
+ {% if job.finished_processing or job.processing_started %} ++ {{ job.template_name }} - {{ current_service.name }} + {% if job.finished_processing %} + was sent on {{job.processing_started|format_datetime_normal}} + {% else %} + has been sending since {{job.processing_started| format_datetime_normal}} + {% endif %} by {{ job.created_by.name }} +
++ {{ job.template_name }} - {{ current_service.name }} + has been pending since {{job.created_at|format_datetime_normal}} by {{ job.created_by.name }} +
+