diff --git a/app/assets/sass/uswds/_uswds-theme-custom-styles.scss b/app/assets/sass/uswds/_uswds-theme-custom-styles.scss index 094f9d138..9aebabd35 100644 --- a/app/assets/sass/uswds/_uswds-theme-custom-styles.scss +++ b/app/assets/sass/uswds/_uswds-theme-custom-styles.scss @@ -490,6 +490,8 @@ td.table-empty-message { } .job-table { + width: 100%; + border-collapse: collapse; th { padding: 0.5rem 1rem; } diff --git a/app/templates/views/activity/all-activity.html b/app/templates/views/activity/all-activity.html index fde69dba3..2584caefb 100644 --- a/app/templates/views/activity/all-activity.html +++ b/app/templates/views/activity/all-activity.html @@ -84,10 +84,7 @@ Report - Delivered - - - Failed + Status @@ -95,17 +92,17 @@ {% if all_jobs_dict %} {% for job in all_jobs_dict %} - + {{ job.job_id[:8] if job.job_id else 'Manually entered number' }} - {{ job.template_name }} - + {{ job.template_name }} + {{ job.activity_time|format_datetime_table }} - {{ job.created_by.name }} - + {{ job.created_by.name }} + {% if job.can_download %} @@ -115,8 +112,14 @@ N/A {% endif %} - {{ job.delivered_count if job.delivered_count is not none else '0' }} - {{ job.failed_count if job.failed_count is not none else '0' }} + + + {{ job.delivered_count if job.delivered_count is not none else '0' }} delivered + + + {{ job.failed_count if job.failed_count is not none else '0' }} failed + + {% endfor %} {% else %} diff --git a/app/templates/views/dashboard/activity-table.html b/app/templates/views/dashboard/activity-table.html index 249c4f376..b9999ad62 100644 --- a/app/templates/views/dashboard/activity-table.html +++ b/app/templates/views/dashboard/activity-table.html @@ -39,13 +39,13 @@ {% if jobs %} {% for job in jobs %} - + {{ job.id[:8] if job.id else 'Manually entered number' }} - {{ job.template_name }} - + {{ job.template_name }} + {% if not job.finished_processing %} {% if job.scheduled_for%} Scheduled for {{ job.scheduled_for|format_datetime_table }} @@ -58,8 +58,8 @@ Sent on {{ job.processing_started|format_datetime_table }} {% endif %} - {{ job.created_by.name }} - {{ job.notification_count }} + {{ job.created_by.name }} + {{ job.notification_count }} {% endfor %} {% else %}