Skip to content

Commit

Permalink
Merge pull request #2324 from DFE-Digital/suitability-design-updates
Browse files Browse the repository at this point in the history
Update suitability content
  • Loading branch information
thomasleese authored Jul 22, 2024
2 parents 18b08cc + 7a191da commit ebb5eae
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 10 deletions.
4 changes: 4 additions & 0 deletions app/assets/stylesheets/application.sass.scss
Original file line number Diff line number Diff line change
Expand Up @@ -84,3 +84,7 @@ ul.autocomplete__menu {
.app-background-inset-text {
background-color: #f3f2f1;
}

.app-float-right {
float: right !important;
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ def index
:application_forms,
).sort_by(&:name),
)

render layout: "full_from_desktop"
end

def new
Expand Down
2 changes: 1 addition & 1 deletion app/javascript/suitability_record_form.js
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ function SuitabilityRecordForm(params) {
).parentElement;

this.setUp(
"application reference number",
"application reference",
this.referenceAddButton,
this.referenceRemoveButtons,
this.referenceContainer,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
options_for_select(locations, @form.location),
options: { include_blank: true } %>

<%= f.govuk_date_field :date_of_birth, legend: { size: "s" }, maxlength_enabled: true, date_of_birth: true %>
<%= f.govuk_date_field :date_of_birth, legend: { size: nil }, maxlength_enabled: true, date_of_birth: true %>

<div id="app-emails">
<% if @form.emails.blank? %>
Expand All @@ -36,7 +36,7 @@
<% end %>
</div>

<%= govuk_button_link_to "Add another email", "#", id: "app-add-email-button", secondary: true %>
<%= govuk_button_link_to "Add another email address", "#", id: "app-add-email-button", secondary: true %>

<div id="app-references">
<% if @form.references.blank? %>
Expand All @@ -46,12 +46,12 @@
<%= f.govuk_text_field :references, multiple: true, value: %>

<% if index > 0 %>
<%= govuk_button_link_to "Remove alias", "#", class: "app-remove-reference-button", secondary: true %>
<%= govuk_button_link_to "Remove application reference", "#", class: "app-remove-reference-button", secondary: true %>
<% end %>
<% end %>
<% end %>
</div>

<%= govuk_button_link_to "Add another application reference number", "#", id: "app-add-reference-button", secondary: true %>
<%= govuk_button_link_to "Add another application reference", "#", id: "app-add-reference-button", secondary: true %>

<%= f.govuk_text_area :note %>
12 changes: 10 additions & 2 deletions app/views/assessor_interface/suitability_records/index.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,22 @@

<h1 class="govuk-heading-xl"><%= title %></h1>

<%= govuk_button_link_to "Add a new entry", %i[new assessor_interface suitability_record] %>
<%= govuk_button_link_to "Add a new record", %i[new assessor_interface suitability_record] %>

<% @records.each_with_index do |suitability_record, index| %>
<% unless index.zero? %>
<hr class="govuk-section-break govuk-section-break--m govuk-section-break--visible govuk-!-margin-top-9 govuk-!-margin-bottom-9" />
<div class="govuk-!-padding-bottom-3"></div>
<hr class="govuk-section-break govuk-section-break--m govuk-section-break--visible" />
<div class="govuk-!-padding-bottom-4"></div>
<% end %>

<article>
<ul class="govuk-summary-card__actions app-float-right">
<li class="govuk-summary-card__action">
<%= govuk_link_to "Change", [:edit, :assessor_interface, suitability_record] %>
</li>
</ul>

<h2 class="govuk-heading-m"><%= govuk_link_to suitability_record.name, [:edit, :assessor_interface, suitability_record] %></h2>

<%= govuk_summary_list(actions: false) do |summary_list|
Expand Down
6 changes: 3 additions & 3 deletions config/locales/helpers.en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ en:
given_names: Type the updated given names in the text box below
family_name: Type the updated family name in the text box below
assessor_interface_archive_suitability_record_form:
note: "Internal note: Briefly explain why this suitability record is being archived."
note: "Internal note: Briefly explain why you have archived this suitability record."
assessor_interface_assessment_section_form:
selected_failure_reasons: Select all options that are relevant to you.
failure_reason_notes:
Expand All @@ -20,7 +20,7 @@ en:
assessor_interface_filter_form:
reference: "Example: 210245"
assessor_interface_suitability_record_form:
note: "Internal note: Briefly explain why this suitability record has been created."
note: "Internal note: Briefly explain why you have created this suitability record."
assessor_interface_work_history_contact_form:
name: Type the updated full name in the text box below
job: Type the updated job title in the text box below
Expand Down Expand Up @@ -149,7 +149,7 @@ en:
emails: Email address (optional)
location: Country trained in
note: Suitability reasons
references: Application reference number (optional)
references: Application reference (optional)
assessor_interface_verify_professional_standing_form:
verify_professional_standing_options:
true: Yes, verify LoPS
Expand Down

0 comments on commit ebb5eae

Please sign in to comment.