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

updated testing

Browse Source
This commit is contained in:
Beverly Nguyen
2024-02-23 13:26:46 -08:00
parent 8ce0091cc8
commit 7fc5b88ea3
4 changed files with 40 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/sass/uswds/_legacy-styles.scss
View File

@@ -66,6 +66,10 @@ h2.sms-message-header {
margin-bottom: 0.5rem;
}
h2.recipient-list {
margin-bottom: 0.5rem;
}
.sms-message-status-outbound {
text-align: right;
}

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

@@ -370,8 +370,12 @@ def get_job_partials(job):
job.template_type
)
session['came_from_preview_page'] = 'check' in request.referrer
came_from_preview_page_url = session.get('came_from_preview_page', False)
if request.referrer is not None:
session["arrived_from_preview_page"] = "check" in request.referrer
else:
session["arrived_from_preview_page"] = False
arrived_from_preview_page_url = session.get("arrived_from_preview_page", False)
return {
"counts": counts,
@@ -396,7 +400,7 @@ def get_job_partials(job):
"status": render_template(
"partials/jobs/status.html",
job=job,
came_from_preview_page_url=came_from_preview_page_url
arrived_from_preview_page_url=arrived_from_preview_page_url,
),
}

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

@@ -1,27 +1,28 @@
{% set display_message_status %}
{% if job.template.content %}
<h2 class="sms-message-header">Message</h2>
<div class="sms-message-wrapper">{{ current_service.name }}: {{job.template.content}}</div>
{% endif %}
{% if job.original_file_name %}
<h2 class="recipient-list">Recipient list</h2>
<div>
<ul class="usa-icon-list">
<li class="usa-icon-list__item">
<img src="{{ url_for('static', filename='img/material-icons/description.svg') }}" alt="Description Icon">
<div class="usa-icon-list__content">
<h3>{{ job.original_file_name }}</h3>
</div>
</li>
</ul>
</div>
{% endif %}
<h2>SMS Status</h2>
{% endset %}
<div class="ajax-block-container">
<p class='bottom-gutter'>
{% set display_message_status %}
{% if job.template.content %}
<h2 class="sms-message-header">Message</h2>
<div class="sms-message-wrapper">{{ current_service.name }}: {{job.template.content}}</div>
{% endif %}
{% if job.original_file_name %}
<h2>Recipients list</h2>
<div>
<ul class="usa-icon-list">
<li class="usa-icon-list__item">
<img src="{{ url_for('static', filename='img/material-icons/description.svg') }}" alt="Description Icon">
<div class="usa-icon-list__content">
<h3>{{ job.original_file_name }}</h3>
</div>
</li>
</ul>
</div>
{% endif %}
<h2>SMS Status</h2>
{% endset %}
{% if job.scheduled_for %}
{% if came_from_preview_page_url %}
{% if job.still_processing or arrived_from_preview_page_url %}
{% if job.scheduled_for %}
<div class="usa-alert usa-alert--info">
<div class="usa-alert__body">
<h4 class="usa-alert__heading">Your text has been scheduled</h4>
@@ -31,9 +32,7 @@
</div>
</div>
{{display_message_status}}
{% endif %}
{% else %}
{% if came_from_preview_page_url %}
{% else %}
<div class="usa-alert usa-alert--success">
<div class="usa-alert__body">
<h4 class="usa-alert__heading">Your text has been sent</h4>