diff --git a/app/assets/stylesheets/components/table.scss b/app/assets/stylesheets/components/table.scss index 6c0c6517e..79f5eae88 100644 --- a/app/assets/stylesheets/components/table.scss +++ b/app/assets/stylesheets/components/table.scss @@ -14,9 +14,10 @@ table-layout: fixed; } - .table-field-headings { + .table-field-headings, + .table-field-headings-visible { th { - padding: 0 0 5px 0; + padding-bottom: 5px; } } diff --git a/app/assets/stylesheets/views/dashboard.scss b/app/assets/stylesheets/views/dashboard.scss index 946b78576..80f0b994d 100644 --- a/app/assets/stylesheets/views/dashboard.scss +++ b/app/assets/stylesheets/views/dashboard.scss @@ -49,7 +49,6 @@ color: $govuk-blue; max-width: 100%; background: $white; - margin-bottom: $gutter-two-thirds; } } diff --git a/app/templates/views/dashboard/template-statistics.html b/app/templates/views/dashboard/template-statistics.html index b67b5c70a..819b759cd 100644 --- a/app/templates/views/dashboard/template-statistics.html +++ b/app/templates/views/dashboard/template-statistics.html @@ -1,41 +1,46 @@ {% from "components/big-number.html" import big_number %} {% from "components/message-count-label.html" import message_count_label %} {% from "components/big-number.html" import big_number %} +{% from "components/table.html" import list_table, field, right_aligned_field_heading, row_heading %} -
- {% for item in template_statistics %} -
- -
- - {{ item.template.name }} - - {{ message_count_label(1, item.template.template_type, suffix='template')|capitalize }} +
+ {% call(item, row_number) list_table( + template_statistics, + caption="Templates used", + caption_visible=False, + empty_message='', + field_headings=[ + 'Template', + 'Messages sent' + ], + field_headings_visible=True + ) %} + {% call row_heading() %} + + {{ item.template.name }} + + {{ message_count_label(1, item.template.template_type, suffix='template')|capitalize }} + + + {% endcall %} + {% call field() %} + {% if template_statistics|length > 1 %} + + + {{ big_number( + item.usage_count, + smallest=True + ) }} -
- -
- {% if template_statistics|length > 1 %} - - - {{ big_number( - item.usage_count, - smallest=True - ) }} - - - - {% else %} - - {{ item.usage_count }} - {{ message_count_label(item.usage_count, item.template.template_type) }} - - {% endif %} -
- -
- {% endfor %} -
+ {% else %} + + {{ big_number( + item.usage_count, + smallest=True + ) }} + + {% endif %} + {% endcall %} + {% endcall %} + diff --git a/app/templates/views/dashboard/today.html b/app/templates/views/dashboard/today.html index 6a17e85f4..409c4e58a 100644 --- a/app/templates/views/dashboard/today.html +++ b/app/templates/views/dashboard/today.html @@ -45,7 +45,7 @@ {% include 'views/dashboard/template-statistics.html' %} {{ show_more( url_for('.template_history', service_id=current_service.id), - 'See all templates sent this year' + 'See all templates used this year' ) }} {% endif %} diff --git a/tests/app/main/views/test_dashboard.py b/tests/app/main/views/test_dashboard.py index ef5ec8942..bec5783d3 100644 --- a/tests/app/main/views/test_dashboard.py +++ b/tests/app/main/views/test_dashboard.py @@ -87,19 +87,17 @@ def test_should_show_recent_templates_on_dashboard(app_, assert 'Test Service' in headers assert 'In the last 7 days' in headers - table_rows = page.find_all('dt') + table_rows = page.find_all('tbody')[0].find_all('tr') assert len(table_rows) == 2 - assert 'Pickle feet' in page.find_all('dt')[0].text - assert 'Text message template' in page.find_all('dt')[0].text - assert '206' in page.find_all('dd')[0].text - assert 'text messages sent' in page.find_all('dd')[0].text + assert 'Pickle feet' in table_rows[0].find_all('th')[0].text + assert 'Text message template' in table_rows[0].find_all('th')[0].text + assert '206' in table_rows[0].find_all('td')[0].text - assert 'Brine Shrimp' in page.find_all('dt')[1].text - assert 'Text message template' in page.find_all('dt')[1].text - assert '13' in page.find_all('dd')[1].text - assert 'text messages sent' in page.find_all('dd')[1].text + assert 'Brine Shrimp' in table_rows[1].find_all('th')[0].text + assert 'Text message template' in table_rows[1].find_all('th')[0].text + assert '13' in table_rows[1].find_all('td')[0].text def test_should_show_all_templates_on_template_statistics_page( @@ -129,19 +127,17 @@ def test_should_show_all_templates_on_template_statistics_page( mock_template_stats.assert_called_once_with(SERVICE_ONE_ID) page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser') - table_rows = page.find_all('dt') + table_rows = page.find_all('tbody')[0].find_all('tr') assert len(table_rows) == 2 - assert 'Pickle feet' in page.find_all('dt')[0].text - assert 'Text message template' in page.find_all('dt')[0].text - assert '206' in page.find_all('dd')[0].text - assert 'text messages sent' in page.find_all('dd')[0].text + assert 'Pickle feet' in table_rows[0].find_all('th')[0].text + assert 'Text message template' in table_rows[0].find_all('th')[0].text + assert '206' in table_rows[0].find_all('td')[0].text - assert 'Brine Shrimp' in page.find_all('dt')[1].text - assert 'Text message template' in page.find_all('dt')[1].text - assert '13' in page.find_all('dd')[1].text - assert 'text messages sent' in page.find_all('dd')[1].text + assert 'Brine Shrimp' in table_rows[1].find_all('th')[0].text + assert 'Text message template' in table_rows[1].find_all('th')[0].text + assert '13' in table_rows[1].find_all('td')[0].text def _test_dashboard_menu(mocker, app_, usr, service, permissions):