Skip to content

Commit

Permalink
Downcase Number
Browse files Browse the repository at this point in the history
  • Loading branch information
inulty-dfe committed Nov 27, 2024
1 parent 8ba9e69 commit 7f190c0
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion app/components/providers/provider_list/view.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

if @provider.accredited_provider?
component.with_row do |row|
row.with_key { "Accredited provider Number" }
row.with_key { "Accredited provider number" }
row.with_value { value_provided?(@provider.accredited_provider_number.to_s) }
row.with_action(text: "Change", href: edit_support_recruitment_cycle_provider_path(@provider.recruitment_cycle_year, @provider), visually_hidden_text: "accredited provider id")
end
Expand Down
2 changes: 1 addition & 1 deletion app/views/support/providers/_list.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<tr class="govuk-table__row">
<th scope="col" class="govuk-table__header govuk-!-width-one-half">Provider name</th>
<th scope="col" class="govuk-table__header govuk-!-width-one-third">Provider code</th>
<th scope="col" class="govuk-table__header govuk-!-width-one-third">Accredited Provider Number</th>
<th scope="col" class="govuk-table__header govuk-!-width-one-third">Accredited provider number</th>
<th scope="col" class="govuk-table__header govuk-!-width-one-third">UKPRN</th>
</tr>
</thead>
Expand Down
2 changes: 1 addition & 1 deletion app/views/support/providers/edit.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<%= f.govuk_radio_buttons_fieldset :accrediting_provider, legend: { text: "Is the organisation an accredited provider?", size: "s" } do %>
<%= f.govuk_radio_button :accrediting_provider, :accredited_provider, label: { text: "Yes", size: "s" } do %>
<%= f.govuk_text_field :accredited_provider_number,
label: { text: "Accredited provider Number" },
label: { text: "Accredited provider number" },
width: 10 %>
<% end %>
<%= f.govuk_radio_button :accrediting_provider, :not_an_accredited_provider, label: { text: "No", size: "s" } %>
Expand Down
4 changes: 2 additions & 2 deletions app/views/support/providers/onboarding/checks/show.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@

if @provider_form.accredited_provider?
component.with_row do |row|
row.with_key { "Accredited provider Number" }
row.with_key { "Accredited provider number" }
row.with_value { @provider_form.accredited_provider_number }
row.with_action(text: "Change", href: new_support_recruitment_cycle_providers_onboarding_path(goto_confirmation: true), visually_hidden_text: "accredited provider Number")
row.with_action(text: "Change", href: new_support_recruitment_cycle_providers_onboarding_path(goto_confirmation: true), visually_hidden_text: "accredited provider number")
end
end

Expand Down
2 changes: 1 addition & 1 deletion app/views/support/providers/onboardings/new.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<%= f.govuk_radio_button :accredited_provider, :accredited_provider, label: { text: "Yes" }, link_errors: true do %>
<%= f.govuk_text_field :accredited_provider_number,
width: 10,
label: { text: "Accredited provider Number" },
label: { text: "Accredited provider number" },
autocomplete: :disabled %>

<% end %>
Expand Down
8 changes: 4 additions & 4 deletions config/locales/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -902,8 +902,8 @@ en:
blank: Enter a UK provider reference number (UKPRN)
contains_eight_numbers_starting_with_one: Enter a valid UK provider reference number (UKPRN) - it must be 8 digits starting with a 1, like 12345678
accredited_provider_number:
blank: Enter the accredited provider Number
format: Enter a valid accredited provider Number - it must be 4 digits starting with a 1 or a 5
blank: Enter the accredited provider number
format: Enter a valid accredited provider number - it must be 4 digits starting with a 1 or a 5
organisation:
attributes:
name:
Expand Down Expand Up @@ -1093,8 +1093,8 @@ en:
blank: "Select a provider type"
school_is_an_invalid_accredited_provider: "Accredited provider cannot be a school"
accredited_provider_number:
blank: "Enter an accredited provider Number"
invalid: "Enter a valid accredited provider Number"
blank: "Enter an accredited provider number"
invalid: "Enter a valid accredited provider number"
urn:
blank: "Enter a unique reference number (URN)"
invalid: "Enter a valid unique reference number (URN)"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -159,12 +159,12 @@ def when_i_fill_in_a_valid_provider_details(provider_type:)
fill_in 'Unique reference number (URN)', with: '54321'
when :university
choose 'Yes'
fill_in 'Accredited provider Number', with: '1111'
fill_in 'Accredited provider number', with: '1111'

choose 'Higher education institution (HEI)'
when :scitt
choose 'Yes'
fill_in 'Accredited provider Number', with: '5555'
fill_in 'Accredited provider number', with: '5555'

choose 'School centred initial teacher training (SCITT)'
end
Expand Down Expand Up @@ -192,12 +192,12 @@ def and_the_provider_form_should_be_prefilled_with_the_provider_details(provider
expect(page).to have_field('Unique reference number (URN)', with: '54321')
when :university
expect(page).to have_checked_field('Yes')
expect(page).to have_field('Accredited provider Number', with: '1111')
expect(page).to have_field('Accredited provider number', with: '1111')

expect(page).to have_checked_field('Higher education institution (HEI)')
when :scitt
expect(page).to have_checked_field('Yes')
expect(page).to have_field('Accredited provider Number', with: '5555')
expect(page).to have_field('Accredited provider number', with: '5555')

expect(page).to have_checked_field('School centred initial teacher training (SCITT)')
end
Expand Down
6 changes: 3 additions & 3 deletions spec/forms/support/provider_form_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ module Support
{ accredited_provider: :accredited_provider }
end

include_examples 'blank validation', :accredited_provider_number, 'Enter an accredited provider Number'
include_examples 'blank validation', :accredited_provider_number, 'Enter an accredited provider number'
end

context 'urn set to invalid' do
Expand Down Expand Up @@ -208,15 +208,15 @@ module Support
end
end

blank_accredited_provider_number_message = 'Enter an accredited provider Number'
blank_accredited_provider_number_message = 'Enter an accredited provider number'

[nil, ''].each do |blank_accredited_provider_number|
include_examples 'accredited provider number validation', nil, blank_accredited_provider_number, blank_accredited_provider_number_message
include_examples 'accredited provider number validation', :scitt, blank_accredited_provider_number, blank_accredited_provider_number_message
include_examples 'accredited provider number validation', :university, blank_accredited_provider_number, blank_accredited_provider_number_message
end

invalid_accredited_provider_number_message = 'Enter a valid accredited provider Number'
invalid_accredited_provider_number_message = 'Enter a valid accredited provider number'

%w[a aaaa 12345 54321 abcde 1 5].each do |invalid_accredited_provider_number|
include_examples 'accredited provider number validation', nil, invalid_accredited_provider_number, invalid_accredited_provider_number_message
Expand Down

0 comments on commit 7f190c0

Please sign in to comment.