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

Merge pull request #1931 from alphagov/letter-status-colour

Browse Source 
Don’t change colour of sent date for letters
This commit is contained in:
Chris Hill-Scott
2018-03-09 09:51:40 +00:00
committed by GitHub
parent ed5f2e5e62 d90cdc1f81
commit 5d4fc23128
3 changed files with 30 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
app/__init__.py
View File

@@ -356,17 +356,32 @@ def format_notification_status_as_time(status, created, updated):
}.get(status, updated) }.get(status, updated)
def format_notification_status_as_field_status(status): def format_notification_status_as_field_status(status, notification_type):
return { return {
'failed': 'error', 'letter': {
'technical-failure': 'error', 'failed': 'error',
'temporary-failure': 'error', 'technical-failure': 'error',
'permanent-failure': 'error', 'temporary-failure': 'error',
'delivered': None, 'permanent-failure': 'error',
'sent': None, 'delivered': None,
'sending': 'default', 'sent': None,
'created': 'default' 'sending': None,
}.get(status, 'error') 'created': None,
'accepted': None,
}
}.get(
notification_type,
{
'failed': 'error',
'technical-failure': 'error',
'temporary-failure': 'error',
'permanent-failure': 'error',
'delivered': None,
'sent': None,
'sending': 'default',
'created': 'default'
}
).get(status, 'error')
def format_notification_status_as_url(status): def format_notification_status_as_url(status):

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

@@ -130,7 +130,10 @@
{% if not notification %} {% if not notification %}
{% call field(align='right') %}{% endcall %} {% call field(align='right') %}{% endcall %}
{% else %} {% else %}
{% call field(status=notification.status|format_notification_status_as_field_status, align='right') %} {% call field(
status=notification.status|format_notification_status_as_field_status(notification.notification_type),
align='right'
) %}
{% if notification.status in ['created', 'sending', 'delivered'] %}<span class="align-with-message-body">{% endif %} {% if notification.status in ['created', 'sending', 'delivered'] %}<span class="align-with-message-body">{% endif %}
{% if notification.status|format_notification_status_as_url %} {% if notification.status|format_notification_status_as_url %}
<a href="{{ notification.status|format_notification_status_as_url }}"> <a href="{{ notification.status|format_notification_status_as_url }}">

2
app/templates/partials/notifications/status.html
View File

@@ -1,5 +1,5 @@
<div class="ajax-block-container"> <div class="ajax-block-container">
<p class="notification-status {{ notification.status|format_notification_status_as_field_status }}"> <p class="notification-status {{ notification.status|format_notification_status_as_field_status(notification.notification_type) }}">
{% if notification.status|format_notification_status_as_url %} {% if notification.status|format_notification_status_as_url %}
<a href="{{ notification.status|format_notification_status_as_url }}"> <a href="{{ notification.status|format_notification_status_as_url }}">
{% endif %} {% endif %}