natdeanlewissoftwire
2 years ago
63 changed files with 1489 additions and 514 deletions
@ -0,0 +1,35 @@ |
|||||||
|
class Form::Sales::Pages::Buyer2IncomeValueCheck < ::Form::Page |
||||||
|
def initialize(id, hsh, subsection) |
||||||
|
super |
||||||
|
@header = "" |
||||||
|
@description = "" |
||||||
|
@subsection = subsection |
||||||
|
@depends_on = [ |
||||||
|
{ |
||||||
|
"income2_under_soft_min?" => true, |
||||||
|
}, |
||||||
|
] |
||||||
|
@title_text = { |
||||||
|
"translation" => "soft_validations.income.under_soft_min_for_economic_status", |
||||||
|
"arguments" => [ |
||||||
|
{ |
||||||
|
"key" => "field_formatted_as_currency", |
||||||
|
"arguments_for_key" => "income2", |
||||||
|
"i18n_template" => "income", |
||||||
|
}, |
||||||
|
{ |
||||||
|
"key" => "income_soft_min_for_ecstat", |
||||||
|
"arguments_for_key" => "ecstat2", |
||||||
|
"i18n_template" => "minimum", |
||||||
|
}, |
||||||
|
], |
||||||
|
} |
||||||
|
@informative_text = {} |
||||||
|
end |
||||||
|
|
||||||
|
def questions |
||||||
|
@questions ||= [ |
||||||
|
Form::Sales::Questions::Buyer2IncomeValueCheck.new(nil, nil, self), |
||||||
|
] |
||||||
|
end |
||||||
|
end |
||||||
@ -1,7 +1,14 @@ |
|||||||
class Form::Sales::Pages::LivingBeforePurchase < ::Form::Page |
class Form::Sales::Pages::LivingBeforePurchase < ::Form::Page |
||||||
def questions |
def questions |
||||||
@questions ||= [ |
@questions ||= [ |
||||||
Form::Sales::Questions::LivingBeforePurchase.new(nil, nil, self), |
living_before_purchase, |
||||||
] |
Form::Sales::Questions::LivingBeforePurchaseYears.new(nil, nil, self), |
||||||
|
].compact |
||||||
|
end |
||||||
|
|
||||||
|
def living_before_purchase |
||||||
|
if form.start_date.year >= 2023 |
||||||
|
Form::Sales::Questions::LivingBeforePurchase.new(nil, nil, self) |
||||||
|
end |
||||||
end |
end |
||||||
end |
end |
||||||
|
|||||||
@ -1,14 +0,0 @@ |
|||||||
class Form::Sales::Pages::PurchasePrice < ::Form::Page |
|
||||||
def initialize(id, hsh, subsection) |
|
||||||
super |
|
||||||
@depends_on = [ |
|
||||||
{ "ownershipsch" => 2, "rent_to_buy_full_ownership?" => false }, |
|
||||||
] |
|
||||||
end |
|
||||||
|
|
||||||
def questions |
|
||||||
@questions ||= [ |
|
||||||
Form::Sales::Questions::PurchasePrice.new(nil, nil, self), |
|
||||||
] |
|
||||||
end |
|
||||||
end |
|
||||||
@ -0,0 +1,25 @@ |
|||||||
|
class Form::Sales::Questions::Buyer2IncomeValueCheck < ::Form::Question |
||||||
|
def initialize(id, hsh, page) |
||||||
|
super |
||||||
|
@id = "income2_value_check" |
||||||
|
@check_answer_label = "Income confirmation" |
||||||
|
@header = "Are you sure this is correct?" |
||||||
|
@type = "interruption_screen" |
||||||
|
@answer_options = { |
||||||
|
"0" => { "value" => "Yes" }, |
||||||
|
"1" => { "value" => "No" }, |
||||||
|
} |
||||||
|
@hidden_in_check_answers = { |
||||||
|
"depends_on" => [ |
||||||
|
{ |
||||||
|
"income2_value_check" => 0, |
||||||
|
}, |
||||||
|
{ |
||||||
|
"income2_value_check" => 1, |
||||||
|
}, |
||||||
|
], |
||||||
|
} |
||||||
|
@check_answers_card_number = 2 |
||||||
|
@page = page |
||||||
|
end |
||||||
|
end |
||||||
@ -1,15 +1,26 @@ |
|||||||
class Form::Sales::Questions::LivingBeforePurchase < ::Form::Question |
class Form::Sales::Questions::LivingBeforePurchase < ::Form::Question |
||||||
def initialize(id, hsh, page) |
def initialize(id, hsh, page) |
||||||
super |
super |
||||||
@id = "proplen" |
@id = "proplen_asked" |
||||||
@check_answer_label = "Number of years living in the property before purchase" |
@check_answer_label = "Buyer lived in the property before purchasing" |
||||||
@header = "How long did the buyer(s) live in the property before purchase?" |
@header = "Did the buyer live in the property before purchasing it?" |
||||||
@hint_text = "You should round this up to the nearest year. If the buyers haven't been living in the property, enter '0'" |
@hint_text = nil |
||||||
@type = "numeric" |
@type = "radio" |
||||||
@min = 0 |
@answer_options = ANSWER_OPTIONS |
||||||
@max = 80 |
@conditional_for = { |
||||||
@step = 1 |
"proplen" => [0], |
||||||
@width = 5 |
} |
||||||
@suffix = " years" |
@hidden_in_check_answers = { |
||||||
|
"depends_on" => [ |
||||||
|
{ |
||||||
|
"proplen_asked" => 0, |
||||||
|
}, |
||||||
|
], |
||||||
|
} |
||||||
end |
end |
||||||
|
|
||||||
|
ANSWER_OPTIONS = { |
||||||
|
"0" => { "value" => "Yes" }, |
||||||
|
"1" => { "value" => "No" }, |
||||||
|
}.freeze |
||||||
end |
end |
||||||
|
|||||||
@ -0,0 +1,31 @@ |
|||||||
|
class Form::Sales::Questions::LivingBeforePurchaseYears < ::Form::Question |
||||||
|
def initialize(id, hsh, page) |
||||||
|
super |
||||||
|
@id = "proplen" |
||||||
|
@check_answer_label = "Number of years living in the property before purchase" |
||||||
|
@header = header_text |
||||||
|
@hint_text = hint_text |
||||||
|
@type = "numeric" |
||||||
|
@min = 0 |
||||||
|
@max = 80 |
||||||
|
@step = 1 |
||||||
|
@width = 5 |
||||||
|
@suffix = " years" |
||||||
|
end |
||||||
|
|
||||||
|
def header_text |
||||||
|
if form.start_date.year >= 2023 |
||||||
|
"How long did they live there?" |
||||||
|
else |
||||||
|
"How long did the buyer(s) live in the property before purchase?" |
||||||
|
end |
||||||
|
end |
||||||
|
|
||||||
|
def hint_text |
||||||
|
if form.start_date.year >= 2023 |
||||||
|
"You should round up to the nearest year" |
||||||
|
else |
||||||
|
"You should round this up to the nearest year. If the buyers haven't been living in the property, enter '0'" |
||||||
|
end |
||||||
|
end |
||||||
|
end |
||||||
@ -1,11 +1,45 @@ |
|||||||
module Validations::Sales::SetupValidations |
module Validations::Sales::SetupValidations |
||||||
include Validations::SharedValidations |
include Validations::SharedValidations |
||||||
|
include CollectionTimeHelper |
||||||
|
|
||||||
def validate_saledate(record) |
def validate_saledate(record) |
||||||
return unless record.saledate && date_valid?("saledate", record) |
return unless record.saledate && date_valid?("saledate", record) |
||||||
|
|
||||||
unless record.saledate.between?(Time.zone.local(2022, 4, 1), Time.zone.local(2023, 3, 31)) || !FeatureToggle.saledate_collection_window_validation_enabled? |
unless record.saledate.between?(active_collection_start_date, current_collection_end_date) || !FeatureToggle.saledate_collection_window_validation_enabled? |
||||||
record.errors.add :saledate, I18n.t("validations.setup.saledate.financial_year") |
record.errors.add :saledate, validation_error_message |
||||||
|
end |
||||||
|
end |
||||||
|
|
||||||
|
private |
||||||
|
|
||||||
|
def active_collection_start_date |
||||||
|
if FormHandler.instance.sales_in_crossover_period? |
||||||
|
previous_collection_start_date |
||||||
|
else |
||||||
|
current_collection_start_date |
||||||
|
end |
||||||
|
end |
||||||
|
|
||||||
|
def validation_error_message |
||||||
|
current_end_year_long = current_collection_end_date.strftime("#{current_collection_end_date.day.ordinalize} %B %Y") |
||||||
|
|
||||||
|
if FormHandler.instance.sales_in_crossover_period? |
||||||
|
I18n.t( |
||||||
|
"validations.setup.saledate.previous_and_current_financial_year", |
||||||
|
previous_start_year_short: previous_collection_start_date.strftime("%y"), |
||||||
|
previous_end_year_short: previous_collection_end_date.strftime("%y"), |
||||||
|
previous_start_year_long: previous_collection_start_date.strftime("#{previous_collection_start_date.day.ordinalize} %B %Y"), |
||||||
|
current_end_year_short: current_collection_end_date.strftime("%y"), |
||||||
|
current_end_year_long:, |
||||||
|
) |
||||||
|
else |
||||||
|
I18n.t( |
||||||
|
"validations.setup.saledate.current_financial_year", |
||||||
|
current_start_year_short: current_collection_start_date.strftime("%y"), |
||||||
|
current_end_year_short: current_collection_end_date.strftime("%y"), |
||||||
|
current_start_year_long: current_collection_start_date.strftime("#{current_collection_start_date.day.ordinalize} %B %Y"), |
||||||
|
current_end_year_long:, |
||||||
|
) |
||||||
end |
end |
||||||
end |
end |
||||||
end |
end |
||||||
|
|||||||
@ -1,46 +1,47 @@ |
|||||||
## How are we using your information? |
## How do we use your information? |
||||||
|
|
||||||
If your household has entered a new social housing tenancy, social housing providers will share your personal information with the Department for Levelling Up, Housing & Communities (DLUHC) for research and statistical purposes. |
If your household enters a new social housing tenancy or purchases a social housing property, social housing providers will share your personal information with the Department for Levelling Up, Housing & Communities (DLUHC) for research and statistical purposes only. |
||||||
|
|
||||||
## How is this information provided? |
## How do we get this information? |
||||||
|
|
||||||
The information is provided via ‘<%= t('service_name') %>’, a service funded and managed by DLUHC. It collects information on the tenants or buyers, tenancy or sale, and the dwelling itself. Some of this information is personal and sensitive, so DLUHC is responsible for ensuring that all data is processed in line with data protection legislation. |
The information is provided via ‘<%= t('service_name') %>’, a service funded and managed by DLUHC. It collects information on the tenants or residents, tenancy or sale, and the dwelling itself. Some of this data is personal and sensitive, so DLUHC is responsible for ensuring it’s processed in line with data protection legislation. |
||||||
|
|
||||||
## Why are we sharing this information? |
|
||||||
|
|
||||||
Information collected using this service is shared with other government departments and agencies. Data is shared with the Greater London Authority and the Regulator of Social Housing. Data providers can also access data for their organisations via the online service. Data is only shared for research and statistical purposes. |
## Why do we share this information? |
||||||
|
|
||||||
|
Information collected via CORE is shared with other government departments and agencies. It’s shared with the Greater London Authority and the Regulator of Social Housing. Data providers can also access data for their organisations via CORE. Data is only shared for research and statistical purposes. |
||||||
|
|
||||||
## How does this affect you? |
## How does this affect you? |
||||||
|
|
||||||
It will not affect your benefits, services or any treatments you receive. The information shared is anonymous and handled in accordance with the law. We are collecting and sharing your information to help us better understand the social housing market and inform social housing policy. |
Information sharing will not affect your benefits, services or any treatments you receive. It’s anonymous and handled in accordance with the law. We collect and share your information to help us better understand the social housing market and inform social housing policy. |
||||||
|
|
||||||
## If you want to know more |
## To find out more… |
||||||
|
|
||||||
Social housing lettings and sales data is collected on behalf of DLUHC for research and statistical purposes only. Data providers do not require the consent of tenants to provide the information, but tenants have the right to know how and for what purpose data is being collected, held and used. |
Social housing lettings and sales data is collected on DLUHC’s behalf. Data providers do not require the tenant or buyer’s consent to provide this information, but tenants and buyers have the right to know how and for what purpose data is being collected, held and used. |
||||||
|
|
||||||
The processing must have a lawful basis. In this case the processing is necessary for the performance of a task carried out in the public interest to meet a function of the Crown, a Minister of the Crown, or a government department. |
Data processing must have a lawful basis. In this case it’s necessary for a task carried out in the public interest meeting a function of the Crown, a Minister of the Crown, or government department. |
||||||
|
|
||||||
You have the right to object and you have the right to obtain confirmation that your data is being processed, and to access your personal data. You also have the right to have any incorrect personal data corrected. |
You have the right to object, and obtain confirmation that your data is being processed, as well as access your personal data, and have any incorrect personal data corrected. |
||||||
|
|
||||||
The information collected via this service relates to your tenancy, the dwelling you are living in or buying, and your household. Some of the information may have been provided by you as a tenant when signing the new tenancy or buying your property. Other information has been gathered from the housing management systems of social housing providers. |
Information collected via CORE relates to your tenancy, the dwelling you are living in or buying, and your household. Some information may have been provided by you (as a tenant or buyer) when signing the new tenancy or buying your property. Other information has been gathered from the housing management systems of social housing providers. |
||||||
|
|
||||||
Data collected will be held for as long as necessary for research and statistical purposes. When no longer needed, data will be deleted in a safe manner. We are aware that some of the data collected is particularly sensitive. For example: |
Collected data will be held for as long as necessary for research and statistical purposes. When no longer needed, data will be deleted in a safe manner. We’re aware some collected data is particularly sensitive. For example: |
||||||
|
|
||||||
* ethnic group |
* ethnic group |
||||||
* if previous tenure is a hospital or prison or approved probation hostel support |
* if previous tenure is a hospital, prison or approved probation hostel support |
||||||
* if household left last settled home because discharged from prison, a long stay hospital or other institution |
* if household left last settled home because discharged from prison, a long stay hospital or other institution |
||||||
* if source of referral is probation or prison, youth offending team, community mental health team or health service |
* if referral source is probation or prison, youth offending or community mental health team, or health service |
||||||
|
|
||||||
All the information collected via this service is treated in accordance with data protection requirements and guidelines. |
DLUHC publishes data annually, in aggregate form, as part of a report and complementary tables. |
||||||
|
|
||||||
Data is published by DLUHC in aggregate form on an annual basis as part of a report and complementary tables. |
* For annual lettings data, visit: [www.gov.uk/government/collections/rents-lettings-and-tenancies](www.gov.uk/government/collections/rents-lettings-and-tenancies) |
||||||
|
|
||||||
You can visit <www.gov.uk/government/collections/rents-lettings-and-tenancies> to access the annual publications on lettings. Or visit <gov.uk/government/collections/social-housing-sales-including-right-to-buy-and-transfers> to view the publications on sales. |
* For annual sales data, visit: [www.gov.uk/government/collections/social-housing-sales-including-right-to-buy-and-transfers](www.gov.uk/government/collections/social-housing-sales-including-right-to-buy-and-transfers) |
||||||
|
|
||||||
The detail level data is anonymised and protected to minimise the risk of identification and held with the UK Data Archive for research purposes. |
Detail-level data is anonymised and protected, minimising identification risk. It's held with the UK Data Archive. |
||||||
|
|
||||||
## Making a complaint |
## Complaints |
||||||
|
|
||||||
If you are unhappy with any aspect of this privacy notice, or how your personal information is being processed, contact the Department Data Protection Officer at: <dataprotection@communities.gsi.gov.uk> |
If you’re unhappy with any privacy notice aspect, or how we process your information, contact the Department Data Protection Officer: <dataprotection@communities.gsi.gov.uk> |
||||||
|
|
||||||
If you are still not happy, you have the right to lodge a complaint with the Information Commissioner’s Office (ICO) at [ico.org.uk/concern](https://ico.org.uk/concern). |
You also have the right to complain to the Information Commissioner’s Office (ICO): [www.ico.org.uk/concern](www.ico.org.uk/concern) |
||||||
|
|||||||
@ -0,0 +1,5 @@ |
|||||||
|
class AddIncome2ValueCheck < ActiveRecord::Migration[7.0] |
||||||
|
def change |
||||||
|
add_column :sales_logs, :income2_value_check, :integer |
||||||
|
end |
||||||
|
end |
||||||
@ -0,0 +1,5 @@ |
|||||||
|
class AddProplenAskedToSalesLog < ActiveRecord::Migration[7.0] |
||||||
|
def change |
||||||
|
add_column :sales_logs, :proplen_asked, :integer |
||||||
|
end |
||||||
|
end |
||||||
@ -1,35 +0,0 @@ |
|||||||
require "rails_helper" |
|
||||||
|
|
||||||
RSpec.describe Form::Sales::Pages::PurchasePrice, type: :model do |
|
||||||
subject(:page) { described_class.new(page_id, page_definition, subsection) } |
|
||||||
|
|
||||||
let(:page_id) { "purchase_price" } |
|
||||||
let(:page_definition) { nil } |
|
||||||
let(:subsection) { instance_double(Form::Subsection) } |
|
||||||
|
|
||||||
it "has correct subsection" do |
|
||||||
expect(page.subsection).to eq(subsection) |
|
||||||
end |
|
||||||
|
|
||||||
it "has correct questions" do |
|
||||||
expect(page.questions.map(&:id)).to eq(%w[value]) |
|
||||||
end |
|
||||||
|
|
||||||
it "has the correct id" do |
|
||||||
expect(page.id).to eq("purchase_price") |
|
||||||
end |
|
||||||
|
|
||||||
it "has the correct header" do |
|
||||||
expect(page.header).to be_nil |
|
||||||
end |
|
||||||
|
|
||||||
it "has the correct description" do |
|
||||||
expect(page.description).to be_nil |
|
||||||
end |
|
||||||
|
|
||||||
it "has correct depends_on" do |
|
||||||
expect(page.depends_on).to eq([ |
|
||||||
{ "ownershipsch" => 2, "rent_to_buy_full_ownership?" => false }, |
|
||||||
]) |
|
||||||
end |
|
||||||
end |
|
||||||
@ -0,0 +1,114 @@ |
|||||||
|
require "rails_helper" |
||||||
|
|
||||||
|
RSpec.describe Form::Sales::Questions::LivingBeforePurchaseYears, type: :model do |
||||||
|
subject(:question) { described_class.new(question_id, question_definition, page) } |
||||||
|
|
||||||
|
let(:question_id) { nil } |
||||||
|
let(:question_definition) { nil } |
||||||
|
let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_date:)) } |
||||||
|
let(:page) { instance_double(Form::Page, subsection:) } |
||||||
|
|
||||||
|
context "when 2022" do |
||||||
|
let(:start_date) { Time.utc(2022, 2, 8) } |
||||||
|
|
||||||
|
it "has correct page" do |
||||||
|
expect(question.page).to eq(page) |
||||||
|
end |
||||||
|
|
||||||
|
it "has the correct id" do |
||||||
|
expect(question.id).to eq("proplen") |
||||||
|
end |
||||||
|
|
||||||
|
it "has the correct header" do |
||||||
|
expect(question.header).to eq("How long did the buyer(s) live in the property before purchase?") |
||||||
|
end |
||||||
|
|
||||||
|
it "has the correct check_answer_label" do |
||||||
|
expect(question.check_answer_label).to eq("Number of years living in the property before purchase") |
||||||
|
end |
||||||
|
|
||||||
|
it "has the correct type" do |
||||||
|
expect(question.type).to eq("numeric") |
||||||
|
end |
||||||
|
|
||||||
|
it "is not marked as derived" do |
||||||
|
expect(question.derived?).to be false |
||||||
|
end |
||||||
|
|
||||||
|
it "has the correct hint" do |
||||||
|
expect(question.hint_text).to eq("You should round this up to the nearest year. If the buyers haven't been living in the property, enter '0'") |
||||||
|
end |
||||||
|
|
||||||
|
it "has correct width" do |
||||||
|
expect(question.width).to eq(5) |
||||||
|
end |
||||||
|
|
||||||
|
it "has correct step" do |
||||||
|
expect(question.step).to eq(1) |
||||||
|
end |
||||||
|
|
||||||
|
it "has correct suffix" do |
||||||
|
expect(question.suffix).to eq(" years") |
||||||
|
end |
||||||
|
|
||||||
|
it "has correct min" do |
||||||
|
expect(question.min).to eq(0) |
||||||
|
end |
||||||
|
|
||||||
|
it "has correct max" do |
||||||
|
expect(question.max).to eq(80) |
||||||
|
end |
||||||
|
end |
||||||
|
|
||||||
|
context "when 2023" do |
||||||
|
let(:start_date) { Time.utc(2023, 2, 8) } |
||||||
|
|
||||||
|
it "has correct page" do |
||||||
|
expect(question.page).to eq(page) |
||||||
|
end |
||||||
|
|
||||||
|
it "has the correct id" do |
||||||
|
expect(question.id).to eq("proplen") |
||||||
|
end |
||||||
|
|
||||||
|
it "has the correct header" do |
||||||
|
expect(question.header).to eq("How long did they live there?") |
||||||
|
end |
||||||
|
|
||||||
|
it "has the correct check_answer_label" do |
||||||
|
expect(question.check_answer_label).to eq("Number of years living in the property before purchase") |
||||||
|
end |
||||||
|
|
||||||
|
it "has the correct type" do |
||||||
|
expect(question.type).to eq("numeric") |
||||||
|
end |
||||||
|
|
||||||
|
it "is not marked as derived" do |
||||||
|
expect(question.derived?).to be false |
||||||
|
end |
||||||
|
|
||||||
|
it "has the correct hint" do |
||||||
|
expect(question.hint_text).to eq("You should round up to the nearest year") |
||||||
|
end |
||||||
|
|
||||||
|
it "has correct width" do |
||||||
|
expect(question.width).to eq(5) |
||||||
|
end |
||||||
|
|
||||||
|
it "has correct step" do |
||||||
|
expect(question.step).to eq(1) |
||||||
|
end |
||||||
|
|
||||||
|
it "has correct suffix" do |
||||||
|
expect(question.suffix).to eq(" years") |
||||||
|
end |
||||||
|
|
||||||
|
it "has correct min" do |
||||||
|
expect(question.min).to eq(0) |
||||||
|
end |
||||||
|
|
||||||
|
it "has correct max" do |
||||||
|
expect(question.max).to eq(80) |
||||||
|
end |
||||||
|
end |
||||||
|
end |
||||||
Loading…
Reference in new issue