more accurate css classes

This commit is contained in:
stvnrlly
2022-12-12 15:15:50 -05:00
parent 10175a6dee
commit 6233e35902
6 changed files with 14 additions and 15 deletions
+1 -2
View File
@@ -5,9 +5,8 @@
{% from "components/form.html" import form_wrapper %} {% from "components/form.html" import form_wrapper %}
{% from "components/button/macro.njk" import govukButton %} {% from "components/button/macro.njk" import govukButton %}
{% set title_status = '' %}
{% set page_title = ( {% set page_title = (
(title_status + 99|message_count_label(message_type, suffix='')) | capitalize (99|message_count_label(message_type, suffix='')) | capitalize
if current_user.has_permissions('view_activity') if current_user.has_permissions('view_activity')
else 'Sent messages' else 'Sent messages'
) %} ) %}
@@ -17,7 +17,7 @@
</div> </div>
<div class="govuk-grid-row bottom-gutter"> <div class="govuk-grid-row bottom-gutter">
<div class="govuk-grid-column-one-third"> <div class="govuk-grid-column-one-half">
<h2 class="heading-small">Emails</h2> <h2 class="heading-small">Emails</h2>
<div class="keyline-block"> <div class="keyline-block">
{{ big_number( {{ big_number(
@@ -27,7 +27,7 @@
) }} ) }}
</div> </div>
</div> </div>
<div class="govuk-grid-column-one-third"> <div class="govuk-grid-column-one-half">
<h2 class="heading-small">Text messages</h2> <h2 class="heading-small">Text messages</h2>
<div class="keyline-block"> <div class="keyline-block">
{{ big_number( {{ big_number(
@@ -59,14 +59,14 @@
<a href="{{ url_for('main.usage', service_id=service.service_id) }}" class="govuk-link govuk-link--no-visited-state browse-list-link">{{ service.service_name }}</a> <a href="{{ url_for('main.usage', service_id=service.service_id) }}" class="govuk-link govuk-link--no-visited-state browse-list-link">{{ service.service_name }}</a>
</h3> </h3>
<div class="govuk-grid-row"> <div class="govuk-grid-row">
<div class="govuk-grid-column-one-third"> <div class="govuk-grid-column-one-half">
{{ big_number( {{ big_number(
service.emails_sent, service.emails_sent,
label=service.emails_sent|message_count_label('email'), label=service.emails_sent|message_count_label('email'),
smallest=True smallest=True
) }} ) }}
</div> </div>
<div class="govuk-grid-column-one-third"> <div class="govuk-grid-column-one-half">
{% if service.sms_cost %} {% if service.sms_cost %}
{{ big_number( {{ big_number(
service.sms_cost, service.sms_cost,
@@ -1,7 +1,7 @@
{% from "components/big-number.html" import big_number_with_status %} {% from "components/big-number.html" import big_number_with_status %}
<div class="govuk-grid-row bottom-gutter"> <div class="govuk-grid-row bottom-gutter">
<div class="govuk-grid-column-one-third"> <div class="govuk-grid-column-one-half">
{{ big_number_with_status( {{ big_number_with_status(
global_stats.email.delivered + global_stats.email.failed, global_stats.email.delivered + global_stats.email.failed,
global_stats.email.delivered|message_count_label('email'), global_stats.email.delivered|message_count_label('email'),
@@ -11,7 +11,7 @@
smaller=True smaller=True
) }} ) }}
</div> </div>
<div class="govuk-grid-column-one-third"> <div class="govuk-grid-column-one-half">
{{ big_number_with_status( {{ big_number_with_status(
global_stats.sms.delivered + global_stats.sms.failed, global_stats.sms.delivered + global_stats.sms.failed,
global_stats.sms.delivered|message_count_label('sms'), global_stats.sms.delivered|message_count_label('sms'),
@@ -32,7 +32,7 @@
<div class="govuk-grid-row bottom-gutter"> <div class="govuk-grid-row bottom-gutter">
{% for noti_type in global_stats %} {% for noti_type in global_stats %}
<div class="govuk-grid-column-one-third"> <div class="govuk-grid-column-one-half">
{{ big_number_simple( {{ big_number_simple(
noti_type.black_box.number, noti_type.black_box.number,
noti_type.black_box.number|message_count_label(noti_type.black_box.notification_type) noti_type.black_box.number|message_count_label(noti_type.black_box.notification_type)
@@ -53,7 +53,7 @@
<div class="govuk-grid-row bottom-gutter"> <div class="govuk-grid-row bottom-gutter">
{% for noti_type in global_stats %} {% for noti_type in global_stats %}
<div class="govuk-grid-column-one-third"> <div class="govuk-grid-column-one-half">
<div class="bordered-text-box"> <div class="bordered-text-box">
<span class="big-number-number">{{ "{:,}".format(noti_type.test_data.number) }}</span> <span class="big-number-number">{{ "{:,}".format(noti_type.test_data.number) }}</span>
{{ noti_type.test_data.label }} {{ noti_type.test_data.label }}
@@ -469,7 +469,7 @@ def test_organisation_services_shows_live_services_and_usage(
mock.assert_called_once_with(ORGANISATION_ID, 2019) mock.assert_called_once_with(ORGANISATION_ID, 2019)
services = page.select('main h3') services = page.select('main h3')
usage_rows = page.select('main .govuk-grid-column-one-third') usage_rows = page.select('main .govuk-grid-column-one-half')
assert len(services) == 2 assert len(services) == 2
# Totals # Totals
@@ -510,7 +510,7 @@ def test_organisation_services_shows_live_services_and_usage_with_count_of_1(
client_request.login(active_user_with_permissions) client_request.login(active_user_with_permissions)
page = client_request.get('.organisation_dashboard', org_id=ORGANISATION_ID) page = client_request.get('.organisation_dashboard', org_id=ORGANISATION_ID)
usage_rows = page.select('main .govuk-grid-column-one-third') usage_rows = page.select('main .govuk-grid-column-one-half')
# Totals # Totals
assert normalize_spaces(usage_rows[0].text) == "Emails 1 sent" assert normalize_spaces(usage_rows[0].text) == "Emails 1 sent"
+3 -3
View File
@@ -629,16 +629,16 @@ def test_platform_admin_displays_stats_in_right_boxes_and_with_correct_styling(
# Email permanent failure status box - number is correct # Email permanent failure status box - number is correct
assert '3 permanent failures' in page.find_all( assert '3 permanent failures' in page.find_all(
'div', class_='govuk-grid-column-one-third' 'div', class_='govuk-grid-column-one-half'
)[0].find(string=re.compile('permanent')) )[0].find(string=re.compile('permanent'))
# Email complaints status box - link exists and number is correct # Email complaints status box - link exists and number is correct
assert page.find('a', string='15 complaints') assert page.find('a', string='15 complaints')
# SMS total box - number is correct # SMS total box - number is correct
assert page.find_all('span', class_='big-number-number')[1].text.strip() == '168' assert page.find_all('span', class_='big-number-number')[1].text.strip() == '168'
# Test SMS box - number is correct # Test SMS box - number is correct
assert '5' in page.find_all('div', class_='govuk-grid-column-one-third')[3].text assert '5' in page.find_all('div', class_='govuk-grid-column-one-half')[3].text
# SMS technical failure status box - number is correct and failure class is used # SMS technical failure status box - number is correct and failure class is used
assert '1 technical failures' in page.find_all('div', class_='govuk-grid-column-one-third')[1].find( assert '1 technical failures' in page.find_all('div', class_='govuk-grid-column-one-half')[1].find(
'div', class_='big-number-status-failing').text 'div', class_='big-number-status-failing').text