darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-07 10:28:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add some subheadings

Browse Source 
This helps differentiate the totals from the rest of the page, and it
harmonises it with the per-service usage page.
This commit is contained in:
Chris Hill-Scott
2020-02-28 15:41:59 +00:00
parent a5ec009fd0
commit 3c140ecdbf
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,46 +12,50 @@
Usage Usage
</h1> </h1>
<div class="bottom-gutter-3-2"> <div class="bottom-gutter">
{{ pill(years, selected_year, big_number_args={'smallest': True}) }} {{ pill(years, selected_year, big_number_args={'smallest': True}) }}
</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-third">
<h2 class="heading-small">Emails</h2>
<div class="keyline-block"> <div class="keyline-block">
{{ big_number( {{ big_number(
total_emails_sent, total_emails_sent,
label='emails sent', label='sent',
smaller=True smaller=True
) }} ) }}
</div> </div>
</div> </div>
<div class="govuk-grid-column-one-third"> <div class="govuk-grid-column-one-third">
<h2 class="heading-small">Text messages</h2>
<div class="keyline-block"> <div class="keyline-block">
{{ big_number( {{ big_number(
total_sms_cost, total_sms_cost,
'spent on text messages', 'spent',
currency="£", currency="£",
smaller=True smaller=True
) }} ) }}
</div> </div>
</div> </div>
<div class="govuk-grid-column-one-third"> <div class="govuk-grid-column-one-third">
<h2 class="heading-small">Letters</h2>
<div class="keyline-block"> <div class="keyline-block">
{{ big_number( {{ big_number(
total_letter_cost, total_letter_cost,
'spent on letters', 'spent',
currency="£", currency="£",
smaller=True smaller=True
) }} ) }}
</div> </div>
</div> </div>
</div> </div>
<h2 class="heading-small">By service</h2>
{% for service in services %} {% for service in services %}
<div class="keyline-block govuk-!-margin-top-2"> <div class="keyline-block govuk-!-margin-top-2">
<h2 class="govuk-!-font-weight-bold govuk-!-font-size-24 govuk-!-margin-bottom-1 govuk-!-margin-top-1"> <h3 class="govuk-!-font-weight-bold govuk-!-font-size-24 govuk-!-margin-bottom-1 govuk-!-margin-top-1">
<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>
</h2> </h3>
<div class="govuk-grid-row"> <div class="govuk-grid-row">
<div class="govuk-grid-column-one-third"> <div class="govuk-grid-column-one-third">
{{ big_number( {{ big_number(

8
tests/app/main/views/organisations/test_organisation.py
View File

@@ -414,14 +414,14 @@ def test_organisation_services_shows_live_services_and_usage(
page = client_request.get('.organisation_dashboard', org_id=ORGANISATION_ID) page = client_request.get('.organisation_dashboard', org_id=ORGANISATION_ID)
mock.assert_called_once_with(ORGANISATION_ID, 2019) mock.assert_called_once_with(ORGANISATION_ID, 2019)
services = page.select('main h2') services = page.select('main h3')
usage_rows = page.select('main .govuk-grid-column-one-third') usage_rows = page.select('main .govuk-grid-column-one-third')
assert len(services) == 2 assert len(services) == 2
# Totals # Totals
assert normalize_spaces(usage_rows[0].text) == "33,000 emails sent" assert normalize_spaces(usage_rows[0].text) == "Emails 33,000 sent"
assert normalize_spaces(usage_rows[1].text) == "£43.93 spent on text messages" assert normalize_spaces(usage_rows[1].text) == "Text messages £43.93 spent"
assert normalize_spaces(usage_rows[2].text) == "£30.50 spent on letters" assert normalize_spaces(usage_rows[2].text) == "Letters £30.50 spent"
assert normalize_spaces(services[0].text) == '1' assert normalize_spaces(services[0].text) == '1'
assert normalize_spaces(services[1].text) == '5' assert normalize_spaces(services[1].text) == '5'