diff --git a/app/services/bulk_upload/lettings/year2023/row_parser.rb b/app/services/bulk_upload/lettings/year2023/row_parser.rb index 3424e0608..cd8f18fc3 100644 --- a/app/services/bulk_upload/lettings/year2023/row_parser.rb +++ b/app/services/bulk_upload/lettings/year2023/row_parser.rb @@ -27,9 +27,9 @@ class BulkUpload::Lettings::Year2023::RowParser field_20: "Address line 2", field_21: "Town or city", field_22: "County", - field_23: "Part 1 of the property's postcode", - field_24: "Part 2 of the property's postcode", - field_25: "What is the property's local authority?", + field_23: "Part 1 of the property’s postcode", + field_24: "Part 2 of the property’s postcode", + field_25: "What is the property’s local authority?", field_26: "What type was the property most recently let as?", field_27: "What is the reason for the property being vacant?", field_28: "How many times was the property offered between becoming vacant and this letting?", @@ -50,9 +50,9 @@ class BulkUpload::Lettings::Year2023::RowParser field_43: "What is the length of the fixed-term tenancy to the nearest year?", field_44: "Is this letting sheltered accommodation?", field_45: "Has tenant seen the MHCLG privacy notice?", - field_46: "What is the lead tenant's age?", - field_47: "Which of these best describes the lead tenant's gender identity?", - field_48: "Which of these best describes the lead tenant's ethnic background?", + field_46: "What is the lead tenant’s age?", + field_47: "Which of these best describes the lead tenant’s gender identity?", + field_48: "Which of these best describes the lead tenant’s ethnic background?", field_49: "What is the lead tenant's nationality?", field_50: "Which of these best describes the lead tenant's working situation?", field_51: "What is person 2's relationship to the lead tenant?", diff --git a/app/services/bulk_upload/lettings/year2024/row_parser.rb b/app/services/bulk_upload/lettings/year2024/row_parser.rb index b27e078d0..86c0482d8 100644 --- a/app/services/bulk_upload/lettings/year2024/row_parser.rb +++ b/app/services/bulk_upload/lettings/year2024/row_parser.rb @@ -24,9 +24,9 @@ class BulkUpload::Lettings::Year2024::RowParser field_18: "Address line 2", field_19: "Town or city", field_20: "County", - field_21: "Part 1 of the property's postcode", - field_22: "Part 2 of the property's postcode", - field_23: "What is the property's local authority?", + field_21: "Part 1 of the property’s postcode", + field_22: "Part 2 of the property’s postcode", + field_23: "What is the property’s local authority?", field_25: "What type was the property most recently let as?", field_24: "What is the reason for the property being vacant?", field_26: "What type of unit is the property?", @@ -46,39 +46,39 @@ class BulkUpload::Lettings::Year2024::RowParser field_40: "What is the length of the fixed-term tenancy to the nearest year?", field_41: "Is this letting sheltered accommodation?", field_15: "Has tenant seen the MHCLG privacy notice?", - field_42: "What is the lead tenant's age?", - field_43: "Which of these best describes the lead tenant's gender identity?", - field_44: "Which of these best describes the lead tenant's ethnic background?", - field_45: "What is the lead tenant's nationality?", - field_46: "Which of these best describes the lead tenant's working situation?", - field_47: "What is person 2's relationship to the lead tenant?", - field_48: "What is person 2's age?", - field_49: "Which of these best describes person 2's gender identity?", - field_50: "Which of these best describes person 2's working situation?", - field_51: "What is person 3's relationship to the lead tenant?", - field_52: "What is person 3's age?", - field_53: "Which of these best describes person 3's gender identity?", - field_54: "Which of these best describes person 3's working situation?", - field_55: "What is person 4's relationship to the lead tenant?", - field_56: "What is person 4's age?", - field_57: "Which of these best describes person 4's gender identity?", - field_58: "Which of these best describes person 4's working situation?", - field_59: "What is person 5's relationship to the lead tenant?", - field_60: "What is person 5's age?", - field_61: "Which of these best describes person 5's gender identity?", - field_62: "Which of these best describes person 5's working situation?", - field_63: "What is person 6's relationship to the lead tenant?", - field_64: "What is person 6's age?", - field_65: "Which of these best describes person 6's gender identity?", - field_66: "Which of these best describes person 6's working situation?", - field_67: "What is person 7's relationship to the lead tenant?", - field_68: "What is person 7's age?", - field_69: "Which of these best describes person 7's gender identity?", - field_70: "Which of these best describes person 7's working situation?", - field_71: "What is person 8's relationship to the lead tenant?", - field_72: "What is person 8's age?", - field_73: "Which of these best describes person 8's gender identity?", - field_74: "Which of these best describes person 8's working situation?", + field_42: "What is the lead tenant’s age?", + field_43: "Which of these best describes the lead tenant’s gender identity?", + field_44: "Which of these best describes the lead tenant’s ethnic background?", + field_45: "What is the lead tenant’s nationality?", + field_46: "Which of these best describes the lead tenant’s working situation?", + field_47: "What is person 2’s relationship to the lead tenant?", + field_48: "What is person 2’s age?", + field_49: "Which of these best describes person 2’s gender identity?", + field_50: "Which of these best describes person 2’s working situation?", + field_51: "What is person 3’s relationship to the lead tenant?", + field_52: "What is person 3’s age?", + field_53: "Which of these best describes person 3’s gender identity?", + field_54: "Which of these best describes person 3’s working situation?", + field_55: "What is person 4’s relationship to the lead tenant?", + field_56: "What is person 4’s age?", + field_57: "Which of these best describes person 4’s gender identity?", + field_58: "Which of these best describes person 4’s working situation?", + field_59: "What is person 5’s relationship to the lead tenant?", + field_60: "What is person 5’s age?", + field_61: "Which of these best describes person 5’s gender identity?", + field_62: "Which of these best describes person 5’s working situation?", + field_63: "What is person 6’s relationship to the lead tenant?", + field_64: "What is person 6’s age?", + field_65: "Which of these best describes person 6’s gender identity?", + field_66: "Which of these best describes person 6’s working situation?", + field_67: "What is person 7’s relationship to the lead tenant?", + field_68: "What is person 7’s age?", + field_69: "Which of these best describes person 7’s gender identity?", + field_70: "Which of these best describes person 7’s working situation?", + field_71: "What is person 8’s relationship to the lead tenant?", + field_72: "What is person 8’s age?", + field_73: "Which of these best describes person 8’s gender identity?", + field_74: "Which of these best describes person 8’s working situation?", field_75: "Does anybody in the household have links to the UK armed forces?", field_76: "Is this person still serving in the UK armed forces?", field_77: "Was this person seriously injured or ill as a result of serving in the UK armed forces?", @@ -90,8 +90,8 @@ class BulkUpload::Lettings::Year2024::RowParser field_83: "Does anybody in the household have any disabled access needs?", field_84: "Does anybody in the household have any disabled access needs?", field_85: "Does anybody in the household have a physical or mental health condition (or other illness) expected to last 12 months or more?", - field_86: "Does this person's condition affect their dexterity?", - field_87: "Does this person's condition affect their learning or understanding or concentrating?", + field_86: "Does this person’s condition affect their dexterity?", + field_87: "Does this person’s condition affect their learning or understanding or concentrating?", field_88: "Does this person's condition affect their hearing?", field_89: "Does this person's condition affect their memory?", field_90: "Does this person's condition affect their mental health?", diff --git a/app/services/bulk_upload/lettings/year2025/row_parser.rb b/app/services/bulk_upload/lettings/year2025/row_parser.rb index b5aea0bcb..a673b3fbc 100644 --- a/app/services/bulk_upload/lettings/year2025/row_parser.rb +++ b/app/services/bulk_upload/lettings/year2025/row_parser.rb @@ -27,9 +27,9 @@ class BulkUpload::Lettings::Year2025::RowParser field_20: "Address line 2", field_21: "Town or city", field_22: "County", - field_23: "Part 1 of the property's postcode", - field_24: "Part 2 of the property's postcode", - field_25: "What is the property's local authority?", + field_23: "Part 1 of the property’s postcode", + field_24: "Part 2 of the property’s postcode", + field_25: "What is the property’s local authority?", field_26: "What type of unit is the property?", field_27: "Which type of building is the property?", field_28: "Is the property built or adapted to wheelchair-user standards?", @@ -46,23 +46,23 @@ class BulkUpload::Lettings::Year2025::RowParser field_39: "What is the type of tenancy?", field_40: "If 'Other', what is the type of tenancy?", field_41: "What is the length of the fixed-term tenancy to the nearest year?", - field_42: "What is the lead tenant's age?", - field_43: "Which of these best describes the lead tenant's gender identity?", - field_44: "Which of these best describes the lead tenant's ethnic background?", - field_45: "What is the lead tenant's nationality?", - field_46: "Which of these best describes the lead tenant's working situation?", + field_42: "What is the lead tenant’s age?", + field_43: "Which of these best describes the lead tenant’s gender identity?", + field_44: "Which of these best describes the lead tenant’s ethnic background?", + field_45: "What is the lead tenant’s nationality?", + field_46: "Which of these best describes the lead tenant’s working situation?", field_47: "Is person 2 the partner of the lead tenant?", - field_48: "What is person 2's age?", - field_49: "Which of these best describes person 2's gender identity?", - field_50: "Which of these best describes person 2's working situation?", + field_48: "What is person 2’s age?", + field_49: "Which of these best describes person 2’s gender identity?", + field_50: "Which of these best describes person 2’s working situation?", field_51: "Is person 3 the partner of the lead tenant?", - field_52: "What is person 3's age?", - field_53: "Which of these best describes person 3's gender identity?", - field_54: "Which of these best describes person 3's working situation?", + field_52: "What is person 3’s age?", + field_53: "Which of these best describes person 3’s gender identity?", + field_54: "Which of these best describes person 3’s working situation?", field_55: "Is person 4 the partner of the lead tenant?", - field_56: "What is person 4's age?", - field_57: "Which of these best describes person 4's gender identity?", - field_58: "Which of these best describes person 4's working situation?", + field_56: "What is person 4’s age?", + field_57: "Which of these best describes person 4’s gender identity?", + field_58: "Which of these best describes person 4’s working situation?", field_59: "Is person 5 the partner of the lead tenant?", field_60: "What is person 5's age?", field_61: "Which of these best describes person 5's gender identity?", diff --git a/app/services/bulk_upload/sales/year2023/row_parser.rb b/app/services/bulk_upload/sales/year2023/row_parser.rb index 39fb41d6b..803022423 100644 --- a/app/services/bulk_upload/sales/year2023/row_parser.rb +++ b/app/services/bulk_upload/sales/year2023/row_parser.rb @@ -24,7 +24,7 @@ class BulkUpload::Sales::Year2023::RowParser field_16: "How many bedrooms does the property have?", field_17: "What type of unit is the property?", field_18: "Which type of bulding is the property?", - field_19: "If known, enter this property's UPRN", + field_19: "If known, enter this property’s UPRN", field_20: "Address line 1", field_21: "Address line 2", @@ -39,19 +39,19 @@ class BulkUpload::Sales::Year2023::RowParser field_30: "Age of buyer 1", field_31: "Gender identity of buyer 1", - field_32: "What is buyer 1's ethnic group?", - field_33: "What is buyer 1's nationality?", - field_34: "If 'Any other country', what is buyer 1's nationality?", + field_32: "What is buyer 1’s ethnic group?", + field_33: "What is buyer 1’s nationality?", + field_34: "If 'Any other country', what is buyer 1’s nationality?", field_35: "Working situation of buyer 1", field_36: "Will buyer 1 live in the property?", field_37: "Relationship to buyer 1 for person 2", field_38: "Age of person 2", field_39: "Gender identity of person 2", - field_40: "Which of the following best describes buyer 2's ethnic background?", + field_40: "Which of the following best describes buyer 2’s ethnic background?", - field_41: "What is buyer 2's nationality?", - field_42: "If 'Any other country', what is buyer 2's nationality?", - field_43: "What is buyer 2 or person 2's working situation?", + field_41: "What is buyer 2’s nationality?", + field_42: "If 'Any other country', what is buyer 2’s nationality?", + field_43: "What is buyer 2 or person 2’s working situation?", field_44: "Will buyer 2 live in the property?", field_45: "Besides the buyers, how many people will live in the property?", field_46: "Relationship to buyer 1 for person 3", @@ -72,10 +72,10 @@ class BulkUpload::Sales::Year2023::RowParser field_60: "Gender identity of person 6", field_61: "Working situation of person 6", - field_62: "What was buyer 1's previous tenure?", - field_63: "Do you know the postcode of buyer 1's last settled home?", - field_64: "Part 1 of postcode of buyer 1's last settled home", - field_65: "Part 2 of postcode of buyer 1's last settled home", + field_62: "What was buyer 1’s previous tenure?", + field_63: "Do you know the postcode of buyer 1’s last settled home?", + field_64: "Part 1 of postcode of buyer 1’s last settled home", + field_65: "Part 2 of postcode of buyer 1’s last settled home", field_66: "What is the local authority of buyer 1's last settled home?", field_67: "Was the buyer registered with their PRP (HA)?", field_68: "Was the buyer registered with another PRP (HA)?", diff --git a/app/services/bulk_upload/sales/year2024/row_parser.rb b/app/services/bulk_upload/sales/year2024/row_parser.rb index a613a118c..a88052e3e 100644 --- a/app/services/bulk_upload/sales/year2024/row_parser.rb +++ b/app/services/bulk_upload/sales/year2024/row_parser.rb @@ -27,7 +27,7 @@ class BulkUpload::Sales::Year2024::RowParser field_19: "How many bedrooms does the property have?", field_20: "What type of unit is the property?", field_21: "Which type of bulding is the property?", - field_22: "If known, enter this property's UPRN", + field_22: "If known, enter this property’s UPRN", field_23: "Address line 1", field_24: "Address line 2", @@ -40,17 +40,17 @@ class BulkUpload::Sales::Year2024::RowParser field_31: "Age of buyer 1", field_32: "Gender identity of buyer 1", - field_33: "What is buyer 1's ethnic group?", - field_34: "What is buyer 1's nationality?", + field_33: "What is buyer 1’s ethnic group?", + field_34: "What is buyer 1’s nationality?", field_35: "Working situation of buyer 1", field_36: "Will buyer 1 live in the property?", field_37: "Relationship to buyer 1 for person 2", field_38: "Age of person 2", field_39: "Gender identity of person 2", - field_40: "Which of the following best describes buyer 2's ethnic background?", + field_40: "Which of the following best describes buyer 2’s ethnic background?", - field_41: "What is buyer 2's nationality?", - field_42: "What is buyer 2 or person 2's working situation?", + field_41: "What is buyer 2’s nationality?", + field_42: "What is buyer 2 or person 2’s working situation?", field_43: "Will buyer 2 live in the property?", field_44: "Besides the buyers, how many people will live in the property?", field_45: "Relationship to buyer 1 for person 3", @@ -71,18 +71,18 @@ class BulkUpload::Sales::Year2024::RowParser field_59: "Gender identity of person 6", field_60: "Working situation of person 6", - field_61: "What was buyer 1's previous tenure?", - field_62: "Do you know the postcode of buyer 1's last settled home?", - field_63: "Part 1 of postcode of buyer 1's last settled home", - field_64: "Part 2 of postcode of buyer 1's last settled home", - field_65: "What is the local authority of buyer 1's last settled home?", + field_61: "What was buyer 1’s previous tenure?", + field_62: "Do you know the postcode of buyer 1’s last settled home?", + field_63: "Part 1 of postcode of buyer 1’s last settled home", + field_64: "Part 2 of postcode of buyer 1’s last settled home", + field_65: "What is the local authority of buyer 1’s last settled home?", field_66: "Was the buyer registered with their PRP (HA)?", field_67: "Was the buyer registered with another PRP (HA)?", field_68: "Was the buyer registered with the local authority?", field_69: "Was the buyer registered with a Help to Buy agent?", field_70: "At the time of purchase, was buyer 2 living at the same address as buyer 1?", - field_71: "What was buyer 2's previous tenure?", + field_71: "What was buyer 2’s previous tenure?", field_72: "Has the buyer ever served in the UK Armed Forces and for how long?", field_73: "Is the buyer still serving in the UK armed forces?", field_74: "Are any of the buyers a spouse or civil partner of a UK Armed Forces regular who died in service within the last 2 years?", diff --git a/app/services/bulk_upload/sales/year2025/row_parser.rb b/app/services/bulk_upload/sales/year2025/row_parser.rb index 886b3e928..d4be45910 100644 --- a/app/services/bulk_upload/sales/year2025/row_parser.rb +++ b/app/services/bulk_upload/sales/year2025/row_parser.rb @@ -21,7 +21,7 @@ class BulkUpload::Sales::Year2025::RowParser field_14: "Was the buyer interviewed for any of the answers you will provide on this log?", field_15: "Data Protection question", - field_16: "If known, enter this property's UPRN", + field_16: "If known, enter this property’s UPRN", field_17: "Address line 1", field_18: "Address line 2", field_19: "Town or city", @@ -36,16 +36,16 @@ class BulkUpload::Sales::Year2025::RowParser field_28: "Age of buyer 1", field_29: "Gender identity of buyer 1", - field_30: "What is buyer 1's ethnic group?", - field_31: "What is buyer 1's nationality?", + field_30: "What is buyer 1’s ethnic group?", + field_31: "What is buyer 1’s nationality?", field_32: "Working situation of buyer 1", field_33: "Will buyer 1 live in the property?", field_34: "Is buyer 2 or person 2 the partner of buyer 1?", field_35: "Age of person 2", field_36: "Gender identity of person 2", - field_37: "Which of the following best describes buyer 2's ethnic background?", - field_38: "What is buyer 2's nationality?", - field_39: "What is buyer 2 or person 2's working situation?", + field_37: "Which of the following best describes buyer 2’s ethnic background?", + field_38: "What is buyer 2’s nationality?", + field_39: "What is buyer 2 or person 2’s working situation?", field_40: "Will buyer 2 live in the property?", field_41: "Besides the buyers, how many people will live in the property?", @@ -66,13 +66,13 @@ class BulkUpload::Sales::Year2025::RowParser field_56: "Gender identity of person 6", field_57: "Working situation of person 6", - field_58: "What was buyer 1's previous tenure?", - field_59: "Do you know the postcode of buyer 1's last settled home?", - field_60: "Part 1 of postcode of buyer 1's last settled home", - field_61: "Part 2 of postcode of buyer 1's last settled home", - field_62: "What is the local authority of buyer 1's last settled home?", + field_58: "What was buyer 1’s previous tenure?", + field_59: "Do you know the postcode of buyer 1’s last settled home?", + field_60: "Part 1 of postcode of buyer 1’s last settled home", + field_61: "Part 2 of postcode of buyer 1’s last settled home", + field_62: "What is the local authority of buyer 1’s last settled home?", field_63: "At the time of purchase, was buyer 2 living at the same address as buyer 1?", - field_64: "What was buyer 2's previous tenure?", + field_64: "What was buyer 2’s previous tenure?", field_65: "Has the buyer ever served in the UK Armed Forces and for how long?", field_66: "Is the buyer still serving in the UK armed forces?", @@ -80,10 +80,10 @@ class BulkUpload::Sales::Year2025::RowParser field_68: "Does anyone in the household consider themselves to have a disability?", field_69: "Does anyone in the household use a wheelchair?", - field_70: "What is buyer 1's gross annual income?", - field_71: "Was buyer 1's income used for a mortgage application?", - field_72: "What is buyer 2's gross annual income?", - field_73: "Was buyer 2's income used for a mortgage application?", + field_70: "What is buyer 1’s gross annual income?", + field_71: "Was buyer 1’s income used for a mortgage application?", + field_72: "What is buyer 2’s gross annual income?", + field_73: "Was buyer 2’s income used for a mortgage application?", field_74: "Were the buyers receiving any of these housing-related benefits immediately before buying this property?", field_75: "What is the total amount the buyers had in savings before they paid any deposit for the property?", field_76: "Have any of the purchasers previously owned a property?", @@ -94,9 +94,9 @@ class BulkUpload::Sales::Year2025::RowParser field_80: "What is the day of the practical completion or handover date?", field_81: "What is the month of the practical completion or handover date?", field_82: "What is the year of the practical completion or handover date?", - field_83: "How many bedrooms did the buyer's previous property have?", - field_84: "What was the type of the buyer's previous property?", - field_85: "What was the rent type of the buyer's previous property?", + field_83: "How many bedrooms did the buyer’s previous property have?", + field_84: "What was the type of the buyer’s previous property?", + field_85: "What was the rent type of the buyer’s previous property?", field_86: "What was the full purchase price?", field_87: "What was the initial percentage share purchased?", field_88: "Was a mortgage used for the purchase of this property? - Shared ownership",