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

Merge pull request #1707 from GSA/1634-timedate-column-within-recent-batch-table-isnt-accurate

Browse Source 
update timestamp to display notification time created_at
This commit is contained in:
Carlo Costino
2024-07-22 18:14:26 -04:00
committed by GitHub
parent abc409ab08 883df1bdcd
commit d968fcd4e5
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/main/views/dashboard.py
View File

@@ -105,6 +105,8 @@ def service_dashboard(service_id):
".view_job", service_id=current_service.id, job_id=job["id"] ".view_job", service_id=current_service.id, job_id=job["id"]
), ),
"created_at": job["created_at"], "created_at": job["created_at"],
"processing_finished": job["processing_finished"],
"processing_started": job["processing_started"],
"notification_count": job["notification_count"], "notification_count": job["notification_count"],
"created_by": job["created_by"], "created_by": job["created_by"],
"notifications": aggregate_notifications_by_job.get(job["id"], []), "notifications": aggregate_notifications_by_job.get(job["id"], []),

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

@@ -41,7 +41,7 @@
<span>Template</span> <span>Template</span>
</th> </th>
<th scope="col" class="table-field-heading"> <th scope="col" class="table-field-heading">
<span>Time sent</span> <span>Job status</span>
</th> </th>
<th scope="col" class="table-field-heading"> <th scope="col" class="table-field-heading">
<span>Sender</span> <span>Sender</span>
@@ -69,7 +69,8 @@
{{ notification.template.name }} {{ notification.template.name }}
</td> </td>
<td class="table-field time-sent"> <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>
<td class="table-field sender"> <td class="table-field sender">
{{ notification.created_by.name }} {{ notification.created_by.name }}