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

updating job status states

Browse Source
This commit is contained in:
Beverly Nguyen
2025-01-15 14:28:47 -08:00
parent 92935867ea
commit 8754c03a00
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -75,6 +75,7 @@ def service_dashboard(service_id):
"created_at": job["created_at"], "created_at": job["created_at"],
"processing_finished": job.get("processing_finished"), "processing_finished": job.get("processing_finished"),
"processing_started": job.get("processing_started"), "processing_started": job.get("processing_started"),
"scheduled_for": job.get("scheduled_for"),
"notification_count": job["notification_count"], "notification_count": job["notification_count"],
"created_by": job["created_by"], "created_by": job["created_by"],
"template_name": job["template_name"], "template_name": job["template_name"],
@@ -87,7 +88,7 @@ def service_dashboard(service_id):
"views/dashboard/dashboard.html", "views/dashboard/dashboard.html",
updates_url=url_for(".service_dashboard_updates", service_id=service_id), updates_url=url_for(".service_dashboard_updates", service_id=service_id),
partials=get_dashboard_partials(service_id), partials=get_dashboard_partials(service_id),
jobs=jobs, jobs=sorted(jobs, key=lambda job: job["created_at"], reverse=True)[:5],
service_data_retention_days=service_data_retention_days, service_data_retention_days=service_data_retention_days,
sms_sent=sms_sent, sms_sent=sms_sent,
sms_allowance_remaining=sms_allowance_remaining, sms_allowance_remaining=sms_allowance_remaining,

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

@@ -113,7 +113,7 @@
</thead> </thead>
<tbody> <tbody>
{% if jobs %} {% if jobs %}
{% for job in jobs[:5] %} {% for job in jobs %}
{% set notification = job.notifications[0] %} {% set notification = job.notifications[0] %}
<tr id="{{ job.job_id }}"> <tr id="{{ job.job_id }}">
<td class="table-field jobid" role="rowheader"> <td class="table-field jobid" role="rowheader">
@@ -122,9 +122,19 @@
</a> </a>
</td> </td>
<td class="table-field template">{{ job.template_name }}</td> <td class="table-field template">{{ job.template_name }}</td>
<td class="table-field time-sent">Sent on <td class="table-field time-sent">
{{ (job.processing_finished if job.processing_finished else job.processing_started {% if job.scheduled_for and not job.processing_finished %}
if job.processing_started else job.created_at)|format_datetime_table }} Scheduled for
{{ job.scheduled_for|format_datetime_table }}
{% else %}
{% if job.processing_finished %}
Sent on {{job.processing_finished|format_datetime_table}}
{% elif job.processing_started %}
Sending since {{job.processing_started|format_datetime_table}}
{% else %}
Created at {{job.created_at|format_datetime_table}}
{% endif %}
{% endif %}
</td> </td>
<td class="table-field sender">{{ job.created_by.name }}</td> <td class="table-field sender">{{ job.created_by.name }}</td>
<td class="table-field count-of-recipients">{{ job.notification_count }}</td> <td class="table-field count-of-recipients">{{ job.notification_count }}</td>