Rachael Booth
5 months ago
46 changed files with 917 additions and 400 deletions
@ -0,0 +1,12 @@
|
||||
class Form::Lettings::Pages::PersonLeadPartner < ::Form::Page |
||||
def initialize(id, hsh, subsection, person_index:) |
||||
super(id, hsh, subsection) |
||||
@id = "person_#{person_index}_lead_partner" |
||||
@depends_on = [{ "details_known_#{person_index}" => 0 }] |
||||
@person_index = person_index |
||||
end |
||||
|
||||
def questions |
||||
@questions ||= [Form::Lettings::Questions::PersonPartner.new(nil, nil, self, person_index: @person_index)] |
||||
end |
||||
end |
||||
@ -0,0 +1,30 @@
|
||||
class Form::Lettings::Questions::PersonPartner < ::Form::Question |
||||
def initialize(id, hsh, page, person_index:) |
||||
super(id, hsh, page) |
||||
@id = "relat#{person_index}" |
||||
@type = "radio" |
||||
@check_answers_card_number = person_index |
||||
@answer_options = answer_options |
||||
@person_index = person_index |
||||
@question_number = question_number |
||||
end |
||||
|
||||
def answer_options |
||||
{ |
||||
"P" => { "value" => "Yes" }, |
||||
"X" => { "value" => "No" }, |
||||
"R" => { "value" => "Tenant prefers not to say" }, |
||||
} |
||||
end |
||||
|
||||
def question_number |
||||
base_question_number = case form.start_date.year |
||||
when 2023 |
||||
30 |
||||
else |
||||
29 |
||||
end |
||||
|
||||
base_question_number + (4 * @person_index) |
||||
end |
||||
end |
||||
@ -1,46 +0,0 @@
|
||||
<% content_for :before_content do %> |
||||
<%= govuk_back_link href: @form.back_path %> |
||||
<% end %> |
||||
|
||||
<div class="govuk-grid-row"> |
||||
<div class="govuk-grid-column-two-thirds"> |
||||
<%= form_with model: @form, scope: :form, url: bulk_upload_lettings_log_path(id: "prepare-your-file"), method: :patch do |f| %> |
||||
<%= f.hidden_field :year %> |
||||
|
||||
<span class="govuk-caption-l">Upload lettings logs in bulk (<%= @form.year_combo %>)</span> |
||||
<h1 class="govuk-heading-l">Prepare your file</h1> |
||||
<p class="govuk-body govuk-!-margin-bottom-2"><%= govuk_link_to "Read the full guidance", bulk_upload_lettings_log_path(id: "guidance", form: { year: @form.year }, referrer: "prepare-your-file") %> before you start if you have not used bulk upload before.</p> |
||||
|
||||
<h2 class="govuk-heading-s">Download template</h2> |
||||
|
||||
<p class="govuk-body govuk-!-margin-bottom-2">Use one of these templates to upload logs for 2023/24:</p> |
||||
<ul class="govuk-list govuk-list--bullet"> |
||||
<li> |
||||
<%= govuk_link_to "Download the new template", @form.template_path %>: In this template, the questions are in the same order as the 2023/24 paper form and web form. |
||||
</li> |
||||
</ul> |
||||
<p class="govuk-body govuk-!-margin-bottom-2">There are 7 or 8 rows of content in the templates. These rows are called the ‘headers’. They contain the CORE form questions and guidance about which questions are required and how to format your answers.</p> |
||||
|
||||
<h2 class="govuk-heading-s">Create your file</h2> |
||||
|
||||
<ul class="govuk-list govuk-list--bullet"> |
||||
<li>Fill in the template with data from your housing management system. Your data should go below the headers, with one row per log. Leave column A blank - the bulk upload fields start in column B.</li> |
||||
<li>Make sure each column of your data aligns with the matching headers above. You may need to reorder your data.</li> |
||||
<li>Use the <%= govuk_link_to "Lettings #{@form.year_combo} Bulk Upload Specification", @form.specification_path %> to check your data is in the correct format.</li> |
||||
<li><strong>Username field:</strong> To assign a log to someone else, enter the email address they use to log into CORE.</li> |
||||
<li>If you are using the new template, keep the headers. If you are using the legacy template, you can either keep or remove the headers. If you remove the headers, you should also remove the blank column A.</li> |
||||
</ul> |
||||
|
||||
<%= govuk_inset_text(text: "You can upload both general needs and supported housing logs in the same file for 2023 to 2024 data.") %> |
||||
|
||||
<h2 class="govuk-heading-s">Save your file</h2> |
||||
|
||||
<ul class="govuk-list govuk-list--bullet"> |
||||
<li>Save your file as a CSV.</li> |
||||
<li>Your file should now be ready to upload.</li> |
||||
</ul> |
||||
|
||||
<%= f.govuk_submit class: "govuk-!-margin-top-7" %> |
||||
<% end %> |
||||
</div> |
||||
</div> |
||||
@ -1,40 +0,0 @@
|
||||
<% content_for :before_content do %> |
||||
<%= govuk_back_link href: @form.back_path %> |
||||
<% end %> |
||||
|
||||
<div class="govuk-grid-row"> |
||||
<div class="govuk-grid-column-two-thirds"> |
||||
<%= form_with model: @form, scope: :form, url: bulk_upload_sales_log_path(id: "prepare-your-file"), method: :patch do |f| %> |
||||
<%= f.hidden_field :year %> |
||||
|
||||
<span class="govuk-caption-l">Upload sales logs in bulk (<%= @form.year_combo %>)</span> |
||||
<h1 class="govuk-heading-l">Prepare your file</h1> |
||||
<p class="govuk-body govuk-!-margin-bottom-2"><%= govuk_link_to "Read the full guidance", bulk_upload_sales_log_path(id: "guidance", form: { year: @form.year }, referrer: "prepare-your-file") %> before you start if you have not used bulk upload before.</p> |
||||
|
||||
<h2 class="govuk-heading-s">Download template</h2> |
||||
|
||||
<p class="govuk-body govuk-!-margin-bottom-2">Use one of these templates to upload logs for 2023/24:</p> |
||||
<ul class="govuk-list govuk-list--bullet"> |
||||
<li><%= govuk_link_to "Download the new template", @form.template_path %>: In this template, the questions are in the same order as the 2023/24 paper form and web form.</li> |
||||
</ul> |
||||
<p class="govuk-body govuk-!-margin-bottom-2">There are 7 or 8 rows of content in the templates. These rows are called the ‘headers’. They contain the CORE form questions and guidance about which questions are required and how to format your answers.</p> |
||||
|
||||
<h2 class="govuk-heading-s">Create your file</h2> |
||||
<ul class="govuk-list govuk-list--bullet"> |
||||
<li>Fill in the template with data from your housing management system. Your data should go below the headers, with one row per log. The bulk upload fields start at column B. Leave column A blank.</li> |
||||
<li>Make sure each column of your data aligns with the matching headers above. You may need to reorder your data.</li> |
||||
<li>Use the <%= govuk_link_to "Sales #{@form.year_combo} Bulk Upload Specification", @form.specification_path %> to check your data is in the correct format.</li> |
||||
<li><strong>Username field:</strong> To assign a log to someone else, enter the email address they use to log into CORE.</li> |
||||
<li>If you are using the new template, keep the headers. If you are using the legacy template, you can either keep or remove the headers. If you remove the headers, you should also remove the blank column A.</li> |
||||
</ul> |
||||
|
||||
<h2 class="govuk-heading-s">Save your file</h2> |
||||
<ul class="govuk-list govuk-list--bullet"> |
||||
<li>Save your file as a CSV.</li> |
||||
<li>Your file should now be ready to upload.</li> |
||||
</ul> |
||||
|
||||
<%= f.govuk_submit %> |
||||
<% end %> |
||||
</div> |
||||
</div> |
||||
@ -0,0 +1,51 @@
|
||||
require "rails_helper" |
||||
|
||||
RSpec.describe Form::Lettings::Pages::PersonLeadPartner, type: :model do |
||||
subject(:page) { described_class.new(nil, page_definition, subsection, person_index:) } |
||||
|
||||
let(:page_definition) { nil } |
||||
let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2024, 4, 1), start_year_2025_or_later?: true)) } |
||||
let(:person_index) { 2 } |
||||
|
||||
it "has correct subsection" do |
||||
expect(page.subsection).to eq(subsection) |
||||
end |
||||
|
||||
it "has the correct description" do |
||||
expect(page.description).to be nil |
||||
end |
||||
|
||||
context "with person 2" do |
||||
it "has correct questions" do |
||||
expect(page.questions.map(&:id)).to eq(%w[relat2]) |
||||
end |
||||
|
||||
it "has the correct id" do |
||||
expect(page.id).to eq("person_2_lead_partner") |
||||
end |
||||
|
||||
it "has correct depends_on" do |
||||
expect(page.depends_on).to eq( |
||||
[{ "details_known_2" => 0 }], |
||||
) |
||||
end |
||||
end |
||||
|
||||
context "with person 3" do |
||||
let(:person_index) { 3 } |
||||
|
||||
it "has correct questions" do |
||||
expect(page.questions.map(&:id)).to eq(%w[relat3]) |
||||
end |
||||
|
||||
it "has the correct id" do |
||||
expect(page.id).to eq("person_3_lead_partner") |
||||
end |
||||
|
||||
it "has correct depends_on" do |
||||
expect(page.depends_on).to eq( |
||||
[{ "details_known_3" => 0 }], |
||||
) |
||||
end |
||||
end |
||||
end |
||||
@ -0,0 +1,44 @@
|
||||
require "rails_helper" |
||||
|
||||
RSpec.describe Form::Lettings::Pages::Rent4Weekly, type: :model do |
||||
subject(:page) { described_class.new(nil, page_definition, subsection) } |
||||
|
||||
let(:page_definition) { nil } |
||||
let(:start_date) { Time.zone.local(2024, 4, 1) } |
||||
let(:start_year_2025_or_later) { false } |
||||
let(:form) { instance_double(Form, start_date:) } |
||||
let(:subsection) { instance_double(Form::Subsection, form:) } |
||||
let(:person_index) { 2 } |
||||
|
||||
before do |
||||
allow(form).to receive(:start_year_2025_or_later?).and_return(start_year_2025_or_later) |
||||
end |
||||
|
||||
context "with form before 2025" do |
||||
let(:start_date) { Time.zone.local(2024, 4, 1) } |
||||
let(:start_year_2025_or_later) { false } |
||||
|
||||
it "has correct depends_on" do |
||||
expect(page.depends_on).to eq( |
||||
[ |
||||
{ "rent_and_charges_paid_every_4_weeks?" => true, "household_charge" => 0, "is_carehome?" => false }, |
||||
{ "rent_and_charges_paid_every_4_weeks?" => true, "household_charge" => nil, "is_carehome?" => false }, |
||||
], |
||||
) |
||||
end |
||||
end |
||||
|
||||
context "with form on or after 2025" do |
||||
let(:start_date) { Time.zone.local(2025, 4, 1) } |
||||
let(:start_year_2025_or_later) { true } |
||||
|
||||
it "has correct depends_on" do |
||||
expect(page.depends_on).to eq( |
||||
[ |
||||
{ "rent_and_charges_paid_every_4_weeks?" => true, "household_charge" => 0 }, |
||||
{ "rent_and_charges_paid_every_4_weeks?" => true, "household_charge" => nil }, |
||||
], |
||||
) |
||||
end |
||||
end |
||||
end |
||||
@ -0,0 +1,44 @@
|
||||
require "rails_helper" |
||||
|
||||
RSpec.describe Form::Lettings::Pages::RentBiWeekly, type: :model do |
||||
subject(:page) { described_class.new(nil, page_definition, subsection) } |
||||
|
||||
let(:page_definition) { nil } |
||||
let(:start_date) { Time.zone.local(2024, 4, 1) } |
||||
let(:start_year_2025_or_later) { false } |
||||
let(:form) { instance_double(Form, start_date:) } |
||||
let(:subsection) { instance_double(Form::Subsection, form:) } |
||||
let(:person_index) { 2 } |
||||
|
||||
before do |
||||
allow(form).to receive(:start_year_2025_or_later?).and_return(start_year_2025_or_later) |
||||
end |
||||
|
||||
context "with form before 2025" do |
||||
let(:start_date) { Time.zone.local(2024, 4, 1) } |
||||
let(:start_year_2025_or_later) { false } |
||||
|
||||
it "has correct depends_on" do |
||||
expect(page.depends_on).to eq( |
||||
[ |
||||
{ "rent_and_charges_paid_every_2_weeks?" => true, "household_charge" => nil, "is_carehome?" => false }, |
||||
{ "rent_and_charges_paid_every_2_weeks?" => true, "household_charge" => 0, "is_carehome?" => false }, |
||||
], |
||||
) |
||||
end |
||||
end |
||||
|
||||
context "with form on or after 2025" do |
||||
let(:start_date) { Time.zone.local(2025, 4, 1) } |
||||
let(:start_year_2025_or_later) { true } |
||||
|
||||
it "has correct depends_on" do |
||||
expect(page.depends_on).to eq( |
||||
[ |
||||
{ "rent_and_charges_paid_every_2_weeks?" => true, "household_charge" => nil }, |
||||
{ "rent_and_charges_paid_every_2_weeks?" => true, "household_charge" => 0 }, |
||||
], |
||||
) |
||||
end |
||||
end |
||||
end |
||||
@ -0,0 +1,44 @@
|
||||
require "rails_helper" |
||||
|
||||
RSpec.describe Form::Lettings::Pages::RentMonthly, type: :model do |
||||
subject(:page) { described_class.new(nil, page_definition, subsection) } |
||||
|
||||
let(:page_definition) { nil } |
||||
let(:start_date) { Time.zone.local(2024, 4, 1) } |
||||
let(:start_year_2025_or_later) { false } |
||||
let(:form) { instance_double(Form, start_date:) } |
||||
let(:subsection) { instance_double(Form::Subsection, form:) } |
||||
let(:person_index) { 2 } |
||||
|
||||
before do |
||||
allow(form).to receive(:start_year_2025_or_later?).and_return(start_year_2025_or_later) |
||||
end |
||||
|
||||
context "with form before 2025" do |
||||
let(:start_date) { Time.zone.local(2024, 4, 1) } |
||||
let(:start_year_2025_or_later) { false } |
||||
|
||||
it "has correct depends_on" do |
||||
expect(page.depends_on).to eq( |
||||
[ |
||||
{ "rent_and_charges_paid_monthly?" => true, "household_charge" => nil, "is_carehome?" => false }, |
||||
{ "rent_and_charges_paid_monthly?" => true, "household_charge" => 0, "is_carehome?" => false }, |
||||
], |
||||
) |
||||
end |
||||
end |
||||
|
||||
context "with form on or after 2025" do |
||||
let(:start_date) { Time.zone.local(2025, 4, 1) } |
||||
let(:start_year_2025_or_later) { true } |
||||
|
||||
it "has correct depends_on" do |
||||
expect(page.depends_on).to eq( |
||||
[ |
||||
{ "rent_and_charges_paid_monthly?" => true, "household_charge" => nil }, |
||||
{ "rent_and_charges_paid_monthly?" => true, "household_charge" => 0 }, |
||||
], |
||||
) |
||||
end |
||||
end |
||||
end |
||||
@ -0,0 +1,44 @@
|
||||
require "rails_helper" |
||||
|
||||
RSpec.describe Form::Lettings::Pages::RentWeekly, type: :model do |
||||
subject(:page) { described_class.new(nil, page_definition, subsection) } |
||||
|
||||
let(:page_definition) { nil } |
||||
let(:start_date) { Time.zone.local(2024, 4, 1) } |
||||
let(:start_year_2025_or_later) { false } |
||||
let(:form) { instance_double(Form, start_date:) } |
||||
let(:subsection) { instance_double(Form::Subsection, form:) } |
||||
let(:person_index) { 2 } |
||||
|
||||
before do |
||||
allow(form).to receive(:start_year_2025_or_later?).and_return(start_year_2025_or_later) |
||||
end |
||||
|
||||
context "with form before 2025" do |
||||
let(:start_date) { Time.zone.local(2024, 4, 1) } |
||||
let(:start_year_2025_or_later) { false } |
||||
|
||||
it "has correct depends_on" do |
||||
expect(page.depends_on).to eq( |
||||
[ |
||||
{ "rent_and_charges_paid_weekly?" => true, "household_charge" => 0, "is_carehome?" => false }, |
||||
{ "rent_and_charges_paid_weekly?" => true, "household_charge" => nil, "is_carehome?" => false }, |
||||
], |
||||
) |
||||
end |
||||
end |
||||
|
||||
context "with form on or after 2025" do |
||||
let(:start_date) { Time.zone.local(2025, 4, 1) } |
||||
let(:start_year_2025_or_later) { true } |
||||
|
||||
it "has correct depends_on" do |
||||
expect(page.depends_on).to eq( |
||||
[ |
||||
{ "rent_and_charges_paid_weekly?" => true, "household_charge" => 0 }, |
||||
{ "rent_and_charges_paid_weekly?" => true, "household_charge" => nil }, |
||||
], |
||||
) |
||||
end |
||||
end |
||||
end |
||||
@ -0,0 +1,57 @@
|
||||
require "rails_helper" |
||||
|
||||
RSpec.describe Form::Lettings::Questions::PersonPartner, type: :model do |
||||
subject(:question) { described_class.new(nil, question_definition, page, person_index:) } |
||||
|
||||
let(:question_definition) { nil } |
||||
let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2025, 4, 4), start_year_2025_or_later?: true))) } |
||||
let(:person_index) { 2 } |
||||
|
||||
it "has correct page" do |
||||
expect(question.page).to eq(page) |
||||
end |
||||
|
||||
it "has the correct type" do |
||||
expect(question.type).to eq("radio") |
||||
end |
||||
|
||||
it "is not marked as derived" do |
||||
expect(question.derived?(nil)).to be false |
||||
end |
||||
|
||||
it "has the correct answer_options" do |
||||
expect(question.answer_options).to eq("P" => { "value" => "Yes" }, |
||||
"X" => { "value" => "No" }, |
||||
"R" => { "value" => "Tenant prefers not to say" }) |
||||
end |
||||
|
||||
it "has correct conditional for" do |
||||
expect(question.conditional_for).to be nil |
||||
end |
||||
|
||||
it "has the correct hidden_in_check_answers" do |
||||
expect(question.hidden_in_check_answers).to be nil |
||||
end |
||||
|
||||
context "with person 2" do |
||||
it "has the correct id" do |
||||
expect(question.id).to eq("relat2") |
||||
end |
||||
|
||||
it "has the correct check_answers_card_number" do |
||||
expect(question.check_answers_card_number).to eq(2) |
||||
end |
||||
end |
||||
|
||||
context "with person 3" do |
||||
let(:person_index) { 3 } |
||||
|
||||
it "has the correct id" do |
||||
expect(question.id).to eq("relat3") |
||||
end |
||||
|
||||
it "has the correct check_answers_card_number" do |
||||
expect(question.check_answers_card_number).to eq(3) |
||||
end |
||||
end |
||||
end |
||||
Loading…
Reference in new issue