From fd4b83759de7461b3bae32f5df65dc991d85c7aa Mon Sep 17 00:00:00 2001 From: Kat Date: Tue, 30 Jan 2024 16:40:13 +0000 Subject: [PATCH] Add synonyms --- app/helpers/question_view_helper.rb | 13 +- .../lettings/questions/nationality_all.rb | 404 +++++++++--------- .../form/sales/questions/nationality_all.rb | 404 +++++++++--------- app/views/form/_select_question.html.erb | 2 +- 4 files changed, 416 insertions(+), 407 deletions(-) diff --git a/app/helpers/question_view_helper.rb b/app/helpers/question_view_helper.rb index a656344ca..c1f9de54e 100644 --- a/app/helpers/question_view_helper.rb +++ b/app/helpers/question_view_helper.rb @@ -14,9 +14,13 @@ module QuestionViewHelper end def answer_option_synonyms(resource) - return unless resource.instance_of?(Scheme) + return unless resource.instance_of?(Scheme) || resource.is_a?(Hash) - resource.locations.map(&:postcode).join(",") + if resource.instance_of?(Scheme) + resource.locations.map(&:postcode).join(",") + else + resource["synonyms"] + end end def answer_option_append(resource) @@ -33,6 +37,11 @@ module QuestionViewHelper [resource.primary_client_group, resource.secondary_client_group].compact.join(", ") end + def select_option_name(value) + return value.service_name if value.respond_to?(:service_name) + return value["name"] if value["name"].present? + end + private def label_size(page_header, conditional, question) diff --git a/app/models/form/lettings/questions/nationality_all.rb b/app/models/form/lettings/questions/nationality_all.rb index 192324f26..7e6392522 100644 --- a/app/models/form/lettings/questions/nationality_all.rb +++ b/app/models/form/lettings/questions/nationality_all.rb @@ -12,207 +12,207 @@ class Form::Lettings::Questions::NationalityAll < ::Form::Question ANSWER_OPTIONS = { "" => "Select an option", - "4" => "Afghanistan", - "8" => "Albania", - "12" => "Algeria", - "20" => "Andorra", - "24" => "Angola", - "28" => "Antigua and Barbuda", - "32" => "Argentina", - "51" => "Armenia", - "36" => "Australia", - "40" => "Austria", - "31" => "Azerbaijan", - "44" => "Bahamas", - "48" => "Bahrain", - "50" => "Bangladesh", - "52" => "Barbados", - "112" => "Belarus", - "56" => "Belgium", - "84" => "Belize", - "204" => "Benin", - "64" => "Bhutan", - "68" => "Bolivia", - "70" => "Bosnia and Herzegovina", - "72" => "Botswana", - "76" => "Brazil", - "96" => "Brunei", - "100" => "Bulgaria", - "854" => "Burkina Faso", - "108" => "Burundi", - "132" => "Cabo Verde", - "116" => "Cambodia", - "120" => "Cameroon", - "124" => "Canada", - "140" => "Central African Republic", - "148" => "Chad", - "152" => "Chile", - "156" => "China", - "170" => "Colombia", - "174" => "Comoros", - "178" => "Congo", - "188" => "Costa Rica", - "384" => "Côte d'Ivoire", - "191" => "Croatia", - "192" => "Cuba", - "196" => "Cyprus", - "203" => "Czechia", - "180" => "Democratic Republic of the Congo", - "208" => "Denmark", - "262" => "Djibouti", - "212" => "Dominica", - "214" => "Dominican Republic", - "218" => "Ecuador", - "818" => "Egypt", - "222" => "El Salvador", - "226" => "Equatorial Guinea", - "232" => "Eritrea", - "233" => "Estonia", - "748" => "Eswatini", - "231" => "Ethiopia", - "238" => "Falkland Islands", - "242" => "Fiji", - "246" => "Finland", - "250" => "France", - "266" => "Gabon", - "270" => "Gambia", - "268" => "Georgia", - "276" => "Germany", - "288" => "Ghana", - "292" => "Gibraltar", - "300" => "Greece", - "308" => "Grenada", - "320" => "Guatemala", - "831" => "Guernsey", - "324" => "Guinea", - "624" => "Guinea-Bissau", - "328" => "Guyana", - "332" => "Haiti", - "340" => "Honduras", - "344" => "Hong Kong", - "348" => "Hungary", - "352" => "Iceland", - "356" => "India", - "360" => "Indonesia", - "364" => "Iran", - "368" => "Iraq", - "372" => "Ireland", - "833" => "Isle of Man", - "376" => "Israel", - "380" => "Italy", - "388" => "Jamaica", - "392" => "Japan", - "832" => "Jersey", - "400" => "Jordan", - "398" => "Kazakhstan", - "404" => "Kenya", - "296" => "Kiribati", - "414" => "Kuwait", - "417" => "Kyrgyzstan", - "418" => "Laos", - "428" => "Latvia", - "422" => "Lebanon", - "426" => "Lesotho", - "430" => "Liberia", - "434" => "Libya", - "438" => "Liechtenstein", - "440" => "Lithuania", - "442" => "Luxembourg", - "450" => "Madagascar", - "454" => "Malawi", - "458" => "Malaysia", - "462" => "Maldives", - "466" => "Mali", - "470" => "Malta", - "584" => "Marshall Islands", - "478" => "Mauritania", - "480" => "Mauritius", - "484" => "Mexico", - "583" => "Micronesia (Federated States of)", - "498" => "Moldova", - "492" => "Monaco", - "496" => "Mongolia", - "499" => "Montenegro", - "504" => "Morocco", - "508" => "Mozambique", - "104" => "Myanmar", - "516" => "Namibia", - "520" => "Nauru", - "524" => "Nepal", - "528" => "Netherlands", - "554" => "New Zealand", - "558" => "Nicaragua", - "562" => "Niger", - "566" => "Nigeria", - "807" => "North Macedonia", - "408" => "North Korea", - "578" => "Norway", - "512" => "Oman", - "586" => "Pakistan", - "585" => "Palau", - "275" => "Palestine, State of", - "591" => "Panama", - "598" => "Papua New Guinea", - "600" => "Paraguay", - "604" => "Peru", - "608" => "Philippines", - "616" => "Poland", - "620" => "Portugal", - "634" => "Qatar", - "642" => "Romania", - "643" => "Russia", - "646" => "Rwanda", - "659" => "Saint Kitts and Nevis", - "662" => "Saint Lucia", - "670" => "Saint Vincent and the Grenadines", - "882" => "Samoa", - "674" => "San Marino", - "678" => "Sao Tome and Principe", - "682" => "Saudi Arabia", - "686" => "Senegal", - "688" => "Serbia", - "690" => "Seychelles", - "694" => "Sierra Leone", - "702" => "Singapore", - "703" => "Slovakia", - "705" => "Slovenia", - "90" => "Solomon Islands", - "706" => "Somalia", - "710" => "South Africa", - "410" => "South Korea", - "728" => "South Sudan", - "724" => "Spain", - "144" => "Sri Lanka", - "729" => "Sudan", - "740" => "Suriname", - "752" => "Sweden", - "756" => "Switzerland", - "760" => "Syria", - "158" => "Taiwan", - "762" => "Tajikistan", - "834" => "Tanzania", - "764" => "Thailand", - "626" => "Timor-Leste", - "768" => "Togo", - "776" => "Tonga", - "780" => "Trinidad and Tobago", - "788" => "Tunisia", - "792" => "Turkey", - "795" => "Turkmenistan", - "798" => "Tuvalu", - "800" => "Uganda", - "804" => "Ukraine", - "784" => "United Arab Emirates", - "826" => "United Kingdom", - "840" => "United States of America", - "858" => "Uruguay", - "860" => "Uzbekistan", - "548" => "Vanuatu", - "336" => "Vatican City", - "862" => "Venezuela", - "704" => "Vietnam", - "887" => "Yemen", - "894" => "Zambia", - "716" => "Zimbabwe", + "4" => { "name" => "Afghanistan", "synonyms" => "AF" }, + "8" => { "name" => "Albania", "synonyms" => "AL" }, + "12" => { "name" => "Algeria", "synonyms" => "DZ" }, + "20" => { "name" => "Andorra", "synonyms" => "AD" }, + "24" => { "name" => "Angola", "synonyms" => "AO" }, + "28" => { "name" => "Antigua and Barbuda", "synonyms" => "AG" }, + "32" => { "name" => "Argentina", "synonyms" => "AR" }, + "51" => { "name" => "Armenia", "synonyms" => "AM" }, + "36" => { "name" => "Australia", "synonyms" => "AU" }, + "40" => { "name" => "Austria", "synonyms" => "AT" }, + "31" => { "name" => "Azerbaijan", "synonyms" => "AZ" }, + "44" => { "name" => "Bahamas", "synonyms" => "" }, + "48" => { "name" => "Bahrain", "synonyms" => "BH" }, + "50" => { "name" => "Bangladesh", "synonyms" => "BD" }, + "52" => { "name" => "Barbados", "synonyms" => "BB" }, + "112" => { "name" => "Belarus", "synonyms" => "BY" }, + "56" => { "name" => "Belgium", "synonyms" => "BE" }, + "84" => { "name" => "Belize", "synonyms" => "BZ" }, + "204" => { "name" => "Benin", "synonyms" => "BJ" }, + "64" => { "name" => "Bhutan", "synonyms" => "BT" }, + "68" => { "name" => "Bolivia", "synonyms" => "BO" }, + "70" => { "name" => "Bosnia and Herzegovina", "synonyms" => "BA" }, + "72" => { "name" => "Botswana", "synonyms" => "BW" }, + "76" => { "name" => "Brazil", "synonyms" => "BR" }, + "96" => { "name" => "Brunei", "synonyms" => "BN" }, + "100" => { "name" => "Bulgaria", "synonyms" => "BG" }, + "854" => { "name" => "Burkina Faso", "synonyms" => "BF" }, + "108" => { "name" => "Burundi", "synonyms" => "BI" }, + "132" => { "name" => "Cabo Verde", "synonyms" => "" }, + "116" => { "name" => "Cambodia", "synonyms" => "KH" }, + "120" => { "name" => "Cameroon", "synonyms" => "CM" }, + "124" => { "name" => "Canada", "synonyms" => "CA" }, + "140" => { "name" => "Central African Republic", "synonyms" => "CF" }, + "148" => { "name" => "Chad", "synonyms" => "TD" }, + "152" => { "name" => "Chile", "synonyms" => "CL" }, + "156" => { "name" => "China", "synonyms" => "CN" }, + "170" => { "name" => "Colombia", "synonyms" => "CO" }, + "174" => { "name" => "Comoros", "synonyms" => "KM" }, + "178" => { "name" => "Congo", "synonyms" => "CG" }, + "188" => { "name" => "Costa Rica", "synonyms" => "CR" }, + "384" => { "name" => "Côte d'Ivoire", "synonyms" => "" }, + "191" => { "name" => "Croatia", "synonyms" => "HR" }, + "192" => { "name" => "Cuba", "synonyms" => "CU" }, + "196" => { "name" => "Cyprus", "synonyms" => "CY" }, + "203" => { "name" => "Czechia", "synonyms" => "CZ" }, + "180" => { "name" => "Democratic Republic of the Congo", "synonyms" => "" }, + "208" => { "name" => "Denmark", "synonyms" => "DK" }, + "262" => { "name" => "Djibouti", "synonyms" => "DJ" }, + "212" => { "name" => "Dominica", "synonyms" => "DM" }, + "214" => { "name" => "Dominican Republic", "synonyms" => "DO" }, + "218" => { "name" => "Ecuador", "synonyms" => "EC" }, + "818" => { "name" => "Egypt", "synonyms" => "EG" }, + "222" => { "name" => "El Salvador", "synonyms" => "SV" }, + "226" => { "name" => "Equatorial Guinea", "synonyms" => "GQ" }, + "232" => { "name" => "Eritrea", "synonyms" => "ER" }, + "233" => { "name" => "Estonia", "synonyms" => "EE" }, + "748" => { "name" => "Eswatini", "synonyms" => "SZ" }, + "231" => { "name" => "Ethiopia", "synonyms" => "ET" }, + "238" => { "name" => "Falkland Islands", "synonyms" => "" }, + "242" => { "name" => "Fiji", "synonyms" => "FJ" }, + "246" => { "name" => "Finland", "synonyms" => "FI" }, + "250" => { "name" => "France", "synonyms" => "FR" }, + "266" => { "name" => "Gabon", "synonyms" => "GA" }, + "270" => { "name" => "Gambia", "synonyms" => "" }, + "268" => { "name" => "Georgia", "synonyms" => "GE" }, + "276" => { "name" => "Germany", "synonyms" => "DE" }, + "288" => { "name" => "Ghana", "synonyms" => "GH" }, + "292" => { "name" => "Gibraltar", "synonyms" => "" }, + "300" => { "name" => "Greece", "synonyms" => "GR" }, + "308" => { "name" => "Grenada", "synonyms" => "GD" }, + "320" => { "name" => "Guatemala", "synonyms" => "GT" }, + "831" => { "name" => "Guernsey", "synonyms" => "" }, + "324" => { "name" => "Guinea", "synonyms" => "GN" }, + "624" => { "name" => "Guinea-Bissau", "synonyms" => "GW" }, + "328" => { "name" => "Guyana", "synonyms" => "GY" }, + "332" => { "name" => "Haiti", "synonyms" => "HT" }, + "340" => { "name" => "Honduras", "synonyms" => "HN" }, + "344" => { "name" => "Hong Kong", "synonyms" => "" }, + "348" => { "name" => "Hungary", "synonyms" => "HU" }, + "352" => { "name" => "Iceland", "synonyms" => "IS" }, + "356" => { "name" => "India", "synonyms" => "IN" }, + "360" => { "name" => "Indonesia", "synonyms" => "ID" }, + "364" => { "name" => "Iran", "synonyms" => "IR" }, + "368" => { "name" => "Iraq", "synonyms" => "IQ" }, + "372" => { "name" => "Ireland", "synonyms" => "IE" }, + "833" => { "name" => "Isle of Man", "synonyms" => "" }, + "376" => { "name" => "Israel", "synonyms" => "IL" }, + "380" => { "name" => "Italy", "synonyms" => "IT" }, + "388" => { "name" => "Jamaica", "synonyms" => "JM" }, + "392" => { "name" => "Japan", "synonyms" => "JP" }, + "832" => { "name" => "Jersey", "synonyms" => "" }, + "400" => { "name" => "Jordan", "synonyms" => "JO" }, + "398" => { "name" => "Kazakhstan", "synonyms" => "KZ" }, + "404" => { "name" => "Kenya", "synonyms" => "KE" }, + "296" => { "name" => "Kiribati", "synonyms" => "KI" }, + "414" => { "name" => "Kuwait", "synonyms" => "KW" }, + "417" => { "name" => "Kyrgyzstan", "synonyms" => "KG" }, + "418" => { "name" => "Laos", "synonyms" => "LA" }, + "428" => { "name" => "Latvia", "synonyms" => "LV" }, + "422" => { "name" => "Lebanon", "synonyms" => "LB" }, + "426" => { "name" => "Lesotho", "synonyms" => "LS" }, + "430" => { "name" => "Liberia", "synonyms" => "LR" }, + "434" => { "name" => "Libya", "synonyms" => "LY" }, + "438" => { "name" => "Liechtenstein", "synonyms" => "LI" }, + "440" => { "name" => "Lithuania", "synonyms" => "LT" }, + "442" => { "name" => "Luxembourg", "synonyms" => "LU" }, + "450" => { "name" => "Madagascar", "synonyms" => "MG" }, + "454" => { "name" => "Malawi", "synonyms" => "MW" }, + "458" => { "name" => "Malaysia", "synonyms" => "MY" }, + "462" => { "name" => "Maldives", "synonyms" => "MV" }, + "466" => { "name" => "Mali", "synonyms" => "ML" }, + "470" => { "name" => "Malta", "synonyms" => "MT" }, + "584" => { "name" => "Marshall Islands", "synonyms" => "MH" }, + "478" => { "name" => "Mauritania", "synonyms" => "MR" }, + "480" => { "name" => "Mauritius", "synonyms" => "MU" }, + "484" => { "name" => "Mexico", "synonyms" => "MX" }, + "583" => { "name" => "Micronesia (Federated States of)", "synonyms" => "" }, + "498" => { "name" => "Moldova", "synonyms" => "MD" }, + "492" => { "name" => "Monaco", "synonyms" => "MC" }, + "496" => { "name" => "Mongolia", "synonyms" => "MN" }, + "499" => { "name" => "Montenegro", "synonyms" => "ME" }, + "504" => { "name" => "Morocco", "synonyms" => "MA" }, + "508" => { "name" => "Mozambique", "synonyms" => "MZ" }, + "104" => { "name" => "Myanmar", "synonyms" => "" }, + "516" => { "name" => "Namibia", "synonyms" => "NA" }, + "520" => { "name" => "Nauru", "synonyms" => "NR" }, + "524" => { "name" => "Nepal", "synonyms" => "NP" }, + "528" => { "name" => "Netherlands", "synonyms" => "NL" }, + "554" => { "name" => "New Zealand", "synonyms" => "NZ" }, + "558" => { "name" => "Nicaragua", "synonyms" => "NI" }, + "562" => { "name" => "Niger", "synonyms" => "NE" }, + "566" => { "name" => "Nigeria", "synonyms" => "NG" }, + "807" => { "name" => "North Macedonia", "synonyms" => "MK" }, + "408" => { "name" => "North Korea", "synonyms" => "KP" }, + "578" => { "name" => "Norway", "synonyms" => "NO" }, + "512" => { "name" => "Oman", "synonyms" => "OM" }, + "586" => { "name" => "Pakistan", "synonyms" => "PK" }, + "585" => { "name" => "Palau", "synonyms" => "PW" }, + "275" => { "name" => "Palestine, State of", "synonyms" => "" }, + "591" => { "name" => "Panama", "synonyms" => "PA" }, + "598" => { "name" => "Papua New Guinea", "synonyms" => "PG" }, + "600" => { "name" => "Paraguay", "synonyms" => "PY" }, + "604" => { "name" => "Peru", "synonyms" => "PE" }, + "608" => { "name" => "Philippines", "synonyms" => "PH" }, + "616" => { "name" => "Poland", "synonyms" => "PL" }, + "620" => { "name" => "Portugal", "synonyms" => "PT" }, + "634" => { "name" => "Qatar", "synonyms" => "QA" }, + "642" => { "name" => "Romania", "synonyms" => "RO" }, + "643" => { "name" => "Russia", "synonyms" => "RU" }, + "646" => { "name" => "Rwanda", "synonyms" => "RW" }, + "659" => { "name" => "Saint Kitts and Nevis", "synonyms" => "" }, + "662" => { "name" => "Saint Lucia", "synonyms" => "" }, + "670" => { "name" => "Saint Vincent and the Grenadines", "synonyms" => "" }, + "882" => { "name" => "Samoa", "synonyms" => "WS" }, + "674" => { "name" => "San Marino", "synonyms" => "SM" }, + "678" => { "name" => "Sao Tome and Principe", "synonyms" => "ST" }, + "682" => { "name" => "Saudi Arabia", "synonyms" => "SA" }, + "686" => { "name" => "Senegal", "synonyms" => "SN" }, + "688" => { "name" => "Serbia", "synonyms" => "RS" }, + "690" => { "name" => "Seychelles", "synonyms" => "SC" }, + "694" => { "name" => "Sierra Leone", "synonyms" => "SL" }, + "702" => { "name" => "Singapore", "synonyms" => "SG" }, + "703" => { "name" => "Slovakia", "synonyms" => "SK" }, + "705" => { "name" => "Slovenia", "synonyms" => "SI" }, + "90" => { "name" => "Solomon Islands", "synonyms" => "SB" }, + "706" => { "name" => "Somalia", "synonyms" => "SO" }, + "710" => { "name" => "South Africa", "synonyms" => "ZA" }, + "410" => { "name" => "South Korea", "synonyms" => "KR" }, + "728" => { "name" => "South Sudan", "synonyms" => "SS" }, + "724" => { "name" => "Spain", "synonyms" => "ES" }, + "144" => { "name" => "Sri Lanka", "synonyms" => "LK" }, + "729" => { "name" => "Sudan", "synonyms" => "SD" }, + "740" => { "name" => "Suriname", "synonyms" => "SR" }, + "752" => { "name" => "Sweden", "synonyms" => "SE" }, + "756" => { "name" => "Switzerland", "synonyms" => "CH" }, + "760" => { "name" => "Syria", "synonyms" => "SY" }, + "158" => { "name" => "Taiwan", "synonyms" => "" }, + "762" => { "name" => "Tajikistan", "synonyms" => "TJ" }, + "834" => { "name" => "Tanzania", "synonyms" => "TZ" }, + "764" => { "name" => "Thailand", "synonyms" => "TH" }, + "626" => { "name" => "Timor-Leste", "synonyms" => "" }, + "768" => { "name" => "Togo", "synonyms" => "TG" }, + "776" => { "name" => "Tonga", "synonyms" => "TO" }, + "780" => { "name" => "Trinidad and Tobago", "synonyms" => "TT" }, + "788" => { "name" => "Tunisia", "synonyms" => "TN" }, + "792" => { "name" => "Turkey", "synonyms" => "TR" }, + "795" => { "name" => "Turkmenistan", "synonyms" => "TM" }, + "798" => { "name" => "Tuvalu", "synonyms" => "TV" }, + "800" => { "name" => "Uganda", "synonyms" => "UG" }, + "804" => { "name" => "Ukraine", "synonyms" => "UA" }, + "784" => { "name" => "United Arab Emirates", "synonyms" => "AE" }, + "826" => { "name" => "United Kingdom", "synonyms" => "GB,UK,England,Wales,Scotland,Northern Ireland" }, + "840" => { "name" => "United States of America", "synonyms" => "US,USA" }, + "858" => { "name" => "Uruguay", "synonyms" => "UY" }, + "860" => { "name" => "Uzbekistan", "synonyms" => "UZ" }, + "548" => { "name" => "Vanuatu", "synonyms" => "VU" }, + "336" => { "name" => "Vatican City", "synonyms" => "VA" }, + "862" => { "name" => "Venezuela", "synonyms" => "VE" }, + "704" => { "name" => "Vietnam", "synonyms" => "VN" }, + "887" => { "name" => "Yemen", "synonyms" => "YE" }, + "894" => { "name" => "Zambia", "synonyms" => "ZM" }, + "716" => { "name" => "Zimbabwe", "synonyms" => "ZW" }, }.freeze end diff --git a/app/models/form/sales/questions/nationality_all.rb b/app/models/form/sales/questions/nationality_all.rb index d99a961d5..6c7c281bd 100644 --- a/app/models/form/sales/questions/nationality_all.rb +++ b/app/models/form/sales/questions/nationality_all.rb @@ -11,207 +11,207 @@ class Form::Sales::Questions::NationalityAll < ::Form::Question ANSWER_OPTIONS = { "" => "Select an option", - "4" => "Afghanistan", - "8" => "Albania", - "12" => "Algeria", - "20" => "Andorra", - "24" => "Angola", - "28" => "Antigua and Barbuda", - "32" => "Argentina", - "51" => "Armenia", - "36" => "Australia", - "40" => "Austria", - "31" => "Azerbaijan", - "44" => "Bahamas", - "48" => "Bahrain", - "50" => "Bangladesh", - "52" => "Barbados", - "112" => "Belarus", - "56" => "Belgium", - "84" => "Belize", - "204" => "Benin", - "64" => "Bhutan", - "68" => "Bolivia", - "70" => "Bosnia and Herzegovina", - "72" => "Botswana", - "76" => "Brazil", - "96" => "Brunei", - "100" => "Bulgaria", - "854" => "Burkina Faso", - "108" => "Burundi", - "132" => "Cabo Verde", - "116" => "Cambodia", - "120" => "Cameroon", - "124" => "Canada", - "140" => "Central African Republic", - "148" => "Chad", - "152" => "Chile", - "156" => "China", - "170" => "Colombia", - "174" => "Comoros", - "178" => "Congo", - "188" => "Costa Rica", - "384" => "Côte d'Ivoire", - "191" => "Croatia", - "192" => "Cuba", - "196" => "Cyprus", - "203" => "Czechia", - "180" => "Democratic Republic of the Congo", - "208" => "Denmark", - "262" => "Djibouti", - "212" => "Dominica", - "214" => "Dominican Republic", - "218" => "Ecuador", - "818" => "Egypt", - "222" => "El Salvador", - "226" => "Equatorial Guinea", - "232" => "Eritrea", - "233" => "Estonia", - "748" => "Eswatini", - "231" => "Ethiopia", - "238" => "Falkland Islands", - "242" => "Fiji", - "246" => "Finland", - "250" => "France", - "266" => "Gabon", - "270" => "Gambia", - "268" => "Georgia", - "276" => "Germany", - "288" => "Ghana", - "292" => "Gibraltar", - "300" => "Greece", - "308" => "Grenada", - "320" => "Guatemala", - "831" => "Guernsey", - "324" => "Guinea", - "624" => "Guinea-Bissau", - "328" => "Guyana", - "332" => "Haiti", - "340" => "Honduras", - "344" => "Hong Kong", - "348" => "Hungary", - "352" => "Iceland", - "356" => "India", - "360" => "Indonesia", - "364" => "Iran", - "368" => "Iraq", - "372" => "Ireland", - "833" => "Isle of Man", - "376" => "Israel", - "380" => "Italy", - "388" => "Jamaica", - "392" => "Japan", - "832" => "Jersey", - "400" => "Jordan", - "398" => "Kazakhstan", - "404" => "Kenya", - "296" => "Kiribati", - "414" => "Kuwait", - "417" => "Kyrgyzstan", - "418" => "Laos", - "428" => "Latvia", - "422" => "Lebanon", - "426" => "Lesotho", - "430" => "Liberia", - "434" => "Libya", - "438" => "Liechtenstein", - "440" => "Lithuania", - "442" => "Luxembourg", - "450" => "Madagascar", - "454" => "Malawi", - "458" => "Malaysia", - "462" => "Maldives", - "466" => "Mali", - "470" => "Malta", - "584" => "Marshall Islands", - "478" => "Mauritania", - "480" => "Mauritius", - "484" => "Mexico", - "583" => "Micronesia (Federated States of)", - "498" => "Moldova", - "492" => "Monaco", - "496" => "Mongolia", - "499" => "Montenegro", - "504" => "Morocco", - "508" => "Mozambique", - "104" => "Myanmar", - "516" => "Namibia", - "520" => "Nauru", - "524" => "Nepal", - "528" => "Netherlands", - "554" => "New Zealand", - "558" => "Nicaragua", - "562" => "Niger", - "566" => "Nigeria", - "807" => "North Macedonia", - "408" => "North Korea", - "578" => "Norway", - "512" => "Oman", - "586" => "Pakistan", - "585" => "Palau", - "275" => "Palestine, State of", - "591" => "Panama", - "598" => "Papua New Guinea", - "600" => "Paraguay", - "604" => "Peru", - "608" => "Philippines", - "616" => "Poland", - "620" => "Portugal", - "634" => "Qatar", - "642" => "Romania", - "643" => "Russia", - "646" => "Rwanda", - "659" => "Saint Kitts and Nevis", - "662" => "Saint Lucia", - "670" => "Saint Vincent and the Grenadines", - "882" => "Samoa", - "674" => "San Marino", - "678" => "Sao Tome and Principe", - "682" => "Saudi Arabia", - "686" => "Senegal", - "688" => "Serbia", - "690" => "Seychelles", - "694" => "Sierra Leone", - "702" => "Singapore", - "703" => "Slovakia", - "705" => "Slovenia", - "90" => "Solomon Islands", - "706" => "Somalia", - "710" => "South Africa", - "410" => "South Korea", - "728" => "South Sudan", - "724" => "Spain", - "144" => "Sri Lanka", - "729" => "Sudan", - "740" => "Suriname", - "752" => "Sweden", - "756" => "Switzerland", - "760" => "Syria", - "158" => "Taiwan", - "762" => "Tajikistan", - "834" => "Tanzania", - "764" => "Thailand", - "626" => "Timor-Leste", - "768" => "Togo", - "776" => "Tonga", - "780" => "Trinidad and Tobago", - "788" => "Tunisia", - "792" => "Turkey", - "795" => "Turkmenistan", - "798" => "Tuvalu", - "800" => "Uganda", - "804" => "Ukraine", - "784" => "United Arab Emirates", - "826" => "United Kingdom", - "840" => "United States of America", - "858" => "Uruguay", - "860" => "Uzbekistan", - "548" => "Vanuatu", - "336" => "Vatican City", - "862" => "Venezuela", - "704" => "Vietnam", - "887" => "Yemen", - "894" => "Zambia", - "716" => "Zimbabwe", + "4" => { "name" => "Afghanistan", "synonyms" => "AF" }, + "8" => { "name" => "Albania", "synonyms" => "AL" }, + "12" => { "name" => "Algeria", "synonyms" => "DZ" }, + "20" => { "name" => "Andorra", "synonyms" => "AD" }, + "24" => { "name" => "Angola", "synonyms" => "AO" }, + "28" => { "name" => "Antigua and Barbuda", "synonyms" => "AG" }, + "32" => { "name" => "Argentina", "synonyms" => "AR" }, + "51" => { "name" => "Armenia", "synonyms" => "AM" }, + "36" => { "name" => "Australia", "synonyms" => "AU" }, + "40" => { "name" => "Austria", "synonyms" => "AT" }, + "31" => { "name" => "Azerbaijan", "synonyms" => "AZ" }, + "44" => { "name" => "Bahamas", "synonyms" => "" }, + "48" => { "name" => "Bahrain", "synonyms" => "BH" }, + "50" => { "name" => "Bangladesh", "synonyms" => "BD" }, + "52" => { "name" => "Barbados", "synonyms" => "BB" }, + "112" => { "name" => "Belarus", "synonyms" => "BY" }, + "56" => { "name" => "Belgium", "synonyms" => "BE" }, + "84" => { "name" => "Belize", "synonyms" => "BZ" }, + "204" => { "name" => "Benin", "synonyms" => "BJ" }, + "64" => { "name" => "Bhutan", "synonyms" => "BT" }, + "68" => { "name" => "Bolivia", "synonyms" => "BO" }, + "70" => { "name" => "Bosnia and Herzegovina", "synonyms" => "BA" }, + "72" => { "name" => "Botswana", "synonyms" => "BW" }, + "76" => { "name" => "Brazil", "synonyms" => "BR" }, + "96" => { "name" => "Brunei", "synonyms" => "BN" }, + "100" => { "name" => "Bulgaria", "synonyms" => "BG" }, + "854" => { "name" => "Burkina Faso", "synonyms" => "BF" }, + "108" => { "name" => "Burundi", "synonyms" => "BI" }, + "132" => { "name" => "Cabo Verde", "synonyms" => "" }, + "116" => { "name" => "Cambodia", "synonyms" => "KH" }, + "120" => { "name" => "Cameroon", "synonyms" => "CM" }, + "124" => { "name" => "Canada", "synonyms" => "CA" }, + "140" => { "name" => "Central African Republic", "synonyms" => "CF" }, + "148" => { "name" => "Chad", "synonyms" => "TD" }, + "152" => { "name" => "Chile", "synonyms" => "CL" }, + "156" => { "name" => "China", "synonyms" => "CN" }, + "170" => { "name" => "Colombia", "synonyms" => "CO" }, + "174" => { "name" => "Comoros", "synonyms" => "KM" }, + "178" => { "name" => "Congo", "synonyms" => "CG" }, + "188" => { "name" => "Costa Rica", "synonyms" => "CR" }, + "384" => { "name" => "Côte d'Ivoire", "synonyms" => "" }, + "191" => { "name" => "Croatia", "synonyms" => "HR" }, + "192" => { "name" => "Cuba", "synonyms" => "CU" }, + "196" => { "name" => "Cyprus", "synonyms" => "CY" }, + "203" => { "name" => "Czechia", "synonyms" => "CZ" }, + "180" => { "name" => "Democratic Republic of the Congo", "synonyms" => "" }, + "208" => { "name" => "Denmark", "synonyms" => "DK" }, + "262" => { "name" => "Djibouti", "synonyms" => "DJ" }, + "212" => { "name" => "Dominica", "synonyms" => "DM" }, + "214" => { "name" => "Dominican Republic", "synonyms" => "DO" }, + "218" => { "name" => "Ecuador", "synonyms" => "EC" }, + "818" => { "name" => "Egypt", "synonyms" => "EG" }, + "222" => { "name" => "El Salvador", "synonyms" => "SV" }, + "226" => { "name" => "Equatorial Guinea", "synonyms" => "GQ" }, + "232" => { "name" => "Eritrea", "synonyms" => "ER" }, + "233" => { "name" => "Estonia", "synonyms" => "EE" }, + "748" => { "name" => "Eswatini", "synonyms" => "SZ" }, + "231" => { "name" => "Ethiopia", "synonyms" => "ET" }, + "238" => { "name" => "Falkland Islands", "synonyms" => "" }, + "242" => { "name" => "Fiji", "synonyms" => "FJ" }, + "246" => { "name" => "Finland", "synonyms" => "FI" }, + "250" => { "name" => "France", "synonyms" => "FR" }, + "266" => { "name" => "Gabon", "synonyms" => "GA" }, + "270" => { "name" => "Gambia", "synonyms" => "" }, + "268" => { "name" => "Georgia", "synonyms" => "GE" }, + "276" => { "name" => "Germany", "synonyms" => "DE" }, + "288" => { "name" => "Ghana", "synonyms" => "GH" }, + "292" => { "name" => "Gibraltar", "synonyms" => "" }, + "300" => { "name" => "Greece", "synonyms" => "GR" }, + "308" => { "name" => "Grenada", "synonyms" => "GD" }, + "320" => { "name" => "Guatemala", "synonyms" => "GT" }, + "831" => { "name" => "Guernsey", "synonyms" => "" }, + "324" => { "name" => "Guinea", "synonyms" => "GN" }, + "624" => { "name" => "Guinea-Bissau", "synonyms" => "GW" }, + "328" => { "name" => "Guyana", "synonyms" => "GY" }, + "332" => { "name" => "Haiti", "synonyms" => "HT" }, + "340" => { "name" => "Honduras", "synonyms" => "HN" }, + "344" => { "name" => "Hong Kong", "synonyms" => "" }, + "348" => { "name" => "Hungary", "synonyms" => "HU" }, + "352" => { "name" => "Iceland", "synonyms" => "IS" }, + "356" => { "name" => "India", "synonyms" => "IN" }, + "360" => { "name" => "Indonesia", "synonyms" => "ID" }, + "364" => { "name" => "Iran", "synonyms" => "IR" }, + "368" => { "name" => "Iraq", "synonyms" => "IQ" }, + "372" => { "name" => "Ireland", "synonyms" => "IE" }, + "833" => { "name" => "Isle of Man", "synonyms" => "" }, + "376" => { "name" => "Israel", "synonyms" => "IL" }, + "380" => { "name" => "Italy", "synonyms" => "IT" }, + "388" => { "name" => "Jamaica", "synonyms" => "JM" }, + "392" => { "name" => "Japan", "synonyms" => "JP" }, + "832" => { "name" => "Jersey", "synonyms" => "" }, + "400" => { "name" => "Jordan", "synonyms" => "JO" }, + "398" => { "name" => "Kazakhstan", "synonyms" => "KZ" }, + "404" => { "name" => "Kenya", "synonyms" => "KE" }, + "296" => { "name" => "Kiribati", "synonyms" => "KI" }, + "414" => { "name" => "Kuwait", "synonyms" => "KW" }, + "417" => { "name" => "Kyrgyzstan", "synonyms" => "KG" }, + "418" => { "name" => "Laos", "synonyms" => "LA" }, + "428" => { "name" => "Latvia", "synonyms" => "LV" }, + "422" => { "name" => "Lebanon", "synonyms" => "LB" }, + "426" => { "name" => "Lesotho", "synonyms" => "LS" }, + "430" => { "name" => "Liberia", "synonyms" => "LR" }, + "434" => { "name" => "Libya", "synonyms" => "LY" }, + "438" => { "name" => "Liechtenstein", "synonyms" => "LI" }, + "440" => { "name" => "Lithuania", "synonyms" => "LT" }, + "442" => { "name" => "Luxembourg", "synonyms" => "LU" }, + "450" => { "name" => "Madagascar", "synonyms" => "MG" }, + "454" => { "name" => "Malawi", "synonyms" => "MW" }, + "458" => { "name" => "Malaysia", "synonyms" => "MY" }, + "462" => { "name" => "Maldives", "synonyms" => "MV" }, + "466" => { "name" => "Mali", "synonyms" => "ML" }, + "470" => { "name" => "Malta", "synonyms" => "MT" }, + "584" => { "name" => "Marshall Islands", "synonyms" => "MH" }, + "478" => { "name" => "Mauritania", "synonyms" => "MR" }, + "480" => { "name" => "Mauritius", "synonyms" => "MU" }, + "484" => { "name" => "Mexico", "synonyms" => "MX" }, + "583" => { "name" => "Micronesia (Federated States of)", "synonyms" => "" }, + "498" => { "name" => "Moldova", "synonyms" => "MD" }, + "492" => { "name" => "Monaco", "synonyms" => "MC" }, + "496" => { "name" => "Mongolia", "synonyms" => "MN" }, + "499" => { "name" => "Montenegro", "synonyms" => "ME" }, + "504" => { "name" => "Morocco", "synonyms" => "MA" }, + "508" => { "name" => "Mozambique", "synonyms" => "MZ" }, + "104" => { "name" => "Myanmar", "synonyms" => "" }, + "516" => { "name" => "Namibia", "synonyms" => "NA" }, + "520" => { "name" => "Nauru", "synonyms" => "NR" }, + "524" => { "name" => "Nepal", "synonyms" => "NP" }, + "528" => { "name" => "Netherlands", "synonyms" => "NL" }, + "554" => { "name" => "New Zealand", "synonyms" => "NZ" }, + "558" => { "name" => "Nicaragua", "synonyms" => "NI" }, + "562" => { "name" => "Niger", "synonyms" => "NE" }, + "566" => { "name" => "Nigeria", "synonyms" => "NG" }, + "807" => { "name" => "North Macedonia", "synonyms" => "MK" }, + "408" => { "name" => "North Korea", "synonyms" => "KP" }, + "578" => { "name" => "Norway", "synonyms" => "NO" }, + "512" => { "name" => "Oman", "synonyms" => "OM" }, + "586" => { "name" => "Pakistan", "synonyms" => "PK" }, + "585" => { "name" => "Palau", "synonyms" => "PW" }, + "275" => { "name" => "Palestine, State of", "synonyms" => "" }, + "591" => { "name" => "Panama", "synonyms" => "PA" }, + "598" => { "name" => "Papua New Guinea", "synonyms" => "PG" }, + "600" => { "name" => "Paraguay", "synonyms" => "PY" }, + "604" => { "name" => "Peru", "synonyms" => "PE" }, + "608" => { "name" => "Philippines", "synonyms" => "PH" }, + "616" => { "name" => "Poland", "synonyms" => "PL" }, + "620" => { "name" => "Portugal", "synonyms" => "PT" }, + "634" => { "name" => "Qatar", "synonyms" => "QA" }, + "642" => { "name" => "Romania", "synonyms" => "RO" }, + "643" => { "name" => "Russia", "synonyms" => "RU" }, + "646" => { "name" => "Rwanda", "synonyms" => "RW" }, + "659" => { "name" => "Saint Kitts and Nevis", "synonyms" => "" }, + "662" => { "name" => "Saint Lucia", "synonyms" => "" }, + "670" => { "name" => "Saint Vincent and the Grenadines", "synonyms" => "" }, + "882" => { "name" => "Samoa", "synonyms" => "WS" }, + "674" => { "name" => "San Marino", "synonyms" => "SM" }, + "678" => { "name" => "Sao Tome and Principe", "synonyms" => "ST" }, + "682" => { "name" => "Saudi Arabia", "synonyms" => "SA" }, + "686" => { "name" => "Senegal", "synonyms" => "SN" }, + "688" => { "name" => "Serbia", "synonyms" => "RS" }, + "690" => { "name" => "Seychelles", "synonyms" => "SC" }, + "694" => { "name" => "Sierra Leone", "synonyms" => "SL" }, + "702" => { "name" => "Singapore", "synonyms" => "SG" }, + "703" => { "name" => "Slovakia", "synonyms" => "SK" }, + "705" => { "name" => "Slovenia", "synonyms" => "SI" }, + "90" => { "name" => "Solomon Islands", "synonyms" => "SB" }, + "706" => { "name" => "Somalia", "synonyms" => "SO" }, + "710" => { "name" => "South Africa", "synonyms" => "ZA" }, + "410" => { "name" => "South Korea", "synonyms" => "KR" }, + "728" => { "name" => "South Sudan", "synonyms" => "SS" }, + "724" => { "name" => "Spain", "synonyms" => "ES" }, + "144" => { "name" => "Sri Lanka", "synonyms" => "LK" }, + "729" => { "name" => "Sudan", "synonyms" => "SD" }, + "740" => { "name" => "Suriname", "synonyms" => "SR" }, + "752" => { "name" => "Sweden", "synonyms" => "SE" }, + "756" => { "name" => "Switzerland", "synonyms" => "CH" }, + "760" => { "name" => "Syria", "synonyms" => "SY" }, + "158" => { "name" => "Taiwan", "synonyms" => "" }, + "762" => { "name" => "Tajikistan", "synonyms" => "TJ" }, + "834" => { "name" => "Tanzania", "synonyms" => "TZ" }, + "764" => { "name" => "Thailand", "synonyms" => "TH" }, + "626" => { "name" => "Timor-Leste", "synonyms" => "" }, + "768" => { "name" => "Togo", "synonyms" => "TG" }, + "776" => { "name" => "Tonga", "synonyms" => "TO" }, + "780" => { "name" => "Trinidad and Tobago", "synonyms" => "TT" }, + "788" => { "name" => "Tunisia", "synonyms" => "TN" }, + "792" => { "name" => "Turkey", "synonyms" => "TR" }, + "795" => { "name" => "Turkmenistan", "synonyms" => "TM" }, + "798" => { "name" => "Tuvalu", "synonyms" => "TV" }, + "800" => { "name" => "Uganda", "synonyms" => "UG" }, + "804" => { "name" => "Ukraine", "synonyms" => "UA" }, + "784" => { "name" => "United Arab Emirates", "synonyms" => "AE" }, + "826" => { "name" => "United Kingdom", "synonyms" => "GB,UK,England,Wales,Scotland,Northern Ireland" }, + "840" => { "name" => "United States of America", "synonyms" => "US,USA" }, + "858" => { "name" => "Uruguay", "synonyms" => "UY" }, + "860" => { "name" => "Uzbekistan", "synonyms" => "UZ" }, + "548" => { "name" => "Vanuatu", "synonyms" => "VU" }, + "336" => { "name" => "Vatican City", "synonyms" => "VA" }, + "862" => { "name" => "Venezuela", "synonyms" => "VE" }, + "704" => { "name" => "Vietnam", "synonyms" => "VN" }, + "887" => { "name" => "Yemen", "synonyms" => "YE" }, + "894" => { "name" => "Zambia", "synonyms" => "ZM" }, + "716" => { "name" => "Zimbabwe", "synonyms" => "ZW" }, }.freeze end diff --git a/app/views/form/_select_question.html.erb b/app/views/form/_select_question.html.erb index ca90a1e4e..2dceffd63 100644 --- a/app/views/form/_select_question.html.erb +++ b/app/views/form/_select_question.html.erb @@ -1,6 +1,6 @@ <% selected = @log.public_send(question.id) || "" %> -<% answers = question.displayed_answer_options(@log, current_user).map { |key, value| OpenStruct.new(id: key, name: value.respond_to?(:service_name) ? value.service_name : nil, resource: value) } %> +<% answers = question.displayed_answer_options(@log, current_user).map { |key, value| OpenStruct.new(id: key, name: select_option_name(value), resource: value) } %> <%= render partial: "form/guidance/#{question.top_guidance_partial}" if question.top_guidance? %> <%= f.govuk_select(question.id.to_sym,