Skip to content

Migrate tables to summary lists on platform-admin pages #5988

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kr8n3r merged 2 commits into from
Jul 14, 2026
Merged

Migrate tables to summary lists on platform-admin pages #5988

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d381b70
Replace tables with summary-lists on platform-admin pages
kr8n3r Jul 6, 2026
3deb14e
Remove platform-admin/services page
kr8n3r Jul 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
84 changes: 61 additions & 23 deletions app/templates/views/platform-admin/daily-sms-provider-volumes-report.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% extends "views/platform-admin/_base_template.html" %}
{% from "components/form.html" import form_wrapper %}
{% from "components/table.html" import mapping_table, row, text_field %}
{% from "components/page-footer.html" import page_footer %}
{% from "govuk_frontend_jinja/components/summary-list/macro.html" import govukSummaryList %}

{% block per_page_title %}
Daily SMS provider volumes Report
Expand All @@ -22,27 +22,65 @@ <h1 class="heading-large">
<h2 class="heading-medium">
Data included in the report
</h2>
<div class="bottom-gutter-3-2">
{% call mapping_table(
caption='Descriptions of daily SMS provider volumes data',
field_headings=['Name', 'Description'],
field_headings_visible=True,
caption_visible=False
) %}
{% for column_heading, description in [
('day', 'The whole business day in BST'),
('provider', 'The SMS provider'),
('sms totals', 'The number of text messages sent'),
('sms fragments', 'The number of text message fragments sent'),
('sms chargeable units', 'The number of text message fragments sent times the rate multiplier'),
('sms cost', 'The cost to Notify’s users of text messages sent'),
] %}
{% call row() %}
{{ text_field(column_heading) }}
{{ text_field(description) }}
{% endcall %}
{% endfor %}
{% endcall %}
</div>

{{ govukSummaryList({
"classes": "notify-summary-list govuk-!-margin-bottom-7 govuk-!-font-size-16",
"rows": [
{
"key": {
"classes": "notify-summary-list__key",
"text": "day"
},
"value": {
"text": "The whole business day in BST"
}
},
{
"key": {
"classes": "notify-summary-list__key",
"text": "provider"
},
"value": {
"text": "The SMS provider"
}
},
{
"key": {
"classes": "notify-summary-list__key",
"text": "sms totals"
},
"value": {
"text": "The number of text messages sent"
}
},
{
"key": {
"classes": "notify-summary-list__key",
"text": "sms fragments"
},
"value": {
"text": "The number of text message fragments sent"
}
},
{
"key": {
"classes": "notify-summary-list__key",
"text": "sms chargeable units"
},
"value": {
"text": "The number of text message fragments sent times the rate multiplier"
}
},
{
"key": {
"classes": "notify-summary-list__key",
"text": "sms cost"
},
"value": {
"text": "The cost to Notify’s users of text messages sent"
}
}
]
}) }}

{% endblock %}
94 changes: 70 additions & 24 deletions app/templates/views/platform-admin/daily-volumes-report.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% extends "views/platform-admin/_base_template.html" %}
{% from "components/form.html" import form_wrapper %}
{% from "components/table.html" import mapping_table, row, text_field %}
{% from "components/page-footer.html" import page_footer %}
{% from "govuk_frontend_jinja/components/summary-list/macro.html" import govukSummaryList %}

{% block per_page_title %}
Daily volumes report
Expand All @@ -22,28 +22,74 @@ <h1 class="heading-large">
<h2 class="heading-medium">
Data included in the report
</h2>
<div class="bottom-gutter-3-2">
{% call mapping_table(
caption='Descriptions of daily volumes data',
field_headings=['Name', 'Description'],
field_headings_visible=True,
caption_visible=False
) %}
{% for column_heading, description in [
('day', 'The whole business day in BST.'),
('sms totals', 'The number of text messages sent'),
('sms fragments', 'The number of text message fragments sent times the rate multiplier'),
('sms chargeable units', 'The number of text message fragments sent'),
('email totals', 'The number of emails sent'),
('letter totals', 'The number of letters sent'),
('letter sheet totals', 'The number of sheets sent')
] %}
{% call row() %}
{{ text_field(column_heading) }}
{{ text_field(description) }}
{% endcall %}
{% endfor %}
{% endcall %}
</div>

{{ govukSummaryList({
"classes": "notify-summary-list govuk-!-margin-bottom-7 govuk-!-font-size-16",
"rows": [
{
"key": {
"classes": "notify-summary-list__key",
"text": "day"
},
"value": {
"text": "The whole business day in BST."
}
},
{
"key": {
"classes": "notify-summary-list__key",
"text": "sms totals"
},
"value": {
"text": "The number of text messages sent"
}
},
{
"key": {
"classes": "notify-summary-list__key",
"text": "sms fragments"
},
"value": {
"text": "The number of text message fragments sent times the rate multiplier"

@joybytes joybytes Jul 14, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's nothing to do with the changes on this PR, but I think the description for sms-fragment and ``sms chargeable units` are swapped

}
},
{
"key": {
"classes": "notify-summary-list__key",
"text": "sms chargeable units"
},
"value": {
"text": "The number of text message fragments sent"
}
},
{
"key": {
"classes": "notify-summary-list__key",
"text": "email totals"
},
"value": {
"text": "The number of emails sent"
}
},
{
"key": {
"classes": "notify-summary-list__key",
"text": "letter totals"
},
"value": {
"text": "The number of letters sent"
}
},
{
"key": {
"classes": "notify-summary-list__key",
"text": "letter sheet totals"
},
"value": {
"text": "The number of sheets sent"
}
}
]
}) }}

{% endblock %}
74 changes: 52 additions & 22 deletions app/templates/views/platform-admin/get-billing-report.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% extends "views/platform-admin/_base_template.html" %}
{% from "components/form.html" import form_wrapper %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/table.html" import mapping_table, row, text_field %}
{% from "govuk_frontend_jinja/components/summary-list/macro.html" import govukSummaryList %}

{% block per_page_title %}
Billing Report
Expand All @@ -22,26 +22,56 @@ <h1 class="heading-large">
<h2 class="heading-medium">
Data included in the report
</h2>
<div class="bottom-gutter-3-2">
{% call mapping_table(
caption='Descriptions of billing report data',
field_headings=['Name', 'Description'],
field_headings_visible=True,
caption_visible=False
) %}
{% for column_heading, description in [
('sms cost', 'The total cost of text messages sent after a service has used its free allowance.'),
('sms chargeable units', 'The number of fragments sent after a service has used its free allowance. This number takes into account the cost multiplier for <a class="govuk-link govuk-link--no-visited-state" href="https://www.notifications.service.gov.uk/pricing#international-numbers">sending international text messages</a>.' | safe),
('letter cost', 'The total cost of letters sent by a service.'),
('letter breakdown', 'The number of letters sent by a service, grouped by postage and unit cost.'),
('purchase order number, contact names, contact email addresses and billing reference', 'We add this data manually based on the information we get from services. You can help by adding it to the service settings page.'),
] %}
{% call row() %}
{{ text_field(column_heading) }}
{{ text_field(description) }}
{% endcall %}
{% endfor %}
{% endcall %}
</div>

{{ govukSummaryList({
"classes": "notify-summary-list govuk-!-margin-bottom-7 govuk-!-font-size-16",
"rows": [
{
"key": {
"classes": "notify-summary-list__key",
"text": "sms cost"
},
"value": {
"text": "The total cost of text messages sent after a service has used its free allowance."
}
},
{
"key": {
"classes": "notify-summary-list__key",
"text": "sms chargeable units"
},
"value": {
"html": "The number of fragments sent after a service has used its free allowance. This number takes into account the cost multiplier for <a class=\"govuk-link govuk-link--no-visited-state\" href=\"https://www.notifications.service.gov.uk/pricing#international-numbers\">sending international text messages</a>."
}
},
{
"key": {
"classes": "notify-summary-list__key",
"text": "letter cost"
},
"value": {
"text": "The total cost of letters sent by a service."
}
},
{
"key": {
"classes": "notify-summary-list__key",
"text": "letter breakdown"
},
"value": {
"text": "The number of letters sent by a service, grouped by postage and unit cost."
}
},
{
"key": {
"classes": "notify-summary-list__key",
"text": "purchase order number, contact names, contact email addresses and billing reference"
},
"value": {
"text": "We add this data manually based on the information we get from services. You can help by adding it to the service settings page."
}
}
]
}) }}

{% endblock %}
94 changes: 70 additions & 24 deletions app/templates/views/platform-admin/get-dvla-billing-report.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% extends "views/platform-admin/_base_template.html" %}
{% from "components/form.html" import form_wrapper %}
{% from "components/page-footer.html" import page_footer %}
{% from "components/table.html" import mapping_table, row, text_field %}
{% from "govuk_frontend_jinja/components/summary-list/macro.html" import govukSummaryList %}

{% block per_page_title %}
DVLA Billing Report
Expand All @@ -22,28 +22,74 @@ <h1 class="heading-large">
<h2 class="heading-medium">
Data included in the report
</h2>
<div class="bottom-gutter-3-2">
{% call mapping_table(
caption='Descriptions of billing report data',
field_headings=['Name', 'Description'],
field_headings_visible=True,
caption_visible=False
) %}
{% for column_heading, description in [
('despatch date', 'The date these letters were despatched by DVLA'),
('postage', 'The postage of the letters (eg first, second, europe, rest-of-world)'),
('DVLA cost threshold', 'A DVLA-internal pricing threshold (sorted, unsorted).'),
('sheets', 'The number of sheets for each letter (1-5 pages)'),
('rate (£)', 'The unit cost per letter in £ (GBP)'),
('letters', 'The number of letters sent'),
('cost (£)', 'The cost for sending these letters in £ (GBP)'),
] %}
{% call row() %}
{{ text_field(column_heading) }}
{{ text_field(description) }}
{% endcall %}
{% endfor %}
{% endcall %}
</div>

{{ govukSummaryList({
"classes": "notify-summary-list govuk-!-margin-bottom-7 govuk-!-font-size-16",
"rows": [
{
"key": {
"classes": "notify-summary-list__key",
"text": "despatch date"
},
"value": {
"text": "The date these letters were despatched by DVLA"
}
},
{
"key": {
"classes": "notify-summary-list__key",
"text": "postage"
},
"value": {
"text": "The postage of the letters (eg first, second, europe, rest-of-world)"
}
},
{
"key": {
"classes": "notify-summary-list__key",
"text": "DVLA cost threshold"
},
"value": {
"text": "A DVLA-internal pricing threshold (sorted, unsorted)."
}
},
{
"key": {
"classes": "notify-summary-list__key",
"text": "sheets"
},
"value": {
"text": "The number of sheets for each letter (1-5 pages)"
}
},
{
"key": {
"classes": "notify-summary-list__key",
"text": "rate (£)"
},
"value": {
"text": "The unit cost per letter in £ (GBP)"
}
},
{
"key": {
"classes": "notify-summary-list__key",
"text": "letters"
},
"value": {
"text": "The number of letters sent"
}
},
{
"key": {
"classes": "notify-summary-list__key",
"text": "cost (£)"
},
"value": {
"text": "The cost for sending these letters in £ (GBP)"
}
}
]
}) }}

{% endblock %}
Loading
Loading