diff --git a/app/main/views/dashboard.py b/app/main/views/dashboard.py
index 4bfdf5ed3..64ed5915f 100644
--- a/app/main/views/dashboard.py
+++ b/app/main/views/dashboard.py
@@ -65,7 +65,6 @@ def service_dashboard(service_id):
job_data = job_api_client.get_job(service_id, notificaton_job_id)["data"]
if job_data:
jobs.append(job_data)
-
service_data_retention_days = 7
download_availability = []
for job in jobs:
@@ -82,11 +81,13 @@ def service_dashboard(service_id):
job_id=job["id"],
),
)
+
download_availability.append(
{
"job_id": job["id"],
"time_left": time_left,
"download_link": download_link,
+ "notification_count": job["notification_count"],
}
)
return render_template(
diff --git a/app/templates/views/dashboard/dashboard.html b/app/templates/views/dashboard/dashboard.html
index ec528c2e3..7756c8a09 100644
--- a/app/templates/views/dashboard/dashboard.html
+++ b/app/templates/views/dashboard/dashboard.html
@@ -29,7 +29,7 @@
{{ ajax_block(partials, updates_url, 'template-statistics') }}
-
Batched Jobs
+ Recent Batches
{% call(item, row_number) list_table(
@@ -38,12 +38,16 @@
caption_visible=False,
border_visible=True,
empty_message='No batched job messages found (messages are kept for {} days)'.format(service_data_retention_days)|safe,
- field_headings=['Template Name','Date/Time', 'Download (CSV) Report'],
+ field_headings=['File Name','Template','Time Sent', 'Sender', '# of Recipeints'],
field_headings_visible=False
) %}
- {% if item.job.original_file_name and item.job.id %}
+ {{ download_availability }}
+ {% if item.job.original_file_name and item.job.id and item.template %}
{% call row_heading() %}
-
{{ item.job.original_file_name|replace('.csv', '') if item.job.id else '' }}
+
{{ item.job.original_file_name if item.job.id else '' }}
+ {% endcall %}
+ {% call row_heading() %}
+ {{ item.template.name }}
{% endcall %}
{% call row_heading() %}
{{ item.status|format_notification_status_as_time(
@@ -51,13 +55,13 @@
(item.updated_at or item.created_at)|format_datetime_short)
}}
{% endcall %}
+ {% call row_heading() %}
+ {{ item.created_by.name }}
+ {% endcall %}
{% call row_heading() %}
{% set availability = download_availability|selectattr('job_id', 'equalto', item.job.id)|first %}
- {% if availability and availability.time_left != "Data no longer available" %}
-
{{ "Download" if item.job.original_file_name else '' }}
-
- {{ availability.time_left }}
- {% elif availability %}
-
{{ availability.time_left }}
+ {% if availability %}
+ {{ availability.notification_count}}
{% endif %}
{% endcall %}
{% endif %}