mirror of
https://github.com/GSA/notifications-admin.git
synced 2026-03-03 00:41:27 -05:00
Merge pull request #1784 from GSA/1676-individual-job-table-updates
1676 - Updates to Job status page
This commit is contained in:
@@ -409,6 +409,30 @@ td.table-empty-message {
|
||||
}
|
||||
}
|
||||
|
||||
.job-status-table {
|
||||
table-layout: fixed;
|
||||
|
||||
thead tr th {
|
||||
border-bottom: 0;
|
||||
}
|
||||
|
||||
thead,
|
||||
tbody,
|
||||
tr {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
th:first-child,
|
||||
td:first-child {
|
||||
width: 75%;
|
||||
}
|
||||
|
||||
th:nth-child(2),R
|
||||
td:nth-child(2) {
|
||||
width: 25%;
|
||||
}
|
||||
}
|
||||
|
||||
.usage-table {
|
||||
ul {
|
||||
list-style: none;
|
||||
@@ -463,6 +487,10 @@ td.table-empty-message {
|
||||
}
|
||||
}
|
||||
|
||||
.usa-prose > p.max-width-full {
|
||||
max-width: 100%;
|
||||
}
|
||||
|
||||
// Tabs
|
||||
|
||||
.tabs {
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
{% else %}
|
||||
|
||||
{% if notifications %}
|
||||
<div class="dashboard-table table-overflow-x-auto">
|
||||
<div class="dashboard-table job-status-table table-overflow-x-auto">
|
||||
{% endif %}
|
||||
{% if job.still_processing %}
|
||||
<p class="bottom-gutter hint">
|
||||
@@ -40,15 +40,16 @@
|
||||
notifications,
|
||||
caption=uploaded_file_name,
|
||||
caption_visible=False,
|
||||
border_visible=True,
|
||||
empty_message='No messages to show yet…' if job.awaiting_processing_or_recently_processed else 'These messages have been deleted because they were sent more than {} days ago'.format(service_data_retention_days),
|
||||
field_headings=[
|
||||
'Recipient',
|
||||
'Status'
|
||||
'Message status'
|
||||
],
|
||||
field_headings_visible=False
|
||||
) %}
|
||||
{% call row_heading() %}
|
||||
<a class="usa-link file-list-filename" href="{{ url_for('.view_notification', service_id=current_service.id, notification_id=item.id, from_job=job.id) }}">{{ item.to }}</a>
|
||||
<a class="usa-link file-list-filename" href="{{ url_for('.view_notification', service_id=current_service.id, notification_id=item.id, from_job=job.id) }}">{{ item.to | format_phone_number_human_readable }}</a>
|
||||
<p class="file-list-hint">
|
||||
{{ item.preview_of_content }}
|
||||
</p>
|
||||
|
||||
@@ -25,8 +25,8 @@
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
<p class="notification-status">
|
||||
Messages will remain in pending state until carrier status is received, typically 5 minutes.
|
||||
<p class="notification-status max-width-full">
|
||||
Messages are sent immediately to the cell phone carrier, but will remain in "pending" status until we hear back from the carrier they have received it and attempted deliver. More information on <a class="usa-link" href="{{ url_for('main.message_status') }}">delivery status</a>.
|
||||
</p>
|
||||
{% if not job.processing_finished %}
|
||||
<div
|
||||
|
||||
@@ -353,10 +353,7 @@ def test_should_show_scheduled_job(
|
||||
)
|
||||
|
||||
assert page.select("main p a")[0]["href"] == url_for(
|
||||
"main.view_template_version",
|
||||
service_id=SERVICE_ONE_ID,
|
||||
template_id="5d729fbd-239c-44ab-b498-75a985f3198f",
|
||||
version=1,
|
||||
"main.message_status",
|
||||
)
|
||||
assert page.select_one("main button[type=submit]").text.strip() == "Cancel sending"
|
||||
|
||||
@@ -421,7 +418,7 @@ def test_should_show_updates_for_one_job_as_json(
|
||||
assert "failed" in content["counts"]
|
||||
assert "Recipient" in content["notifications"]
|
||||
assert "2021234567" in content["notifications"]
|
||||
assert "Status" in content["notifications"]
|
||||
assert "Message status" in content["notifications"]
|
||||
assert "Delivered" in content["notifications"]
|
||||
assert "01-01-2016 at 12:00 AM" in content["notifications"]
|
||||
|
||||
@@ -462,7 +459,7 @@ def test_should_show_updates_for_scheduled_job_as_json(
|
||||
assert "failed" in content["counts"]
|
||||
assert "Recipient" in content["notifications"]
|
||||
assert "2021234567" in content["notifications"]
|
||||
assert "Status" in content["notifications"]
|
||||
assert "Message status" in content["notifications"]
|
||||
assert "Delivered" in content["notifications"]
|
||||
assert "01-01-2016 at 12:00 AM" in content["notifications"]
|
||||
|
||||
@@ -496,5 +493,6 @@ def test_should_show_message_note(
|
||||
)
|
||||
|
||||
assert normalize_spaces(page.select_one("main p.notification-status").text) == (
|
||||
"Messages will remain in pending state until carrier status is received, typically 5 minutes."
|
||||
'Messages are sent immediately to the cell phone carrier, but will remain in "pending" status until we hear '
|
||||
'back from the carrier they have received it and attempted deliver. More information on delivery status.'
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user