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

Convert radios on add nhs local org page (basic)

Browse Source
This commit is contained in:
Tom Byers
2020-06-25 16:37:07 +01:00
parent 52929d835d
commit 6aaa4d906b
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/main/forms.py
View File

@@ -1157,7 +1157,7 @@ class AddNHSLocalOrganisationForm(StripWhitespaceForm):
super().__init__(*args, **kwargs) super().__init__(*args, **kwargs)
self.organisations.choices = organisation_choices self.organisations.choices = organisation_choices
organisations = RadioField( organisations = GovukRadiosField(
'Which NHS Trust or Clinical Commissioning Group do you work for?', 'Which NHS Trust or Clinical Commissioning Group do you work for?',
thing='an NHS Trust or Clinical Commissioning Group' thing='an NHS Trust or Clinical Commissioning Group'
) )

5
app/templates/views/organisations/add-nhs-local-organisation.html
View File

@@ -1,7 +1,6 @@
{% extends "withnav_template.html" %} {% extends "withnav_template.html" %}
{% from "components/page-header.html" import page_header %} {% from "components/page-header.html" import page_header %}
{% from "components/page-footer.html" import sticky_page_footer %} {% from "components/page-footer.html" import sticky_page_footer %}
{% from "components/radios.html" import radios %}
{% from "components/live-search.html" import live_search %} {% from "components/live-search.html" import live_search %}
{% from "components/form.html" import form_wrapper %} {% from "components/form.html" import form_wrapper %}
@@ -21,13 +20,13 @@
{{ form.organisations.label.text }} {{ form.organisations.label.text }}
</p> </p>
{{ live_search( {{ live_search(
target_selector='.multiple-choice', target_selector='.govuk-radios__item',
show=True, show=True,
form=search_form, form=search_form,
label='Search by name', label='Search by name',
autofocus=True) autofocus=True)
}} }}
{{ radios(form.organisations, hide_legend=True) }} {{ form.organisations }}
{{ sticky_page_footer('Continue') }} {{ sticky_page_footer('Continue') }}
{% endcall %} {% endcall %}
{% endblock %} {% endblock %}

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

@@ -261,14 +261,14 @@ def test_nhs_local_can_create_own_organisations(
'Which NHS Trust or Clinical Commissioning Group do you work for?' 'Which NHS Trust or Clinical Commissioning Group do you work for?'
) )
assert page.select_one('[data-module=live-search]')['data-targets'] == ( assert page.select_one('[data-module=live-search]')['data-targets'] == (
'.multiple-choice' '.govuk-radios__item'
) )
assert [ assert [
( (
normalize_spaces(radio.select_one('label').text), normalize_spaces(radio.select_one('label').text),
radio.select_one('input')['value'] radio.select_one('input')['value']
) )
for radio in page.select('.multiple-choice') for radio in page.select('.govuk-radios__item')
] == [ ] == [
('Trust 1', 't1'), ('Trust 1', 't1'),
('Trust 2', 't2'), ('Trust 2', 't2'),