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

Show delivery time even for failed notifications

Browse Source 
We reckon it’s probably still useful.
This commit is contained in:
Chris Hill-Scott
2016-09-09 15:36:07 +01:00
parent 2d7ed4d34f
commit 17d5af1a6e
4 changed files with 27 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/__init__.py
View File

@@ -116,7 +116,7 @@ def create_app():
application.add_template_filter(format_date_normal) application.add_template_filter(format_date_normal)
application.add_template_filter(format_date_short) application.add_template_filter(format_date_short)
application.add_template_filter(format_notification_status) application.add_template_filter(format_notification_status)
application.add_template_filter(format_notification_status_with_time) application.add_template_filter(format_notification_status_as_time)
application.add_template_filter(format_notification_status_as_field_status) application.add_template_filter(format_notification_status_as_field_status)
application.add_template_filter(format_notification_status_as_url) application.add_template_filter(format_notification_status_as_url)
@@ -282,12 +282,11 @@ def format_notification_status(status, template_type):
}.get(template_type).get(status, status) }.get(template_type).get(status, status)
def format_notification_status_with_time(status, template_type, when): def format_notification_status_as_time(status, when):
return { return {
'delivered': 'Delivered {}'.format(when), 'sending': ' since {}'.format(when),
'sending': 'Sending since {}'.format(when), 'created': ' since {}'.format(when)
'created': 'Sending since {}'.format(when) }.get(status, when)
}.get(status, format_notification_status(status, template_type))
def format_notification_status_as_field_status(status): def format_notification_status_as_field_status(status):

7
app/assets/stylesheets/components/table.scss
View File

@@ -94,6 +94,13 @@
} }
.status-hint {
display: block;
font-weight: normal;
color: $red;
margin-top: 5px;
}
} }
&-yes, &-yes,

10
app/templates/partials/jobs/notifications.html
View File

@@ -57,13 +57,17 @@
{% if item.status|format_notification_status_as_url %} {% if item.status|format_notification_status_as_url %}
<a href="{{ item.status|format_notification_status_as_url }}"> <a href="{{ item.status|format_notification_status_as_url }}">
{% endif %} {% endif %}
{{ item.status|format_notification_status_with_time( {{ item.status|format_notification_status(
item.template.template_type, item.template.template_type
(item.updated_at or item.created_at)|format_datetime_short
) }} ) }}
{% if item.status|format_notification_status_as_url %} {% if item.status|format_notification_status_as_url %}
</a> </a>
{% endif %} {% endif %}
<span class="status-hint">
{{ item.status|format_notification_status_as_time(
(item.updated_at or item.created_at)|format_datetime_short
) }}
</span>
{% endcall %} {% endcall %}
{% endcall %} {% endcall %}

11
app/templates/views/notifications.html
View File

@@ -75,13 +75,18 @@
{% if item.status|format_notification_status_as_url %} {% if item.status|format_notification_status_as_url %}
<a href="{{ item.status|format_notification_status_as_url }}"> <a href="{{ item.status|format_notification_status_as_url }}">
{% endif %} {% endif %}
{{ item.status|format_notification_status_with_time( {{ item.status|format_notification_status(
item.template.template_type, item.template.template_type
(item.updated_at or item.created_at)|format_datetime_short
) }} ) }}
{% if item.status|format_notification_status_as_url %} {% if item.status|format_notification_status_as_url %}
</a> </a>
<br>
{% endif %} {% endif %}
<span class="status-hint">
{{ item.status|format_notification_status_as_time(
(item.updated_at or item.created_at)|format_datetime_short
) }}
</span>
{% endcall %} {% endcall %}
{% endcall %} {% endcall %}