|
|
|
|
@ -549,8 +549,7 @@ class BulkUpload::Lettings::Year2026::RowParser
|
|
|
|
|
!supported_housing? ? "field_23" : nil, # postcode # TODO: CLDC-4119: add postcode to hash for supported housing |
|
|
|
|
!supported_housing? ? "field_24" : nil, # postcode # TODO: CLDC-4119: add postcode to hash for supported housing |
|
|
|
|
"field_42", # age1 |
|
|
|
|
"field_43", # sex1 |
|
|
|
|
"field_130", # sexrab1 |
|
|
|
|
"field_43", # sexrab1 |
|
|
|
|
"field_46", # ecstat1 |
|
|
|
|
) |
|
|
|
|
if [field_124, field_125, field_126, field_127].all?(&:present?) |
|
|
|
|
@ -700,7 +699,6 @@ private
|
|
|
|
|
"startdate", |
|
|
|
|
"age1", |
|
|
|
|
"sexrab1", |
|
|
|
|
"sex1", |
|
|
|
|
"ecstat1", |
|
|
|
|
"owning_organisation", |
|
|
|
|
"tcharge", |
|
|
|
|
@ -990,8 +988,7 @@ private
|
|
|
|
|
errors.add(:field_24, error_message) unless supported_housing? # postcode_full # TODO: CLDC-4119: add postcode to error fields for supported housing |
|
|
|
|
errors.add(:field_25, error_message) unless supported_housing? # la # TODO: CLDC-4119: add LA to error fields for supported housing |
|
|
|
|
errors.add(:field_42, error_message) # age1 |
|
|
|
|
errors.add(:field_130, error_message) # sexrab1 |
|
|
|
|
errors.add(:field_43, error_message) # sex1 |
|
|
|
|
errors.add(:field_43, error_message) # sexrab1 |
|
|
|
|
errors.add(:field_46, error_message) # ecstat1 |
|
|
|
|
errors.add(:field_122, error_message) unless general_needs? # household_charge |
|
|
|
|
errors.add(:field_124, error_message) # brent |
|
|
|
|
@ -1049,14 +1046,14 @@ private
|
|
|
|
|
age8_known: %i[field_72], |
|
|
|
|
age8: %i[field_72], |
|
|
|
|
|
|
|
|
|
sex1: %i[field_43], |
|
|
|
|
sex2: %i[field_49], |
|
|
|
|
sex3: %i[field_53], |
|
|
|
|
sex4: %i[field_57], |
|
|
|
|
sex5: %i[field_61], |
|
|
|
|
sex6: %i[field_65], |
|
|
|
|
sex7: %i[field_69], |
|
|
|
|
sex8: %i[field_73], |
|
|
|
|
sexrab1: %i[field_43], |
|
|
|
|
sexrab2: %i[field_49], |
|
|
|
|
sexrab3: %i[field_53], |
|
|
|
|
sexrab4: %i[field_57], |
|
|
|
|
sexrab5: %i[field_61], |
|
|
|
|
sexrab6: %i[field_65], |
|
|
|
|
sexrab7: %i[field_69], |
|
|
|
|
sexrab8: %i[field_73], |
|
|
|
|
|
|
|
|
|
ethnic_group: %i[field_44], |
|
|
|
|
ethnic: %i[field_44], |
|
|
|
|
@ -1162,15 +1159,6 @@ private
|
|
|
|
|
town_or_city: [:field_21], |
|
|
|
|
county: [:field_22], |
|
|
|
|
uprn_selection: [:field_19], |
|
|
|
|
|
|
|
|
|
sexrab1: %i[field_130], |
|
|
|
|
sexrab2: %i[field_131], |
|
|
|
|
sexrab3: %i[field_132], |
|
|
|
|
sexrab4: %i[field_133], |
|
|
|
|
sexrab5: %i[field_134], |
|
|
|
|
sexrab6: %i[field_135], |
|
|
|
|
sexrab7: %i[field_136], |
|
|
|
|
sexrab8: %i[field_137], |
|
|
|
|
}.compact |
|
|
|
|
end |
|
|
|
|
|
|
|
|
|
@ -1232,14 +1220,14 @@ private
|
|
|
|
|
attributes["age8_known"] = age8_known? |
|
|
|
|
attributes["age8"] = field_72 if attributes["age8_known"]&.zero? && field_72&.match(/\A\d{1,3}\z|\AR\z/) |
|
|
|
|
|
|
|
|
|
attributes["sex1"] = field_43 |
|
|
|
|
attributes["sex2"] = field_49 |
|
|
|
|
attributes["sex3"] = field_53 |
|
|
|
|
attributes["sex4"] = field_57 |
|
|
|
|
attributes["sex5"] = field_61 |
|
|
|
|
attributes["sex6"] = field_65 |
|
|
|
|
attributes["sex7"] = field_69 |
|
|
|
|
attributes["sex8"] = field_73 |
|
|
|
|
attributes["sexrab1"] = field_43 |
|
|
|
|
attributes["sexrab2"] = field_49 |
|
|
|
|
attributes["sexrab3"] = field_53 |
|
|
|
|
attributes["sexrab4"] = field_57 |
|
|
|
|
attributes["sexrab5"] = field_61 |
|
|
|
|
attributes["sexrab6"] = field_65 |
|
|
|
|
attributes["sexrab7"] = field_69 |
|
|
|
|
attributes["sexrab8"] = field_73 |
|
|
|
|
|
|
|
|
|
attributes["ethnic_group"] = ethnic_group_from_ethnic |
|
|
|
|
attributes["ethnic"] = field_44 |
|
|
|
|
@ -1377,15 +1365,6 @@ private
|
|
|
|
|
attributes["postcode_full_input"] = postcode_full |
|
|
|
|
attributes["select_best_address_match"] = true if field_18.blank? |
|
|
|
|
|
|
|
|
|
attributes["sexrab1"] = field_130 |
|
|
|
|
attributes["sexrab2"] = field_131 |
|
|
|
|
attributes["sexrab3"] = field_132 |
|
|
|
|
attributes["sexrab4"] = field_133 |
|
|
|
|
attributes["sexrab5"] = field_134 |
|
|
|
|
attributes["sexrab6"] = field_135 |
|
|
|
|
attributes["sexrab7"] = field_136 |
|
|
|
|
attributes["sexrab8"] = field_137 |
|
|
|
|
|
|
|
|
|
attributes |
|
|
|
|
end |
|
|
|
|
|
|
|
|
|
|