darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-02-06 03:13:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Stop showing validation-failed letters as cancelled in table

Browse Source 
Changed the table for displaying all notifications to show letters which
have the status of 'validation-failed' as 'Validation failed' instead of
'Cancelled'.

The individual notification page for a letter which has failed
validation has not been changed since this already has a description
(letter has content outside the printable area).
This commit is contained in:
Katie Smith
2019-01-07 12:02:24 +00:00
parent 8b39bc14d1
commit bb7e9726d3
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/__init__.py
View File

@@ -373,7 +373,8 @@ def format_notification_status(status, template_type):
'pending-virus-check': 'Pending virus check',
'virus-scan-failed': 'Virus detected',
'returned-letter': 'Delivered',
'cancelled': 'Cancelled,'
'cancelled': 'Cancelled,',
'validation-failed': 'Validation failed',
}
}[template_type].get(status, status)

4
app/templates/components/table.html
View File

@@ -157,12 +157,12 @@
{% if notification.status|format_notification_status_as_url(notification.notification_type) %}
<a href="{{ notification.status|format_notification_status_as_url(notification.notification_type) }}">
{% endif %}
{% if notification['notification_type'] != "letter" or notification.status == 'virus-scan-failed' %}
{% if notification['notification_type'] != "letter" or notification.status in ('virus-scan-failed', 'validation-failed') %}
{{ notification.status|format_notification_status(
notification.template.template_type
) }}
{% endif %}
{% if notification.notification_type == "letter" and notification.status in ['permanent-failure', 'validation-failed', 'cancelled'] %}
{% if notification.notification_type == "letter" and notification.status in ['permanent-failure', 'cancelled'] %}
Cancelled
{% endif %}
{% if notification.status|format_notification_status_as_url(notification.notification_type) %}

4
tests/app/main/views/test_activity.py
View File

@@ -602,10 +602,10 @@ def test_big_numbers_and_search_dont_show_for_letters(
('sms', 'delivered', 'Delivered 27 September at 5:31pm', True),
('letter', 'delivered', '27 September at 5:30pm', True),
('letter', 'permanent-failure', 'Cancelled 27 September at 5:31pm', False),
('letter', 'validation-failed', 'Cancelled 27 September at 5:30pm', False),
('letter', 'validation-failed', 'Validation failed 27 September at 5:30pm', False),
]
)
def test_sending_status_hint_does_not_include_status_for_letters(
def test_sending_status_hint_displays_correctly_on_notifications_page(
client_request,
service_one,
active_user_with_permissions,