Browse Source

feat: respond to pr comments

pull/944/head
natdeanlewissoftwire 3 years ago
parent
commit
1ad6d4f1d9
  1. 2
      app/views/form/headers/_person_2_known_page.erb
  2. 2
      app/views/form/headers/_person_3_known_page.erb
  3. 2
      app/views/form/headers/_person_4_known_page.erb
  4. 7
      app/views/form/page.html.erb
  5. 6
      db/schema.rb

2
app/views/form/headers/_person_2_known_page.erb

@ -1 +1 @@
You have given us the details for 1 of the <%= hholdcount %> other people in the household You have given us the details for 1 of the <%= log.hholdcount %> other people in the household

2
app/views/form/headers/_person_3_known_page.erb

@ -1 +1 @@
You have given us the details for 2 of the <%= hholdcount %> other people in the household You have given us the details for 2 of the <%= log.hholdcount %> other people in the household

2
app/views/form/headers/_person_4_known_page.erb

@ -1 +1 @@
You have given us the details for 3 of the <%= hholdcount %> other people in the household You have given us the details for 3 of the <%= log.hholdcount %> other people in the household

7
app/views/form/page.html.erb

@ -17,9 +17,10 @@
<span class="govuk-caption-l"><%= @subsection.label %></span> <span class="govuk-caption-l"><%= @subsection.label %></span>
<% end %> <% end %>
<% if @page.header_partial.present? %> <% if @page.header_partial.present? %>
<% @page.header = render partial: "form/headers/#{@page.header_partial}", locals: { hholdcount: @log.hholdcount } %> <%= render partial: "form/headers/#{@page.header_partial}", locals: { log: @log} %>
<% else %>
<%= @page.header %>
<% end %> <% end %>
<%= @page.header %>
</h1> </h1>
<% end %> <% end %>
@ -35,7 +36,7 @@
<% if question.type == "interruption_screen" %> <% if question.type == "interruption_screen" %>
<%= render partial: "form/#{question.type}_question", locals: { question:, caption_text: @subsection.label, page_header: @page.header, lettings_log: @log, title_text: @page.title_text, informative_text: @page.informative_text, form: @form, f:, conditional: false } %> <%= render partial: "form/#{question.type}_question", locals: { question:, caption_text: @subsection.label, page_header: @page.header, lettings_log: @log, title_text: @page.title_text, informative_text: @page.informative_text, form: @form, f:, conditional: false } %>
<% else %> <% else %>
<%= render partial: "form/#{question.type}_question", locals: { question:, caption_text: @subsection.label, page_header: @page.header, lettings_log: @log, f:, conditional: false } %> <%= render partial: "form/#{question.type}_question", locals: { question:, caption_text: @page.header_partial.present? ? nil : @subsection.label, page_header: @page.header, lettings_log: @log, f:, conditional: false } %>
<% end %> <% end %>
</div> </div>
<% end %> <% end %>

6
db/schema.rb

@ -359,9 +359,6 @@ ActiveRecord::Schema[7.0].define(version: 2022_10_19_082625) do
t.integer "hholdcount" t.integer "hholdcount"
t.integer "age3" t.integer "age3"
t.integer "age3_known" t.integer "age3_known"
t.integer "details_known_2"
t.integer "details_known_3"
t.integer "details_known_4"
t.integer "age4" t.integer "age4"
t.integer "age4_known" t.integer "age4_known"
t.integer "age5" t.integer "age5"
@ -372,6 +369,9 @@ ActiveRecord::Schema[7.0].define(version: 2022_10_19_082625) do
t.integer "la_known" t.integer "la_known"
t.integer "income1" t.integer "income1"
t.integer "income1nk" t.integer "income1nk"
t.integer "details_known_2"
t.integer "details_known_3"
t.integer "details_known_4"
t.index ["created_by_id"], name: "index_sales_logs_on_created_by_id" t.index ["created_by_id"], name: "index_sales_logs_on_created_by_id"
t.index ["managing_organisation_id"], name: "index_sales_logs_on_managing_organisation_id" t.index ["managing_organisation_id"], name: "index_sales_logs_on_managing_organisation_id"
t.index ["owning_organisation_id"], name: "index_sales_logs_on_owning_organisation_id" t.index ["owning_organisation_id"], name: "index_sales_logs_on_owning_organisation_id"

Loading…
Cancel
Save