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

Merge pull request #1768 from gov-cjwaszczuk/add-letters-to-monthly-messages-sent

Browse Source 
Include letters on monthly messages sent
This commit is contained in:
Chris Waszczuk
2018-02-07 10:52:52 +00:00
committed by GitHub
parent a819b30d35 82302626ad
commit c2136b0ffb
3 changed files with 39 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,6 @@
{% from "components/big-number.html" import big_number %}
{% macro mapping_table(caption='', field_headings=[], field_headings_visible=True, caption_visible=True) -%}
{% macro mapping_table(caption='', field_headings=[], field_headings_visible=True, caption_visible=True, equal_length=False) -%}
<table class="table table-font-xsmall">
<caption class="heading-medium table-heading{{ ' visuallyhidden' if not caption_visible}}">
{{ caption }}
@@ -8,7 +8,7 @@
<thead class="table-field-headings{% if field_headings_visible %}-visible{% endif %}">
<tr>
{% for field_heading in field_headings %}
<th scope="col" class="table-field-heading{% if loop.first %}-first{% endif %}">
<th scope="col" class="table-field-heading{% if loop.first %}-first{% endif %}" width="{% if equal_length %}{{ (100 / field_headings|length)|int }}%{% endif %}">
{% if field_headings_visible %}
{{ field_heading }}
{% else %}
@@ -24,10 +24,10 @@
</table>
{%- endmacro %}
{% macro list_table(items, caption='', empty_message='', field_headings=[], field_headings_visible=True, caption_visible=True) -%}
{% macro list_table(items, caption='', empty_message='', field_headings=[], field_headings_visible=True, caption_visible=True, equal_length=False) -%}
{% set parent_caller = caller %}
{% call mapping_table(caption, field_headings, field_headings_visible, caption_visible) %}
{% call mapping_table(caption, field_headings, field_headings_visible, caption_visible, equal_length) %}
{% for item in items %}
{% call row(item.id) %}
{{ parent_caller(item, loop.index + 1) }}

7
app/templates/views/dashboard/monthly.html
View File

@@ -33,8 +33,10 @@
'Month',
'Emails',
'Text messages',
'letters',
],
field_headings_visible=False
field_headings_visible=False,
equal_length=True
) %}
{% if not month.future %}
{% call row_heading() %}
@@ -42,7 +44,8 @@
{% endcall %}
{% for counts, template_type in [
(month.email_counts, 'email'),
(month.sms_counts, 'sms')
(month.sms_counts, 'sms'),
(month.letter_counts, 'letter')
] %}
{% call field(align='left') %}
{{ big_number(