darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-11 18:37:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Convert DateFields to GovukDateFields

Browse Source 
Changes those fields in the following forms:
- DateFilterForm
- RequiredDateFilterForm

Includes changes to templates that use this form
and associated tests.
This commit is contained in:
Tom Byers
2020-08-12 10:34:51 +01:00
parent 8faca47152
commit c715681f5c
6 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/main/forms.py
+4 -4
View File
@@ -1768,14 +1768,14 @@ class GuestList(StripWhitespaceForm):
class DateFilterForm(StripWhitespaceForm): class DateFilterForm(StripWhitespaceForm):
start_date = DateField("Start Date", [validators.optional()]) start_date = GovukDateField("Start Date", [validators.optional()])
end_date = DateField("End Date", [validators.optional()]) end_date = GovukDateField("End Date", [validators.optional()])
include_from_test_key = govukCheckboxField("Include test keys") include_from_test_key = govukCheckboxField("Include test keys")
class RequiredDateFilterForm(StripWhitespaceForm): class RequiredDateFilterForm(StripWhitespaceForm):
start_date = DateField("Start Date") start_date = GovukDateField("Start Date")
end_date = DateField("End Date") end_date = GovukDateField("End Date")
class SearchByNameForm(StripWhitespaceForm): class SearchByNameForm(StripWhitespaceForm):
app/templates/views/platform-admin/index.html
+2 -2
View File
@@ -19,8 +19,8 @@
{% set details_content %} {% set details_content %}
{% call form_wrapper(method="get") %} {% call form_wrapper(method="get") %}
{{ textbox(form.start_date, hint="Enter start date in format YYYY-MM-DD") }} {{ form.start_date(param_extensions={"hint": {"text":"Enter start date in format YYYY-MM-DD"}}) }}
{{ textbox(form.end_date, hint="Enter end date in format YYYY-MM-DD") }} {{ form.end_date(param_extensions={"hint": {"text":"Enter end date in format YYYY-MM-DD"}}) }}
</br> </br>
{{ govukButton({ "text": "Filter" }) }} {{ govukButton({ "text": "Filter" }) }}
{% endcall %} {% endcall %}
app/templates/views/platform-admin/notifications_by_service.html
+2 -2
View File
@@ -12,8 +12,8 @@
</h1> </h1>
{% call form_wrapper() %} {% call form_wrapper() %}
{{ textbox(form.start_date, hint="Enter start date in format YYYY-MM-DD") }} {{ form.start_date(param_extensions={"hint": {"text": "Enter start date in format YYYY-MM-DD"}}) }}
{{ textbox(form.end_date, hint="Enter end date in format YYYY-MM-DD") }} {{ form.end_date(param_extensions={"hint": {"text": "Enter end date in format YYYY-MM-DD"}}) }}
{{ page_footer('Download report') }} {{ page_footer('Download report') }}
{% endcall %} {% endcall %}
app/templates/views/platform-admin/services.html
+2 -2
View File
@@ -67,8 +67,8 @@
{% set details_content %} {% set details_content %}
{% call form_wrapper(method="get") %} {% call form_wrapper(method="get") %}
{{ textbox(form.start_date, hint="Enter start date in format YYYY-MM-DD") }} {{ form.start_date(param_extensions={"hint": {"text": "Enter start date in format YYYY-MM-DD"}}) }}
{{ textbox(form.end_date, hint="Enter end date in format YYYY-MM-DD") }} {{ form.end_date(param_extensions={"hint": {"text": "Enter end date in format YYYY-MM-DD"}}) }}
{{ form.include_from_test_key }} {{ form.include_from_test_key }}
{{ govukButton({ "text": "Filter" }) }} {{ govukButton({ "text": "Filter" }) }}
{% endcall %} {% endcall %}
app/templates/views/platform-admin/usage_for_all_services.html
+3 -3
View File
@@ -12,9 +12,9 @@
</h1> </h1>
{% call form_wrapper() %} {% call form_wrapper() %}
{{ textbox(form.start_date, hint="Enter start date in format YYYY-MM-DD") }} {{ form.start_date(param_extensions={"hint": {"text": "Enter start date in format YYYY-MM-DD"}}) }}
{{ textbox(form.end_date, hint="Enter end date in format YYYY-MM-DD") }} {{ form.end_date(param_extensions={"hint": {"text": "Enter end date in format YYYY-MM-DD"}}) }}
{{ page_footer('Download report') }} {{ page_footer('Download report') }}
{% endcall %} {% endcall %}
{% endblock %} {% endblock %}
tests/app/main/views/test_platform_admin.py
+5 -5
View File
@@ -828,11 +828,11 @@ def test_get_notifications_sent_by_service_shows_date_form(client_request, platf
page = client_request.get('main.notifications_sent_by_service') page = client_request.get('main.notifications_sent_by_service')
assert [ assert [
(input['type'], input['name'], input['value']) (input['type'], input['name'], input.get('value'))
for input in page.select('input') for input in page.select('input')
] == [ ] == [
('text', 'start_date', ''), ('text', 'start_date', None),
('text', 'end_date', ''), ('text', 'end_date', None),
('hidden', 'csrf_token', ANY) ('hidden', 'csrf_token', ANY)
] ]
@@ -848,11 +848,11 @@ def test_get_notifications_sent_by_service_validates_form(mocker, client_request
_data={'start_date': '', 'end_date': '20190101'} _data={'start_date': '', 'end_date': '20190101'}
) )
errors = page.select('.error-message') errors = page.select('.govuk-error-message')
assert len(errors) == 2 assert len(errors) == 2
for error in errors: for error in errors:
assert normalize_spaces(error.text) == 'Not a valid date value' assert 'Not a valid date value' in error.text
mock_get_stats_from_api.assert_not_called() mock_get_stats_from_api.assert_not_called()