[GYR] Reorder life situations checkboxes and remove must select one l…

…ogic (#5595)
codeforamerica · Feb 28, 2025 · d1b1a11 · d1b1a11
1 parent ce29812
commit d1b1a11
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 24 deletions.
diff --git a/app/forms/life_situations_form.rb b/app/forms/life_situations_form.rb
@@ -1,15 +1,6 @@
 class LifeSituationsForm < QuestionsForm
   set_attributes_for :intake, :was_full_time_student, :primary_us_citizen, :primary_visa, :had_disability, :was_blind
   set_attributes_for :confirmation, :no_life_situations_apply
-  validates :no_life_situations_apply, at_least_one_or_none_of_the_above_selected: true
-
-  def at_least_one_selected
-    was_full_time_student == "yes" ||
-      primary_us_citizen == "yes" ||
-      had_disability == "yes" ||
-      was_blind == "yes" ||
-      primary_visa == "yes"
-  end
 
   def save
     modified_attributes = attributes_for(:intake)

diff --git a/app/forms/spouse_life_situations_form.rb b/app/forms/spouse_life_situations_form.rb
@@ -1,14 +1,6 @@
 class SpouseLifeSituationsForm < QuestionsForm
   set_attributes_for :intake, :spouse_was_full_time_student, :spouse_us_citizen, :spouse_visa, :spouse_had_disability, :spouse_was_blind
   set_attributes_for :confirmation, :no_life_situations_apply
-  validates :no_life_situations_apply, at_least_one_or_none_of_the_above_selected: true
-  def at_least_one_selected
-    spouse_was_full_time_student == "yes" ||
-      spouse_us_citizen == "yes" ||
-      spouse_had_disability == "yes" ||
-      spouse_was_blind == "yes" ||
-      spouse_visa == "yes"
-  end
 
   def save
     modified_attributes = attributes_for(:intake)

diff --git a/app/views/questions/dependents/_form.html.erb b/app/views/questions/dependents/_form.html.erb
@@ -43,9 +43,9 @@
 
           <div class="form-card__stacked-checkboxes">
             <%= f.cfa_checkbox(:was_married, t("views.dependents.form.was_married", :year => "#{current_intake.most_recent_filing_year}"), options: {checked_value: "yes", unchecked_value: "no"}) %>
-            <%= f.cfa_checkbox(:was_student, t("views.dependents.form.was_student"), options: {checked_value: "yes", unchecked_value: "no"}) %>
             <%= f.cfa_checkbox(:us_citizen, t("views.dependents.form.was_citizen"), options: {checked_value: "yes", unchecked_value: "no"}) %>
             <%= f.cfa_checkbox(:north_american_resident, t("views.dependents.form.north_american_resident"), options: {checked_value: "no", unchecked_value: "yes"}) %>
+            <%= f.cfa_checkbox(:was_student, t("views.dependents.form.was_student"), options: {checked_value: "yes", unchecked_value: "no"}) %>
             <%= f.cfa_checkbox(:disabled, t("views.dependents.form.disabled"), options: {checked_value: "yes", unchecked_value: "no"}) %>
             <%= f.cfa_checkbox(:has_ip_pin, t("views.dependents.form.has_ip_pin"), options: {checked_value: "yes", unchecked_value: "no"}) %>
           </div>

diff --git a/app/views/questions/life_situations/edit.html.erb b/app/views/questions/life_situations/edit.html.erb
@@ -9,11 +9,11 @@
       <%=t('views.questions.life_situations.help_text') %>
     </p>
     <div class="form-card__stacked-checkboxes spacing-above-0">
-      <%= f.cfa_checkbox(:had_disability, t('views.questions.life_situations.options.had_disability'), options: { checked_value: "yes", unchecked_value: "no" }) %>
-      <%= f.cfa_checkbox(:was_blind, t('views.questions.life_situations.options.was_blind'), options: { checked_value: "yes", unchecked_value: "no" }) %>
-      <%= f.cfa_checkbox(:was_full_time_student, t('views.questions.life_situations.options.was_full_time_student'), options: { checked_value: "yes", unchecked_value: "no" }) %>
       <%= f.cfa_checkbox(:primary_us_citizen, t('views.questions.life_situations.options.was_citizen'), options: { checked_value: "yes", unchecked_value: "no" }) %>
       <%= f.cfa_checkbox(:primary_visa, t('views.questions.life_situations.options.was_on_visa'), options: { checked_value: "yes", unchecked_value: "no" }) %>
+      <%= f.cfa_checkbox(:was_full_time_student, t('views.questions.life_situations.options.was_full_time_student'), options: { checked_value: "yes", unchecked_value: "no" }) %>
+      <%= f.cfa_checkbox(:was_blind, t('views.questions.life_situations.options.was_blind'), options: { checked_value: "yes", unchecked_value: "no" }) %>
+      <%= f.cfa_checkbox(:had_disability, t('views.questions.life_situations.options.had_disability'), options: { checked_value: "yes", unchecked_value: "no" }) %>
       <%= f.cfa_checkbox(:no_life_situations_apply, t("general.none_of_the_above"), options: { id: "none__checkbox", checked_value: "yes", unchecked_value: "no" }) %>
     </div>
 

diff --git a/app/views/questions/spouse_life_situations/edit.html.erb b/app/views/questions/spouse_life_situations/edit.html.erb
@@ -9,11 +9,11 @@
       <%=t('views.questions.spouse_life_situations.help_text') %>
     </p>
     <div class="form-card__stacked-checkboxes spacing-above-0">
-      <%= f.cfa_checkbox(:spouse_had_disability, t('views.questions.spouse_life_situations.options.had_disability'), options: { checked_value: "yes", unchecked_value: "no" }) %>
-      <%= f.cfa_checkbox(:spouse_was_blind, t('views.questions.spouse_life_situations.options.was_blind'), options: { checked_value: "yes", unchecked_value: "no" }) %>
-      <%= f.cfa_checkbox(:spouse_was_full_time_student, t('views.questions.spouse_life_situations.options.was_full_time_student'), options: { checked_value: "yes", unchecked_value: "no" }) %>
       <%= f.cfa_checkbox(:spouse_us_citizen, t('views.questions.spouse_life_situations.options.was_citizen'), options: { checked_value: "yes", unchecked_value: "no" }) %>
       <%= f.cfa_checkbox(:spouse_visa, t('views.questions.spouse_life_situations.options.was_on_visa'), options: { checked_value: "yes", unchecked_value: "no" }) %>
+      <%= f.cfa_checkbox(:spouse_was_full_time_student, t('views.questions.spouse_life_situations.options.was_full_time_student'), options: { checked_value: "yes", unchecked_value: "no" }) %>
+      <%= f.cfa_checkbox(:spouse_was_blind, t('views.questions.spouse_life_situations.options.was_blind'), options: { checked_value: "yes", unchecked_value: "no" }) %>
+      <%= f.cfa_checkbox(:spouse_had_disability, t('views.questions.spouse_life_situations.options.had_disability'), options: { checked_value: "yes", unchecked_value: "no" }) %>
       <%= f.cfa_checkbox(:no_life_situations_apply, t("general.none_of_the_above"), options: { id: "none__checkbox", checked_value: "yes", unchecked_value: "no" }) %>
     </div>