mirror of
https://github.com/GSA/notifications-admin.git
synced 2026-08-24 08:16:51 -04:00
Hint that report is inclusive of both start date and end date
Bu changing labels for date input fields.
This commit is contained in:
@@ -1962,6 +1962,11 @@ class RequiredDateFilterForm(StripWhitespaceForm):
|
|||||||
end_date = GovukDateField("End Date")
|
end_date = GovukDateField("End Date")
|
||||||
|
|
||||||
|
|
||||||
|
class BillingReportDateFilterForm(StripWhitespaceForm):
|
||||||
|
start_date = GovukDateField("First day covered by report")
|
||||||
|
end_date = GovukDateField("Last day covered by report")
|
||||||
|
|
||||||
|
|
||||||
class SearchByNameForm(StripWhitespaceForm):
|
class SearchByNameForm(StripWhitespaceForm):
|
||||||
|
|
||||||
search = GovukSearchField(
|
search = GovukSearchField(
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ from app import (
|
|||||||
from app.extensions import redis_client
|
from app.extensions import redis_client
|
||||||
from app.main import main
|
from app.main import main
|
||||||
from app.main.forms import (
|
from app.main.forms import (
|
||||||
|
BillingReportDateFilterForm,
|
||||||
ClearCacheForm,
|
ClearCacheForm,
|
||||||
DateFilterForm,
|
DateFilterForm,
|
||||||
RequiredDateFilterForm,
|
RequiredDateFilterForm,
|
||||||
@@ -272,7 +273,7 @@ def notifications_sent_by_service():
|
|||||||
@main.route("/platform-admin/reports/usage-for-all-services", methods=['GET', 'POST'])
|
@main.route("/platform-admin/reports/usage-for-all-services", methods=['GET', 'POST'])
|
||||||
@user_is_platform_admin
|
@user_is_platform_admin
|
||||||
def get_billing_report():
|
def get_billing_report():
|
||||||
form = RequiredDateFilterForm()
|
form = BillingReportDateFilterForm()
|
||||||
|
|
||||||
if form.validate_on_submit():
|
if form.validate_on_submit():
|
||||||
start_date = form.start_date.data
|
start_date = form.start_date.data
|
||||||
|
|||||||
@@ -13,8 +13,8 @@
|
|||||||
</h1>
|
</h1>
|
||||||
|
|
||||||
{% call form_wrapper() %}
|
{% call form_wrapper() %}
|
||||||
{{ form.start_date(param_extensions={"hint": {"text": "Enter start date in format YYYY-MM-DD"}}) }}
|
{{ form.start_date(param_extensions={"hint": {"text": "Use the format YYYY-MM-DD"}}) }}
|
||||||
{{ form.end_date(param_extensions={"hint": {"text": "Enter end date in format YYYY-MM-DD"}}) }}
|
{{ form.end_date(param_extensions={"hint": {"text": "Use the format YYYY-MM-DD"}}) }}
|
||||||
{{ page_footer('Download report') }}
|
{{ page_footer('Download report') }}
|
||||||
{% endcall %}
|
{% endcall %}
|
||||||
|
|
||||||
@@ -32,7 +32,7 @@
|
|||||||
('sms cost', 'The total cost of text messages sent after a service has used its free allowance.'),
|
('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>.'),
|
('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>.'),
|
||||||
('letter cost', 'The total cost of letters sent by a service.'),
|
('letter cost', 'The total cost of letters sent by a service.'),
|
||||||
('letter breakdown', 'The number and cost of letters sent by a service, grouped by postage.'),
|
('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.'),
|
('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() %}
|
{% call row() %}
|
||||||
|
|||||||
Reference in New Issue
Block a user