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

Merge branch 'main' of https://github.com/GSA/notifications-admin into 1484-dashboard-visualizations

Browse Source 
# Conflicts:
#	package-lock.json
#	package.json
This commit is contained in:
Jonathan Bobel
2024-07-23 11:39:49 -04:00
parent 5cf05bd4b6 d968fcd4e5
commit 4af04ff183
40 changed files with 2039 additions and 1438 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/templates/views/dashboard/dashboard.html
View File

@@ -72,7 +72,7 @@
<span>Template</span>
</th>
<th scope="col" class="table-field-heading">
<span>Time sent</span>
<span>Job status</span>
</th>
<th scope="col" class="table-field-heading">
<span>Sender</span>
@@ -100,7 +100,8 @@
{{ notification.template.name }}
</td>
<td class="table-field time-sent">
{{ job.created_at | format_datetime_table }}
{{ (job.processing_finished if job.processing_finished else job.processing_started
if job.processing_started else job.created_at)|format_datetime_table }}
</td>
<td class="table-field sender">
{{ notification.created_by.name }}