darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-07-19 22:13:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

more accurate css classes

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,9 +5,8 @@
{% from "components/form.html" import form_wrapper %}
{% from "components/button/macro.njk" import govukButton %}
{% set title_status = '' %}
{% 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')
else 'Sent messages'
) %}

8
app/templates/views/organisations/organisation/index.html
View File

@@ -17,7 +17,7 @@
</div>
<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>
<div class="keyline-block">
{{ big_number(
@@ -27,7 +27,7 @@
) }}
</div>
</div>
<div class="govuk-grid-column-one-third">
<div class="govuk-grid-column-one-half">
<h2 class="heading-small">Text messages</h2>
<div class="keyline-block">
{{ 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>
</h3>
<div class="govuk-grid-row">
<div class="govuk-grid-column-one-third">
<div class="govuk-grid-column-one-half">
{{ big_number(
service.emails_sent,
label=service.emails_sent|message_count_label('email'),
smallest=True
) }}
</div>
<div class="govuk-grid-column-one-third">
<div class="govuk-grid-column-one-half">
{% if service.sms_cost %}
{{ big_number(
service.sms_cost,

4
app/templates/views/platform-admin/_global_stats.html
View File

@@ -1,7 +1,7 @@
{% from "components/big-number.html" import big_number_with_status %}
<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(
global_stats.email.delivered + global_stats.email.failed,
global_stats.email.delivered|message_count_label('email'),
@@ -11,7 +11,7 @@
smaller=True
) }}
</div>
<div class="govuk-grid-column-one-third">
<div class="govuk-grid-column-one-half">
{{ big_number_with_status(
global_stats.sms.delivered + global_stats.sms.failed,
global_stats.sms.delivered|message_count_label('sms'),

4
app/templates/views/platform-admin/index.html
View File

@@ -32,7 +32,7 @@
<div class="govuk-grid-row bottom-gutter">
{% for noti_type in global_stats %}
<div class="govuk-grid-column-one-third">
<div class="govuk-grid-column-one-half">
{{ big_number_simple(
noti_type.black_box.number,
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">
{% 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">
<span class="big-number-number">{{ "{:,}".format(noti_type.test_data.number) }}</span>
{{ noti_type.test_data.label }}

4
tests/app/main/views/organisations/test_organisations.py
View File

@@ -469,7 +469,7 @@ def test_organisation_services_shows_live_services_and_usage(
mock.assert_called_once_with(ORGANISATION_ID, 2019)
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
# 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)
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
assert normalize_spaces(usage_rows[0].text) == "Emails 1 sent"

6
tests/app/main/views/test_platform_admin.py
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
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'))
# Email complaints status box - link exists and number is correct
assert page.find('a', string='15 complaints')
# SMS total box - number is correct
assert page.find_all('span', class_='big-number-number')[1].text.strip() == '168'
# 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
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