darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-06 01:38:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

adding status column

Browse Source
This commit is contained in:
Beverly Nguyen
2025-08-07 09:57:44 -07:00
parent 7fc6be815a
commit 894e8c7d1b
3 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/sass/uswds/_uswds-theme-custom-styles.scss
View File

@@ -490,6 +490,8 @@ td.table-empty-message {
} }
.job-table { .job-table {
width: 100%;
border-collapse: collapse;
th { th {
padding: 0.5rem 1rem; padding: 0.5rem 1rem;
} }

25
app/templates/views/activity/all-activity.html
View File

@@ -84,10 +84,7 @@
<span>Report</span> <span>Report</span>
</th> </th>
<th data-sortable scope="col" role="columnheader" class="table-field-heading"> <th data-sortable scope="col" role="columnheader" class="table-field-heading">
<span>Delivered</span> <span>Status</span>
</th>
<th data-sortable scope="col" role="columnheader" class="table-field-heading">
<span>Failed</span>
</th> </th>
</tr> </tr>
</thead> </thead>
@@ -95,17 +92,17 @@
{% if all_jobs_dict %} {% if all_jobs_dict %}
{% for job in all_jobs_dict %} {% for job in all_jobs_dict %}
<tr class="table-row"> <tr class="table-row">
<td class="table-field jobid width-10" role="rowheader"> <td class="table-field width-5" role="rowheader">
<a class="usa-link" href="{{ job.view_job_link }}"> <a class="usa-link" href="{{ job.view_job_link }}">
{{ job.job_id[:8] if job.job_id else 'Manually entered number' }} {{ job.job_id[:8] if job.job_id else 'Manually entered number' }}
</a> </a>
</td> </td>
<td class="table-field template width-35 text-wrap">{{ job.template_name }}</td> <td class="table-field width-16">{{ job.template_name }}</td>
<td data-sort-value="{{ job.activity_time | convert_time_unixtimestamp }}" class="table-field time-sent width-15"> <td data-sort-value="{{ job.activity_time | convert_time_unixtimestamp }}" class="table-field width-18">
{{ job.activity_time|format_datetime_table }} {{ job.activity_time|format_datetime_table }}
</td> </td>
<td class="table-field sender width-20 text-wrap">{{ job.created_by.name }}</td> <td class="table-field width-30 ">{{ job.created_by.name }}</td>
<td class="text-center table-field report width-5"> <td class="text-center table-field width-2">
{% if job.can_download %} {% if job.can_download %}
<a href="{{ job.download_link }}"> <a href="{{ job.download_link }}">
<img src="{{ url_for('static', filename='img/material-icons/file_download.svg') }}" alt="" class="padding-top-05"> <img src="{{ url_for('static', filename='img/material-icons/file_download.svg') }}" alt="" class="padding-top-05">
@@ -115,8 +112,14 @@
<span>N/A</span> <span>N/A</span>
{% endif %} {% endif %}
</td> </td>
<td class="text-center table-field delivered width-7">{{ job.delivered_count if job.delivered_count is not none else '0' }}</td> <td class="table-field width-15">
<td class="text-center table-field failed width-8">{{ job.failed_count if job.failed_count is not none else '0' }}</td> <span class="bg-base-lighter padding-x-05 padding-y-0 font-body-3xs text-bold radius-sm margin-right-05 display-inline-block ">
{{ job.delivered_count if job.delivered_count is not none else '0' }} delivered
</span>
<span class="bg-base-lighter padding-x-05 padding-y-0 font-body-3xs text-bold radius-sm display-inline-block">
{{ job.failed_count if job.failed_count is not none else '0' }} failed
</span>
</td>
</tr> </tr>
{% endfor %} {% endfor %}
{% else %} {% else %}

10
app/templates/views/dashboard/activity-table.html
View File

@@ -39,13 +39,13 @@
{% if jobs %} {% if jobs %}
{% for job in jobs %} {% for job in jobs %}
<tr id="{{ job.id }}"> <tr id="{{ job.id }}">
<td class="table-field jobid" role="rowheader"> <td class="table-field" role="rowheader">
<a class="usa-link" href="{{ url_for('.view_job', service_id=current_service.id, job_id=job.id )}}"> <a class="usa-link" href="{{ url_for('.view_job', service_id=current_service.id, job_id=job.id )}}">
{{ job.id[:8] if job.id else 'Manually entered number' }} {{ job.id[:8] if job.id else 'Manually entered number' }}
</a> </a>
</td> </td>
<td class="table-field template">{{ job.template_name }}</td> <td class="table-field width-35">{{ job.template_name }}</td>
<td class="table-field time-sent"> <td class="table-field width-20">
{% if not job.finished_processing %} {% if not job.finished_processing %}
{% if job.scheduled_for%} {% if job.scheduled_for%}
Scheduled for {{ job.scheduled_for|format_datetime_table }} Scheduled for {{ job.scheduled_for|format_datetime_table }}
@@ -58,8 +58,8 @@
Sent on {{ job.processing_started|format_datetime_table }} Sent on {{ job.processing_started|format_datetime_table }}
{% endif %} {% endif %}
</td> </td>
<td class="table-field sender sender-column">{{ job.created_by.name }}</td> <td class="table-field">{{ job.created_by.name }}</td>
<td class="table-field count-of-recipients">{{ job.notification_count }}</td> <td class="table-field width-5">{{ job.notification_count }}</td>
</tr> </tr>
{% endfor %} {% endfor %}
{% else %} {% else %}