baarkerlounger
/
submit-social-housing-lettings-and-sales-data
mirror of https://github.com/communitiesuk/submit-social-housing-lettings-and-sales-data.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

CLDC-3991 Update working situation answer options to clarify full-time/part-time

pull/3040/head
Manny Dinssa 1 month ago
parent
d62e4dcfdc
commit
f6a99e3108
9 changed files with 26 additions and 26 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      app/models/form/lettings/questions/person_working_situation.rb
  2. 4
      app/models/form/lettings/questions/working_situation1.rb
  3. 8
      app/models/form/sales/questions/buyer1_working_situation.rb
  4. 8
      app/models/form/sales/questions/buyer2_working_situation.rb
  5. 8
      app/models/form/sales/questions/person_working_situation.rb
  6. 4
      spec/models/form/lettings/questions/person_working_situation_spec.rb
  7. 4
      spec/models/form/sales/questions/buyer1_working_situation_spec.rb
  8. 8
      spec/models/form/sales/questions/buyer2_working_situation_spec.rb
  9. 4
      spec/models/form/sales/questions/person_working_situation_spec.rb

4
app/models/form/lettings/questions/person_working_situation.rb
Unescape View File

@ -10,8 +10,8 @@ class Form::Lettings::Questions::PersonWorkingSituation < ::Form::Question
end
def answer_options
{ "1" => { "value" => "Full-time – 30 hours or more" },
"2" => { "value" => "Part-time – Less than 30 hours" },
{ "1" => { "value" => "Full-time – 30 hours or more per week" },
"2" => { "value" => "Part-time – Less than 30 hours per week" },
"7" => { "value" => "Full-time student" },
"3" => { "value" => "In government training into work" },
"4" => { "value" => "Jobseeker" },

4
app/models/form/lettings/questions/working_situation1.rb
Unescape View File

@ -9,8 +9,8 @@ class Form::Lettings::Questions::WorkingSituation1 < ::Form::Question
end
ANSWER_OPTIONS = {
"1" => { "value" => "Full-time – 30 hours or more" },
"2" => { "value" => "Part-time – Less than 30 hours" },
"1" => { "value" => "Full-time – 30 hours or more per week" },
"2" => { "value" => "Part-time – Less than 30 hours per week" },
"7" => { "value" => "Full-time student" },
"3" => { "value" => "In government training into work" },
"4" => { "value" => "Jobseeker" },

8
app/models/form/sales/questions/buyer1_working_situation.rb
Unescape View File

@ -17,8 +17,8 @@ class Form::Sales::Questions::Buyer1WorkingSituation < ::Form::Question
def answer_options
if form.start_year_2025_or_later?
{
"1" => { "value" => "Full-time - 30 hours or more" },
"2" => { "value" => "Part-time - Less than 30 hours" },
"1" => { "value" => "Full-time – 30 hours or more per week" },
"2" => { "value" => "Part-time – Less than 30 hours per week" },
"3" => { "value" => "In government training into work" },
"4" => { "value" => "Jobseeker" },
"5" => { "value" => "Retired" },
@ -30,8 +30,8 @@ class Form::Sales::Questions::Buyer1WorkingSituation < ::Form::Question
}.freeze
else
{
"1" => { "value" => "Full-time - 30 hours or more" },
"2" => { "value" => "Part-time - Less than 30 hours" },
"1" => { "value" => "Full-time – 30 hours or more per week" },
"2" => { "value" => "Part-time – Less than 30 hours per week" },
"3" => { "value" => "In government training into work" },
"4" => { "value" => "Jobseeker" },
"6" => { "value" => "Not seeking work" },

8
app/models/form/sales/questions/buyer2_working_situation.rb
Unescape View File

@ -22,8 +22,8 @@ class Form::Sales::Questions::Buyer2WorkingSituation < ::Form::Question
def answer_options
if form.start_year_2025_or_later?
{
"1" => { "value" => "Full-time - 30 hours or more" },
"2" => { "value" => "Part-time - Less than 30 hours" },
"1" => { "value" => "Full-time – 30 hours or more per week" },
"2" => { "value" => "Part-time – Less than 30 hours per week" },
"3" => { "value" => "In government training into work" },
"4" => { "value" => "Jobseeker" },
"5" => { "value" => "Retired" },
@ -36,8 +36,8 @@ class Form::Sales::Questions::Buyer2WorkingSituation < ::Form::Question
}.freeze
else
{
"1" => { "value" => "Full-time - 30 hours or more" },
"2" => { "value" => "Part-time - Less than 30 hours" },
"1" => { "value" => "Full-time – 30 hours or more per week" },
"2" => { "value" => "Part-time – Less than 30 hours per week" },
"3" => { "value" => "In government training into work" },
"4" => { "value" => "Jobseeker" },
"6" => { "value" => "Not seeking work" },

8
app/models/form/sales/questions/person_working_situation.rb
Unescape View File

@ -18,8 +18,8 @@ class Form::Sales::Questions::PersonWorkingSituation < ::Form::Question
def answer_options
if form.start_year_2025_or_later?
{
"1" => { "value" => "Full-time - 30 hours or more" },
"2" => { "value" => "Part-time - Less than 30 hours" },
"1" => { "value" => "Full-time – 30 hours or more per week" },
"2" => { "value" => "Part-time – Less than 30 hours per week" },
"3" => { "value" => "In government training into work" },
"4" => { "value" => "Jobseeker" },
"5" => { "value" => "Retired" },
@ -40,8 +40,8 @@ class Form::Sales::Questions::PersonWorkingSituation < ::Form::Question
}
else
{
"1" => { "value" => "Full-time - 30 hours or more" },
"2" => { "value" => "Part-time - Less than 30 hours" },
"1" => { "value" => "Full-time – 30 hours or more per week" },
"2" => { "value" => "Part-time – Less than 30 hours per week" },
"3" => { "value" => "In government training into work" },
"4" => { "value" => "Jobseeker" },
"6" => { "value" => "Not seeking work" },

4
spec/models/form/lettings/questions/person_working_situation_spec.rb
Unescape View File

@ -21,9 +21,9 @@ RSpec.describe Form::Lettings::Questions::PersonWorkingSituation, type: :model d
it "has the correct answer_options" do
expect(question.answer_options).to eq("0" => { "value" => "Other" },
"1" => { "value" => "Full-time – 30 hours or more" },
"1" => { "value" => "Full-time – 30 hours or more per week" },
"10" => { "value" => "Person prefers not to say" },
"2" => { "value" => "Part-time – Less than 30 hours" },
"2" => { "value" => "Part-time – Less than 30 hours per week" },
"3" => { "value" => "In government training into work" },
"4" => { "value" => "Jobseeker" },
"5" => { "value" => "Retired" },

4
spec/models/form/sales/questions/buyer1_working_situation_spec.rb
Unescape View File

@ -26,8 +26,8 @@ RSpec.describe Form::Sales::Questions::Buyer1WorkingSituation, type: :model do
it "has the correct answer_options" do
expect(question.answer_options).to eq({
"1" => { "value" => "Full-time - 30 hours or more" },
"2" => { "value" => "Part-time - Less than 30 hours" },
"1" => { "value" => "Full-time – 30 hours or more per week" },
"2" => { "value" => "Part-time – Less than 30 hours per week" },
"3" => { "value" => "In government training into work" },
"4" => { "value" => "Jobseeker" },
"6" => { "value" => "Not seeking work" },

8
spec/models/form/sales/questions/buyer2_working_situation_spec.rb
Unescape View File

@ -26,8 +26,8 @@ RSpec.describe Form::Sales::Questions::Buyer2WorkingSituation, type: :model do
it "has the correct answer_options" do
expect(question.answer_options).to eq({
"1" => { "value" => "Full-time - 30 hours or more" },
"2" => { "value" => "Part-time - Less than 30 hours" },
"1" => { "value" => "Full-time – 30 hours or more per week" },
"2" => { "value" => "Part-time – Less than 30 hours per week" },
"3" => { "value" => "In government training into work" },
"4" => { "value" => "Jobseeker" },
"6" => { "value" => "Not seeking work" },
@ -42,8 +42,8 @@ RSpec.describe Form::Sales::Questions::Buyer2WorkingSituation, type: :model do
it "has the correct displayed_answer_options" do
expect(question.displayed_answer_options(nil)).to eq({
"1" => { "value" => "Full-time - 30 hours or more" },
"2" => { "value" => "Part-time - Less than 30 hours" },
"1" => { "value" => "Full-time – 30 hours or more per week" },
"2" => { "value" => "Part-time – Less than 30 hours per week" },
"3" => { "value" => "In government training into work" },
"4" => { "value" => "Jobseeker" },
"6" => { "value" => "Not seeking work" },

4
spec/models/form/sales/questions/person_working_situation_spec.rb
Unescape View File

@ -23,8 +23,8 @@ RSpec.describe Form::Sales::Questions::PersonWorkingSituation, type: :model do
it "has the correct answer_options" do
expect(question.answer_options).to eq({
"1" => { "value" => "Full-time - 30 hours or more" },
"2" => { "value" => "Part-time - Less than 30 hours" },
"1" => { "value" => "Full-time – 30 hours or more per week" },
"2" => { "value" => "Part-time – Less than 30 hours per week" },
"3" => { "value" => "In government training into work" },
"4" => { "value" => "Jobseeker" },
"6" => { "value" => "Not seeking work" },

Write Preview
Loading…
Cancel
Save