diff --git a/app/models/form/lettings/pages/rent_4_weekly.rb b/app/models/form/lettings/pages/rent_4_weekly.rb index ac247f7ae..d659264d3 100644 --- a/app/models/form/lettings/pages/rent_4_weekly.rb +++ b/app/models/form/lettings/pages/rent_4_weekly.rb @@ -10,7 +10,7 @@ class Form::Lettings::Pages::Rent4Weekly < ::Form::Page def questions @questions ||= [Form::Lettings::Questions::Brent4Weekly.new(nil, nil, self), Form::Lettings::Questions::Scharge4Weekly.new(nil, nil, self), - Form::Lettings::Questions::Pscharge.new(nil, nil, self), + Form::Lettings::Questions::Pscharge4Weekly.new(nil, nil, self), Form::Lettings::Questions::Supcharg.new(nil, nil, self), Form::Lettings::Questions::Tcharge.new(nil, nil, self)] end diff --git a/app/models/form/lettings/pages/rent_bi_weekly.rb b/app/models/form/lettings/pages/rent_bi_weekly.rb index 60877fcfe..552d49f45 100644 --- a/app/models/form/lettings/pages/rent_bi_weekly.rb +++ b/app/models/form/lettings/pages/rent_bi_weekly.rb @@ -10,7 +10,7 @@ class Form::Lettings::Pages::RentBiWeekly < ::Form::Page def questions @questions ||= [Form::Lettings::Questions::BrentBiWeekly.new(nil, nil, self), Form::Lettings::Questions::SchargeBiWeekly.new(nil, nil, self), - Form::Lettings::Questions::Pscharge.new(nil, nil, self), + Form::Lettings::Questions::PschargeBiWeekly.new(nil, nil, self), Form::Lettings::Questions::Supcharg.new(nil, nil, self), Form::Lettings::Questions::Tcharge.new(nil, nil, self)] end diff --git a/app/models/form/lettings/pages/rent_monthly.rb b/app/models/form/lettings/pages/rent_monthly.rb index 3c1842b96..49e38fae5 100644 --- a/app/models/form/lettings/pages/rent_monthly.rb +++ b/app/models/form/lettings/pages/rent_monthly.rb @@ -10,7 +10,7 @@ class Form::Lettings::Pages::RentMonthly < ::Form::Page def questions @questions ||= [Form::Lettings::Questions::BrentMonthly.new(nil, nil, self), Form::Lettings::Questions::SchargeMonthly.new(nil, nil, self), - Form::Lettings::Questions::Pscharge.new(nil, nil, self), + Form::Lettings::Questions::PschargeMonthly.new(nil, nil, self), Form::Lettings::Questions::Supcharg.new(nil, nil, self), Form::Lettings::Questions::Tcharge.new(nil, nil, self)] end diff --git a/app/models/form/lettings/pages/rent_weekly.rb b/app/models/form/lettings/pages/rent_weekly.rb index c16e6c121..01c7104a7 100644 --- a/app/models/form/lettings/pages/rent_weekly.rb +++ b/app/models/form/lettings/pages/rent_weekly.rb @@ -10,7 +10,7 @@ class Form::Lettings::Pages::RentWeekly < ::Form::Page def questions @questions ||= [Form::Lettings::Questions::BrentWeekly.new(nil, nil, self), Form::Lettings::Questions::SchargeWeekly.new(nil, nil, self), - Form::Lettings::Questions::Pscharge.new(nil, nil, self), + Form::Lettings::Questions::PschargeWeekly.new(nil, nil, self), Form::Lettings::Questions::Supcharg.new(nil, nil, self), Form::Lettings::Questions::Tcharge.new(nil, nil, self)] end diff --git a/app/models/form/lettings/questions/pscharge_4_weekly.rb b/app/models/form/lettings/questions/pscharge_4_weekly.rb new file mode 100644 index 000000000..2242cd692 --- /dev/null +++ b/app/models/form/lettings/questions/pscharge_4_weekly.rb @@ -0,0 +1,19 @@ +class Form::Lettings::Questions::Pscharge4Weekly < ::Form::Question + def initialize(id, hsh, page) + super + @id = "pscharge" + @check_answer_label = "Personal service charge" + @header = "What is the personal service charge?" + @type = "numeric" + @width = 5 + @check_answers_card_number = 0 + @min = 0 + @hint_text = "For example, for heating or hot water. This doesn’t include housing benefit or Universal Credit." + @step = 0.01 + @fields_to_add = %w[brent scharge pscharge supcharg] + @result_field = "tcharge" + @hidden_in_check_answers = true + @prefix = "£" + @suffix = " every 4 weeks" + end +end diff --git a/app/models/form/lettings/questions/pscharge_bi_weekly.rb b/app/models/form/lettings/questions/pscharge_bi_weekly.rb new file mode 100644 index 000000000..7a7c89443 --- /dev/null +++ b/app/models/form/lettings/questions/pscharge_bi_weekly.rb @@ -0,0 +1,19 @@ +class Form::Lettings::Questions::PschargeBiWeekly < ::Form::Question + def initialize(id, hsh, page) + super + @id = "pscharge" + @check_answer_label = "Personal service charge" + @header = "What is the personal service charge?" + @type = "numeric" + @width = 5 + @check_answers_card_number = 0 + @min = 0 + @hint_text = "For example, for heating or hot water. This doesn’t include housing benefit or Universal Credit." + @step = 0.01 + @fields_to_add = %w[brent scharge pscharge supcharg] + @result_field = "tcharge" + @hidden_in_check_answers = true + @prefix = "£" + @suffix = " every 2 weeks" + end +end diff --git a/app/models/form/lettings/questions/pscharge.rb b/app/models/form/lettings/questions/pscharge_monthly.rb similarity index 89% rename from app/models/form/lettings/questions/pscharge.rb rename to app/models/form/lettings/questions/pscharge_monthly.rb index 811c69b90..6aa1ae911 100644 --- a/app/models/form/lettings/questions/pscharge.rb +++ b/app/models/form/lettings/questions/pscharge_monthly.rb @@ -1,4 +1,4 @@ -class Form::Lettings::Questions::Pscharge < ::Form::Question +class Form::Lettings::Questions::PschargeMonthly < ::Form::Question def initialize(id, hsh, page) super @id = "pscharge" diff --git a/app/models/form/lettings/questions/pscharge_weekly.rb b/app/models/form/lettings/questions/pscharge_weekly.rb new file mode 100644 index 000000000..73f3d9323 --- /dev/null +++ b/app/models/form/lettings/questions/pscharge_weekly.rb @@ -0,0 +1,19 @@ +class Form::Lettings::Questions::PschargeWeekly < ::Form::Question + def initialize(id, hsh, page) + super + @id = "pscharge" + @check_answer_label = "Personal service charge" + @header = "What is the personal service charge?" + @type = "numeric" + @width = 5 + @check_answers_card_number = 0 + @min = 0 + @hint_text = "For example, for heating or hot water. This doesn’t include housing benefit or Universal Credit." + @step = 0.01 + @fields_to_add = %w[brent scharge pscharge supcharg] + @result_field = "tcharge" + @hidden_in_check_answers = true + @prefix = "£" + @suffix = " every week" + end +end