notify-536: accurately reflect delivery receipts in UI (#551)

This commit is contained in:
Kenneth Kehl
2023-06-27 08:20:58 -07:00
committed by GitHub
parent 87bd216609
commit d2d7a75a5f
11 changed files with 43 additions and 19 deletions

View File

@@ -5,9 +5,12 @@
{% if notifications_deleted %}
<div class="govuk-grid-row bottom-gutter-1-2">
{% for label, query_param, url, count in counts %}
<div class="govuk-grid-column-one-quarter">
{{ big_number(count, label, smaller=True) }}
</div>
{% if query_param == 'pending' %}
<div class="govuk-grid-column-one-quarter">{{ big_number(count, query_param, smaller=True) }}</div>
{% else %}
<div class="govuk-grid-column-one-quarter">{{ big_number(count, label, smaller=True) }}</div>
{% endif %}
{% endfor %}
</div>
{% else %}

View File

@@ -1,3 +1,4 @@
<div class="ajax-block-container">
{% set field_status = notification.status|format_notification_status_as_field_status(notification.notification_type) %}
{% set status_url = notification.status|format_notification_status_as_url(notification.notification_type) %}
@@ -5,9 +6,18 @@
{% if status_url %}
<a class="govuk-link govuk-link--destructive" href="{{ status_url }}">
{% endif %}
{% if notification.status != 'sending' %}
{{ notification.status|format_notification_status(
notification.template.template_type
) }}
{% endif %}
{% if notification.status == 'sending' %}
<p class="notification-status {{ field_status }}">
Pending. Messages will remain in pending state until carrier status is received, typically 5 minutes.
</p>
{% endif %}
{% if status_url %}
</a>
{% endif %}
@@ -15,4 +25,5 @@
(test)
{% endif %}
</p>
</div>