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

update banner with different status states

Browse Source
This commit is contained in:
Beverly Nguyen
2025-01-15 17:08:21 -08:00
parent 92935867ea
commit ae083f4b52
2 changed files with 34 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/main/views/jobs.py
View File

@@ -407,6 +407,7 @@ def get_job_partials(job):
session["arrived_from_preview_page"] = False session["arrived_from_preview_page"] = False
arrived_from_preview_page_url = session.get("arrived_from_preview_page", False) arrived_from_preview_page_url = session.get("arrived_from_preview_page", False)
print('job', dir(job))
return { return {
"counts": counts, "counts": counts,

43
app/templates/partials/jobs/status.html
View File

@@ -21,7 +21,7 @@
<div class="ajax-block-container"> <div class="ajax-block-container">
<p class='bottom-gutter'> <p class='bottom-gutter'>
{% if job.still_processing or arrived_from_preview_page_url %} {% if not job.finished_processing or arrived_from_preview_page_url %}
{% if job.scheduled_for %} {% if job.scheduled_for %}
<div class="usa-alert usa-alert--info"> <div class="usa-alert usa-alert--info">
<div class="usa-alert__body"> <div class="usa-alert__body">
@@ -33,16 +33,39 @@
</div> </div>
{{display_message_status}} {{display_message_status}}
{% else %} {% else %}
<div class="usa-alert usa-alert--success"> {% if job.finished_processing or job.processing_started %}
<div class="usa-alert__body"> <div class="usa-alert usa-alert--success">
<h2 class="usa-alert__heading">Your text has been sent</h2> <div class="usa-alert__body">
<p class="usa-alert__text"> <h2 class="usa-alert__heading">
{{ job.template_name }} - {{ current_service.name }} was sent on {% if job.processing_started %} {% if job.finished_processing %}
{{ job.processing_started|format_datetime_table }} {% else %} Your text has been sent
{{ job.created_at|format_datetime_table }} {% endif %} by {{ job.created_by.name }} {% else %}
</p> Your text is sending
{% endif %}
</h2>
<p class="usa-alert__text">
{{ job.template_name }} - {{ current_service.name }}
{% if job.finished_processing %}
was sent on {{job.processing_started|format_datetime_normal}}
{% else %}
has been sending since {{job.processing_started| format_datetime_normal}}
{% endif %} by {{ job.created_by.name }}
</p>
</div>
</div> </div>
</div> {% else %}
<div class="usa-alert usa-alert--info">
<div class="usa-alert__body">
<h2 class="usa-alert__heading">
Your text is pending
</h2>
<p class="usa-alert__text">
{{ job.template_name }} - {{ current_service.name }}
has been pending since {{job.created_at|format_datetime_normal}} by {{ job.created_by.name }}
</p>
</div>
</div>
{% endif %}
{{display_message_status}} {{display_message_status}}
{% endif %} {% endif %}
{% endif %} {% endif %}