From 05d389444de2fe1e5c09300cd37e443b3e6a0142 Mon Sep 17 00:00:00 2001 From: Kat Date: Wed, 1 Feb 2023 13:12:44 +0000 Subject: [PATCH] Backfill scharge --- .../form/lettings/pages/rent_4_weekly.rb | 6 +++++- .../form/lettings/pages/rent_bi_weekly.rb | 6 +++++- .../form/lettings/pages/rent_monthly.rb | 6 +++++- app/models/form/lettings/pages/rent_weekly.rb | 6 +++++- .../lettings/questions/scharge_4_weekly.rb | 19 +++++++++++++++++++ .../lettings/questions/scharge_bi_weekly.rb | 19 +++++++++++++++++++ .../{scharge.rb => scharge_monthly.rb} | 2 +- .../form/lettings/questions/scharge_weekly.rb | 19 +++++++++++++++++++ 8 files changed, 78 insertions(+), 5 deletions(-) create mode 100644 app/models/form/lettings/questions/scharge_4_weekly.rb create mode 100644 app/models/form/lettings/questions/scharge_bi_weekly.rb rename app/models/form/lettings/questions/{scharge.rb => scharge_monthly.rb} (89%) create mode 100644 app/models/form/lettings/questions/scharge_weekly.rb diff --git a/app/models/form/lettings/pages/rent_4_weekly.rb b/app/models/form/lettings/pages/rent_4_weekly.rb index e771060e6..ac247f7ae 100644 --- a/app/models/form/lettings/pages/rent_4_weekly.rb +++ b/app/models/form/lettings/pages/rent_4_weekly.rb @@ -8,6 +8,10 @@ class Form::Lettings::Pages::Rent4Weekly < ::Form::Page end def questions - @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)] + @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::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 6ff0a5301..60877fcfe 100644 --- a/app/models/form/lettings/pages/rent_bi_weekly.rb +++ b/app/models/form/lettings/pages/rent_bi_weekly.rb @@ -8,6 +8,10 @@ class Form::Lettings::Pages::RentBiWeekly < ::Form::Page end def questions - @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)] + @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::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 7671ee62a..3c1842b96 100644 --- a/app/models/form/lettings/pages/rent_monthly.rb +++ b/app/models/form/lettings/pages/rent_monthly.rb @@ -8,6 +8,10 @@ class Form::Lettings::Pages::RentMonthly < ::Form::Page end def questions - @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)] + @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::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 08b4e55cd..c16e6c121 100644 --- a/app/models/form/lettings/pages/rent_weekly.rb +++ b/app/models/form/lettings/pages/rent_weekly.rb @@ -8,6 +8,10 @@ class Form::Lettings::Pages::RentWeekly < ::Form::Page end def questions - @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)] + @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::Supcharg.new(nil, nil, self), + Form::Lettings::Questions::Tcharge.new(nil, nil, self)] end end diff --git a/app/models/form/lettings/questions/scharge_4_weekly.rb b/app/models/form/lettings/questions/scharge_4_weekly.rb new file mode 100644 index 000000000..418c88157 --- /dev/null +++ b/app/models/form/lettings/questions/scharge_4_weekly.rb @@ -0,0 +1,19 @@ +class Form::Lettings::Questions::Scharge4Weekly < ::Form::Question + def initialize(id, hsh, page) + super + @id = "scharge" + @check_answer_label = "Service charge" + @header = "What is the service charge?" + @type = "numeric" + @width = 5 + @check_answers_card_number = 0 + @min = 0 + @hint_text = "For example, for cleaning. Households may receive housing benefit or Universal Credit towards the service charge." + @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/scharge_bi_weekly.rb b/app/models/form/lettings/questions/scharge_bi_weekly.rb new file mode 100644 index 000000000..913f49844 --- /dev/null +++ b/app/models/form/lettings/questions/scharge_bi_weekly.rb @@ -0,0 +1,19 @@ +class Form::Lettings::Questions::SchargeBiWeekly < ::Form::Question + def initialize(id, hsh, page) + super + @id = "scharge" + @check_answer_label = "Service charge" + @header = "What is the service charge?" + @type = "numeric" + @width = 5 + @check_answers_card_number = 0 + @min = 0 + @hint_text = "For example, for cleaning. Households may receive housing benefit or Universal Credit towards the service charge." + @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/scharge.rb b/app/models/form/lettings/questions/scharge_monthly.rb similarity index 89% rename from app/models/form/lettings/questions/scharge.rb rename to app/models/form/lettings/questions/scharge_monthly.rb index 275f88adb..bec02543c 100644 --- a/app/models/form/lettings/questions/scharge.rb +++ b/app/models/form/lettings/questions/scharge_monthly.rb @@ -1,4 +1,4 @@ -class Form::Lettings::Questions::Scharge < ::Form::Question +class Form::Lettings::Questions::SchargeMonthly < ::Form::Question def initialize(id, hsh, page) super @id = "scharge" diff --git a/app/models/form/lettings/questions/scharge_weekly.rb b/app/models/form/lettings/questions/scharge_weekly.rb new file mode 100644 index 000000000..11e79c111 --- /dev/null +++ b/app/models/form/lettings/questions/scharge_weekly.rb @@ -0,0 +1,19 @@ +class Form::Lettings::Questions::SchargeWeekly < ::Form::Question + def initialize(id, hsh, page) + super + @id = "scharge" + @check_answer_label = "Service charge" + @header = "What is the service charge?" + @type = "numeric" + @width = 5 + @check_answers_card_number = 0 + @min = 0 + @hint_text = "For example, for cleaning. Households may receive housing benefit or Universal Credit towards the service charge." + @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