Browse Source

Fix mappings

pull/2712/head
Kat 2 years ago
parent
commit
f084dac167
  1. 1
      app/helpers/interruption_screen_helper.rb
  2. 2
      app/models/form/sales/pages/deposit_and_mortgage_value_check.rb
  3. 2
      app/models/form/sales/pages/discounted_sale_value_check.rb
  4. 2
      app/models/form/sales/pages/extra_borrowing_value_check.rb
  5. 2
      app/models/form/sales/pages/grant_value_check.rb
  6. 2
      app/models/form/sales/pages/percentage_discount_value_check.rb
  7. 2
      app/models/form/sales/questions/deposit_and_mortgage_value_check.rb
  8. 2
      app/models/form/sales/questions/discounted_sale_value_check.rb
  9. 2
      app/models/form/sales/questions/extra_borrowing_value_check.rb
  10. 2
      app/models/form/sales/questions/grant_value_check.rb
  11. 2
      app/models/form/sales/questions/percentage_discount_value_check.rb
  12. 2
      spec/models/form/lettings/subsections/tenancy_information_spec.rb
  13. 4
      spec/models/form/sales/pages/discounted_sale_value_check_spec.rb
  14. 4
      spec/models/form/sales/pages/percentage_discount_value_check_spec.rb

1
app/helpers/interruption_screen_helper.rb

@ -1,6 +1,7 @@
module InterruptionScreenHelper
def display_informative_text(informative_text, log)
return informative_text if informative_text.is_a? String
return "" if informative_text.nil?
return "" unless informative_text["arguments"]
translation_params = {}

2
app/models/form/sales/pages/deposit_and_mortgage_value_check.rb

@ -6,7 +6,7 @@ class Form::Sales::Pages::DepositAndMortgageValueCheck < ::Form::Page
"mortgage_plus_deposit_less_than_discounted_value?" => true,
},
]
@copy_key = "sales.sale_information.deposit_and_mortgage_value_check"
@copy_key = "sales.soft_validations.deposit_and_mortgage_value_check"
@title_text = {
"translation" => "forms.#{form.start_date.year}.#{@copy_key}.title_text",
"arguments" => [

2
app/models/form/sales/pages/discounted_sale_value_check.rb

@ -2,7 +2,7 @@ class Form::Sales::Pages::DiscountedSaleValueCheck < ::Form::Page
def initialize(id, hsh, subsection, person_index = nil)
super(id, hsh, subsection)
@depends_on = depends_on
@copy_key = "sales.sale_information.discounted_sale_value_check"
@copy_key = "sales.soft_validations.discounted_sale_value_check"
@title_text = {
"translation" => "forms.#{form.start_date.year}.#{@copy_key}.title_text",
"arguments" => [

2
app/models/form/sales/pages/extra_borrowing_value_check.rb

@ -6,7 +6,7 @@ class Form::Sales::Pages::ExtraBorrowingValueCheck < Form::Page
"extra_borrowing_expected_but_not_reported?" => true,
},
]
@copy_key = "sales.sale_information.extra_borrowing_value_check"
@copy_key = "sales.soft_validations.extra_borrowing_value_check"
@title_text = {
"translation" => "forms.#{form.start_date.year}.#{@copy_key}.title_text",
"arguments" => [

2
app/models/form/sales/pages/grant_value_check.rb

@ -2,7 +2,7 @@ class Form::Sales::Pages::GrantValueCheck < ::Form::Page
def initialize(id, hsh, subsection)
super
@id = "grant_value_check"
@copy_key = "sales.sale_information.grant_value_check"
@copy_key = "sales.soft_validations.grant_value_check"
@depends_on = [
{
"grant_outside_common_range?" => true,

2
app/models/form/sales/pages/percentage_discount_value_check.rb

@ -1,7 +1,7 @@
class Form::Sales::Pages::PercentageDiscountValueCheck < ::Form::Page
def initialize(id, hsh, subsection)
super
@copy_key = "sales.sale_information.percentage_discount_value_check"
@copy_key = "sales.soft_validations.percentage_discount_value_check"
@title_text = {
"translation" => "forms.#{form.start_date.year}.#{@copy_key}.title_text",
"arguments" => [{ "key" => "discount", "label" => true, "i18n_template" => "discount" }],

2
app/models/form/sales/questions/deposit_and_mortgage_value_check.rb

@ -2,7 +2,7 @@ class Form::Sales::Questions::DepositAndMortgageValueCheck < ::Form::Question
def initialize(id, hsh, page)
super
@id = "deposit_and_mortgage_value_check"
@copy_key = "sales.sale_information.deposit_and_mortgage_value_check"
@copy_key = "sales.soft_validations.deposit_and_mortgage_value_check"
@type = "interruption_screen"
@answer_options = {
"0" => { "value" => "Yes" },

2
app/models/form/sales/questions/discounted_sale_value_check.rb

@ -2,7 +2,7 @@ class Form::Sales::Questions::DiscountedSaleValueCheck < ::Form::Question
def initialize(id, hsh, page)
super
@id = "discounted_sale_value_check"
@copy_key = "sales.sale_information.discounted_sale_value_check"
@copy_key = "sales.soft_validations.discounted_sale_value_check"
@type = "interruption_screen"
@answer_options = {
"0" => { "value" => "Yes" },

2
app/models/form/sales/questions/extra_borrowing_value_check.rb

@ -2,7 +2,7 @@ class Form::Sales::Questions::ExtraBorrowingValueCheck < ::Form::Question
def initialize(id, hsh, page)
super(id, hsh, page)
@id = "extrabor_value_check"
@copy_key = "sales.sale_information.extra_borrowing_value_check"
@copy_key = "sales.soft_validations.extra_borrowing_value_check"
@type = "interruption_screen"
@answer_options = {
"0" => { "value" => "Yes" },

2
app/models/form/sales/questions/grant_value_check.rb

@ -2,7 +2,7 @@ class Form::Sales::Questions::GrantValueCheck < ::Form::Question
def initialize(id, hsh, page)
super
@id = "grant_value_check"
@copy_key = "sales.sale_information.grant_value_check"
@copy_key = "sales.soft_validations.grant_value_check"
@type = "interruption_screen"
@answer_options = {
"0" => { "value" => "Yes" },

2
app/models/form/sales/questions/percentage_discount_value_check.rb

@ -2,7 +2,7 @@ class Form::Sales::Questions::PercentageDiscountValueCheck < ::Form::Question
def initialize(id, hsh, page)
super
@id = "percentage_discount_value_check"
@copy_key = "sales.sale_information.percentage_discount_value_check"
@copy_key = "sales.soft_validations.percentage_discount_value_check"
@type = "interruption_screen"
@answer_options = {
"0" => { "value" => "Yes" },

2
spec/models/form/lettings/subsections/tenancy_information_spec.rb

@ -12,7 +12,7 @@ RSpec.describe Form::Lettings::Subsections::TenancyInformation, type: :model do
end
describe "pages" do
let(:section) { instance_double(Form::Sales::Sections::TenancyInformation, form:) }
let(:section) { instance_double(Form::Lettings::Sections::TenancyAndProperty, form:) }
let(:form) { instance_double(Form, start_date:) }
before do

4
spec/models/form/sales/pages/discounted_sale_value_check_spec.rb

@ -23,14 +23,14 @@ RSpec.describe Form::Sales::Pages::DiscountedSaleValueCheck, type: :model do
it "has the correct title_text" do
expect(page.title_text).to eq({
"translation" => "forms.2024.sales.sale_information.discounted_sale_value_check.title_text",
"translation" => "forms.2024.sales.soft_validations.discounted_sale_value_check.title_text",
"arguments" => [{ "arguments_for_key" => "value_with_discount", "i18n_template" => "value_with_discount", "key" => "field_formatted_as_currency" }],
})
end
it "has the correct informative_text" do
expect(page.informative_text).to eq({
"translation" => "forms.2024.sales.sale_information.discounted_sale_value_check.informative_text",
"translation" => "forms.2024.sales.soft_validations.discounted_sale_value_check.informative_text",
"arguments" => [{ "arguments_for_key" => "mortgage_deposit_and_grant_total", "i18n_template" => "mortgage_deposit_and_grant_total", "key" => "field_formatted_as_currency" }],
})
end

4
spec/models/form/sales/pages/percentage_discount_value_check_spec.rb

@ -22,14 +22,14 @@ RSpec.describe Form::Sales::Pages::PercentageDiscountValueCheck, type: :model do
it "has the correct title_text" do
expect(page.title_text).to eq({
"translation" => "forms.2024.sales.sale_information.percentage_discount_value_check.title_text",
"translation" => "forms.2024.sales.soft_validations.percentage_discount_value_check.title_text",
"arguments" => [{ "key" => "discount", "label" => true, "i18n_template" => "discount" }],
})
end
it "has the correct informative_text" do
expect(page.informative_text).to eq({
"translation" => "forms.2024.sales.sale_information.percentage_discount_value_check.informative_text",
"translation" => "forms.2024.sales.soft_validations.percentage_discount_value_check.informative_text",
"arguments" => [],
})
end

Loading…
Cancel
Save