diff --git a/app/models/form/lettings/pages/rent_4_weekly.rb b/app/models/form/lettings/pages/rent_4_weekly.rb index f0919dd3f..e771060e6 100644 --- a/app/models/form/lettings/pages/rent_4_weekly.rb +++ b/app/models/form/lettings/pages/rent_4_weekly.rb @@ -8,6 +8,6 @@ class Form::Lettings::Pages::Rent4Weekly < ::Form::Page end def questions - @questions ||= [Form::Lettings::Questions::Brent.new(nil, nil, self), Form::Lettings::Questions::Scharge.new(nil, nil, self), Form::Lettings::Questions::Pscharge.new(nil, nil, self), Form::Lettings::Questions::Supcharg.new(nil, nil, self), Form::Lettings::Questions::Tcharge.new(nil, nil, self)] + @questions ||= [Form::Lettings::Questions::Brent4Weekly.new(nil, nil, self), Form::Lettings::Questions::Scharge.new(nil, nil, self), Form::Lettings::Questions::Pscharge.new(nil, nil, self), Form::Lettings::Questions::Supcharg.new(nil, nil, self), Form::Lettings::Questions::Tcharge.new(nil, nil, self)] end end diff --git a/app/models/form/lettings/pages/rent_bi_weekly.rb b/app/models/form/lettings/pages/rent_bi_weekly.rb index 28e3e6a56..6ff0a5301 100644 --- a/app/models/form/lettings/pages/rent_bi_weekly.rb +++ b/app/models/form/lettings/pages/rent_bi_weekly.rb @@ -8,6 +8,6 @@ class Form::Lettings::Pages::RentBiWeekly < ::Form::Page end def questions - @questions ||= [Form::Lettings::Questions::Brent.new(nil, nil, self), Form::Lettings::Questions::Scharge.new(nil, nil, self), Form::Lettings::Questions::Pscharge.new(nil, nil, self), Form::Lettings::Questions::Supcharg.new(nil, nil, self), Form::Lettings::Questions::Tcharge.new(nil, nil, self)] + @questions ||= [Form::Lettings::Questions::BrentBiWeekly.new(nil, nil, self), Form::Lettings::Questions::Scharge.new(nil, nil, self), Form::Lettings::Questions::Pscharge.new(nil, nil, self), Form::Lettings::Questions::Supcharg.new(nil, nil, self), Form::Lettings::Questions::Tcharge.new(nil, nil, self)] end end diff --git a/app/models/form/lettings/pages/rent_monthly.rb b/app/models/form/lettings/pages/rent_monthly.rb index f282b67c1..7671ee62a 100644 --- a/app/models/form/lettings/pages/rent_monthly.rb +++ b/app/models/form/lettings/pages/rent_monthly.rb @@ -8,6 +8,6 @@ class Form::Lettings::Pages::RentMonthly < ::Form::Page end def questions - @questions ||= [Form::Lettings::Questions::Brent.new(nil, nil, self), Form::Lettings::Questions::Scharge.new(nil, nil, self), Form::Lettings::Questions::Pscharge.new(nil, nil, self), Form::Lettings::Questions::Supcharg.new(nil, nil, self), Form::Lettings::Questions::Tcharge.new(nil, nil, self)] + @questions ||= [Form::Lettings::Questions::BrentMonthly.new(nil, nil, self), Form::Lettings::Questions::Scharge.new(nil, nil, self), Form::Lettings::Questions::Pscharge.new(nil, nil, self), Form::Lettings::Questions::Supcharg.new(nil, nil, self), Form::Lettings::Questions::Tcharge.new(nil, nil, self)] end end diff --git a/app/models/form/lettings/pages/rent_weekly.rb b/app/models/form/lettings/pages/rent_weekly.rb index 59854c20d..08b4e55cd 100644 --- a/app/models/form/lettings/pages/rent_weekly.rb +++ b/app/models/form/lettings/pages/rent_weekly.rb @@ -8,6 +8,6 @@ class Form::Lettings::Pages::RentWeekly < ::Form::Page end def questions - @questions ||= [Form::Lettings::Questions::Brent.new(nil, nil, self), Form::Lettings::Questions::Scharge.new(nil, nil, self), Form::Lettings::Questions::Pscharge.new(nil, nil, self), Form::Lettings::Questions::Supcharg.new(nil, nil, self), Form::Lettings::Questions::Tcharge.new(nil, nil, self)] + @questions ||= [Form::Lettings::Questions::BrentWeekly.new(nil, nil, self), Form::Lettings::Questions::Scharge.new(nil, nil, self), Form::Lettings::Questions::Pscharge.new(nil, nil, self), Form::Lettings::Questions::Supcharg.new(nil, nil, self), Form::Lettings::Questions::Tcharge.new(nil, nil, self)] end end diff --git a/app/models/form/lettings/questions/brent_4_weekly.rb b/app/models/form/lettings/questions/brent_4_weekly.rb new file mode 100644 index 000000000..c7659dbd4 --- /dev/null +++ b/app/models/form/lettings/questions/brent_4_weekly.rb @@ -0,0 +1,19 @@ +class Form::Lettings::Questions::Brent4Weekly < ::Form::Question + def initialize(id, hsh, page) + super + @id = "brent" + @check_answer_label = "Basic rent" + @header = "What is the basic rent?" + @type = "numeric" + @width = 5 + @check_answers_card_number = 0 + @min = 0 + @hint_text = "This is the amount paid before any charges are added for services (for example, hot water or cleaning). Households may receive housing benefit or Universal Credit towards basic rent." + @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/brent_bi_weekly.rb b/app/models/form/lettings/questions/brent_bi_weekly.rb new file mode 100644 index 000000000..7b1e1d04e --- /dev/null +++ b/app/models/form/lettings/questions/brent_bi_weekly.rb @@ -0,0 +1,19 @@ +class Form::Lettings::Questions::BrentBiWeekly < ::Form::Question + def initialize(id, hsh, page) + super + @id = "brent" + @check_answer_label = "Basic rent" + @header = "What is the basic rent?" + @type = "numeric" + @width = 5 + @check_answers_card_number = 0 + @min = 0 + @hint_text = "This is the amount paid before any charges are added for services (for example, hot water or cleaning). Households may receive housing benefit or Universal Credit towards basic rent." + @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/brent.rb b/app/models/form/lettings/questions/brent_monthly.rb similarity index 90% rename from app/models/form/lettings/questions/brent.rb rename to app/models/form/lettings/questions/brent_monthly.rb index 20f239ccf..c58a21175 100644 --- a/app/models/form/lettings/questions/brent.rb +++ b/app/models/form/lettings/questions/brent_monthly.rb @@ -1,4 +1,4 @@ -class Form::Lettings::Questions::Brent < ::Form::Question +class Form::Lettings::Questions::BrentMonthly < ::Form::Question def initialize(id, hsh, page) super @id = "brent" diff --git a/app/models/form/lettings/questions/brent_weekly.rb b/app/models/form/lettings/questions/brent_weekly.rb new file mode 100644 index 000000000..0ea1f5359 --- /dev/null +++ b/app/models/form/lettings/questions/brent_weekly.rb @@ -0,0 +1,19 @@ +class Form::Lettings::Questions::BrentWeekly < ::Form::Question + def initialize(id, hsh, page) + super + @id = "brent" + @check_answer_label = "Basic rent" + @header = "What is the basic rent?" + @type = "numeric" + @width = 5 + @check_answers_card_number = 0 + @min = 0 + @hint_text = "This is the amount paid before any charges are added for services (for example, hot water or cleaning). Households may receive housing benefit or Universal Credit towards basic rent." + @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