From f6a99e3108771a5ed48012b2c91044f24410527f Mon Sep 17 00:00:00 2001
From: Manny Dinssa <44172848+Dinssa@users.noreply.github.com>
Date: Thu, 3 Apr 2025 13:19:48 +0100
Subject: [PATCH] CLDC-3991 Update working situation answer options to clarify
 full-time/part-time

---
 .../form/lettings/questions/person_working_situation.rb   | 4 ++--
 app/models/form/lettings/questions/working_situation1.rb  | 4 ++--
 .../form/sales/questions/buyer1_working_situation.rb      | 8 ++++----
 .../form/sales/questions/buyer2_working_situation.rb      | 8 ++++----
 .../form/sales/questions/person_working_situation.rb      | 8 ++++----
 .../lettings/questions/person_working_situation_spec.rb   | 4 ++--
 .../form/sales/questions/buyer1_working_situation_spec.rb | 4 ++--
 .../form/sales/questions/buyer2_working_situation_spec.rb | 8 ++++----
 .../form/sales/questions/person_working_situation_spec.rb | 4 ++--
 9 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/app/models/form/lettings/questions/person_working_situation.rb b/app/models/form/lettings/questions/person_working_situation.rb
index cc4644f48..f6b16e6b8 100644
--- a/app/models/form/lettings/questions/person_working_situation.rb
+++ b/app/models/form/lettings/questions/person_working_situation.rb
@@ -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" },
diff --git a/app/models/form/lettings/questions/working_situation1.rb b/app/models/form/lettings/questions/working_situation1.rb
index dbaf4fc7a..7e754d96b 100644
--- a/app/models/form/lettings/questions/working_situation1.rb
+++ b/app/models/form/lettings/questions/working_situation1.rb
@@ -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" },
diff --git a/app/models/form/sales/questions/buyer1_working_situation.rb b/app/models/form/sales/questions/buyer1_working_situation.rb
index 30ca41ac4..e025e98ad 100644
--- a/app/models/form/sales/questions/buyer1_working_situation.rb
+++ b/app/models/form/sales/questions/buyer1_working_situation.rb
@@ -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" },
diff --git a/app/models/form/sales/questions/buyer2_working_situation.rb b/app/models/form/sales/questions/buyer2_working_situation.rb
index 0e69d09d3..db83b79b1 100644
--- a/app/models/form/sales/questions/buyer2_working_situation.rb
+++ b/app/models/form/sales/questions/buyer2_working_situation.rb
@@ -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" },
diff --git a/app/models/form/sales/questions/person_working_situation.rb b/app/models/form/sales/questions/person_working_situation.rb
index ab31561fa..38787b72c 100644
--- a/app/models/form/sales/questions/person_working_situation.rb
+++ b/app/models/form/sales/questions/person_working_situation.rb
@@ -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" },
diff --git a/spec/models/form/lettings/questions/person_working_situation_spec.rb b/spec/models/form/lettings/questions/person_working_situation_spec.rb
index 4dd6a0065..5f6ed1455 100644
--- a/spec/models/form/lettings/questions/person_working_situation_spec.rb
+++ b/spec/models/form/lettings/questions/person_working_situation_spec.rb
@@ -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" },
diff --git a/spec/models/form/sales/questions/buyer1_working_situation_spec.rb b/spec/models/form/sales/questions/buyer1_working_situation_spec.rb
index 0e1b02257..b16bb7b9e 100644
--- a/spec/models/form/sales/questions/buyer1_working_situation_spec.rb
+++ b/spec/models/form/sales/questions/buyer1_working_situation_spec.rb
@@ -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" },
diff --git a/spec/models/form/sales/questions/buyer2_working_situation_spec.rb b/spec/models/form/sales/questions/buyer2_working_situation_spec.rb
index c8ee349b6..2e8c3e793 100644
--- a/spec/models/form/sales/questions/buyer2_working_situation_spec.rb
+++ b/spec/models/form/sales/questions/buyer2_working_situation_spec.rb
@@ -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" },
diff --git a/spec/models/form/sales/questions/person_working_situation_spec.rb b/spec/models/form/sales/questions/person_working_situation_spec.rb
index b09c0bf69..cd6d1587b 100644
--- a/spec/models/form/sales/questions/person_working_situation_spec.rb
+++ b/spec/models/form/sales/questions/person_working_situation_spec.rb
@@ -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" },