diff --git a/app/templates/components/message-count-label.html b/app/templates/components/message-count-label.html new file mode 100644 index 000000000..532a711d5 --- /dev/null +++ b/app/templates/components/message-count-label.html @@ -0,0 +1,15 @@ +{% macro message_count_label(count, template_type) -%} + {%- if template_type == 'sms' -%} + {%- if count == 1 -%} + text message + {%- else -%} + text messages + {%- endif -%} + {%- elif template_type == 'email' -%} + {%- if count == 1 -%} + email + {%- else -%} + emails + {%- endif -%} + {%- endif %} sent +{%- endmacro %} \ No newline at end of file diff --git a/app/templates/views/dashboard/template-statistics.html b/app/templates/views/dashboard/template-statistics.html index 0af34f4ba..1d3f8e2ac 100644 --- a/app/templates/views/dashboard/template-statistics.html +++ b/app/templates/views/dashboard/template-statistics.html @@ -1,4 +1,4 @@ -{% from "components/table.html" import list_table, field, hidden_field_heading, right_aligned_field_heading %} +{% from "components/message-count-label.html" import message_count_label %}
{% for item in template_statistics %} @@ -13,8 +13,7 @@
- {{ item.usage_count }} {{ 'text messages' if item.template.template_type == 'sms' else 'emails' }} sent - + {{ item.usage_count }} {{ message_count_label(item.usage_count, item.template.template_type) }}
diff --git a/app/templates/views/dashboard/today.html b/app/templates/views/dashboard/today.html index 859409ba6..be28c2b10 100644 --- a/app/templates/views/dashboard/today.html +++ b/app/templates/views/dashboard/today.html @@ -1,5 +1,6 @@ {% from "components/big-number.html" import big_number, big_number_with_status %} {% from "components/show-more.html" import show_more %} +{% from "components/message-count-label.html" import message_count_label %}
{{ big_number_with_status( statistics.emails_requested, - 'email sent' if statistics.emails_requested == 1 else 'emails sent', + message_count_label(statistics.emails_requested, 'email'), statistics.emails_failed, statistics.get('emails_failure_rate', 0.0), statistics.get('emails_failure_rate', 0)|float > 3, @@ -23,7 +24,7 @@
{{ big_number_with_status( statistics.sms_requested, - 'text message sent' if statistics.sms_requested == 1 else 'text messages sent', + message_count_label(statistics.sms_requested, 'sms'), statistics.sms_failed, statistics.get('sms_failure_rate', 0.0), statistics.get('sms_failure_rate', 0)|float > 3, diff --git a/tests/app/main/views/test_dashboard.py b/tests/app/main/views/test_dashboard.py index d878c4243..2454b63d3 100644 --- a/tests/app/main/views/test_dashboard.py +++ b/tests/app/main/views/test_dashboard.py @@ -92,10 +92,10 @@ def test_should_show_recent_templates_on_dashboard(app_, assert len(table_rows) == 2 assert page.find_all('dt')[0].text.strip() == 'Pickle feet' - assert page.find_all('dd')[0].text.strip() == '206 messages sent' + assert page.find_all('dd')[0].text.strip() == '206 text messages sent' assert page.find_all('dt')[1].text.strip() == 'Brine Shrimp' - assert page.find_all('dd')[1].text.strip() == '13 messages sent' + assert page.find_all('dd')[1].text.strip() == '13 text messages sent' def test_should_show_all_templates_on_template_statistics_page( @@ -130,10 +130,10 @@ def test_should_show_all_templates_on_template_statistics_page( assert len(table_rows) == 2 assert page.find_all('dt')[0].text.strip() == 'Pickle feet' - assert page.find_all('dd')[0].text.strip() == '206 messages sent' + assert page.find_all('dd')[0].text.strip() == '206 text messages sent' assert page.find_all('dt')[1].text.strip() == 'Brine Shrimp' - assert page.find_all('dd')[1].text.strip() == '13 messages sent' + assert page.find_all('dd')[1].text.strip() == '13 text messages sent' def _test_dashboard_menu(mocker, app_, usr, service, permissions):