Browse Source

Reorder, no change just precautionary

pull/2955/head
Manny Dinssa 2 months ago
parent
commit
b6955a0fbe
  1. 18
      app/services/bulk_upload/lettings/year2024/row_parser.rb
  2. 18
      app/services/bulk_upload/lettings/year2025/row_parser.rb

18
app/services/bulk_upload/lettings/year2024/row_parser.rb

@ -752,15 +752,6 @@ private
end
end
def validate_reasonable_preference_homeless
reason_fields = %i[field_107 field_108 field_109 field_110 field_111]
if field_106 == 1 && reason_fields.all? { |field| attributes[field.to_s].blank? }
reason_fields.each do |field|
errors.add(field, I18n.t("#{ERROR_BASE_KEY}.not_answered", question: "reason for reasonable preference."))
end
end
end
def validate_reasonable_preference_dont_know
if rp_dontknow_conflict?
errors.add(:field_111, I18n.t("#{ERROR_BASE_KEY}.reasonpref.conflict.dont_know"))
@ -770,6 +761,15 @@ private
end
end
def validate_reasonable_preference_homeless
reason_fields = %i[field_107 field_108 field_109 field_110 field_111]
if field_106 == 1 && reason_fields.all? { |field| attributes[field.to_s].blank? }
reason_fields.each do |field|
errors.add(field, I18n.t("#{ERROR_BASE_KEY}.not_answered", question: "reason for reasonable preference."))
end
end
end
def validate_condition_effects
illness_option_fields = %i[field_94 field_88 field_91 field_86 field_87 field_89 field_90 field_93 field_92 field_95]
if household_no_illness?

18
app/services/bulk_upload/lettings/year2025/row_parser.rb

@ -751,15 +751,6 @@ private
end
end
def validate_reasonable_preference_homeless
reason_fields = %i[field_107 field_108 field_109 field_110 field_111]
if field_106 == 1 && reason_fields.all? { |field| attributes[field.to_s].blank? }
reason_fields.each do |field|
errors.add(field, I18n.t("#{ERROR_BASE_KEY}.not_answered", question: "reason for reasonable preference."))
end
end
end
def validate_reasonable_preference_dont_know
if rp_dontknow_conflict?
errors.add(:field_111, I18n.t("#{ERROR_BASE_KEY}.reasonpref.conflict.dont_know"))
@ -769,6 +760,15 @@ private
end
end
def validate_reasonable_preference_homeless
reason_fields = %i[field_107 field_108 field_109 field_110 field_111]
if field_106 == 1 && reason_fields.all? { |field| attributes[field.to_s].blank? }
reason_fields.each do |field|
errors.add(field, I18n.t("#{ERROR_BASE_KEY}.not_answered", question: "reason for reasonable preference."))
end
end
end
def validate_condition_effects
illness_option_fields = %i[field_94 field_88 field_91 field_86 field_87 field_89 field_90 field_93 field_92 field_95]
if household_no_illness?

Loading…
Cancel
Save