From 49d0dcc3ce4215444ceb088feb7e21a275f596fb Mon Sep 17 00:00:00 2001
From: Alec Turnbull <alecturnbull81@gmail.com>
Date: Mon, 17 Jun 2024 16:01:06 -0500
Subject: [PATCH] accessibility for other questions, family info (#3951)

* navigation, small fixes

* remove change
---
 .../applications_controller.rb                |  8 +-
 .../applicants/other_questions.html.erb       | 90 ++++++++++++-------
 .../en/me/financial_assistance.rb             |  2 +-
 3 files changed, 66 insertions(+), 34 deletions(-)

diff --git a/components/financial_assistance/app/controllers/financial_assistance/applications_controller.rb b/components/financial_assistance/app/controllers/financial_assistance/applications_controller.rb
index 04db8229481..5ecbb31751a 100644
--- a/components/financial_assistance/app/controllers/financial_assistance/applications_controller.rb
+++ b/components/financial_assistance/app/controllers/financial_assistance/applications_controller.rb
@@ -6,7 +6,7 @@ class ApplicationsController < FinancialAssistance::ApplicationController
     before_action :set_current_person
     before_action :set_family
     before_action :find_application, :except => [:index, :index_with_filter, :new, :review, :raw_application]
-    before_action :enable_bs4_layout, only: [:application_year_selection, :application_checklist, :eligibility_results, :submit_your_application, :wait_for_eligibility_response] if EnrollRegistry.feature_enabled?(:bs4_consumer_flow)
+    before_action :enable_bs4_layout, only: [:application_year_selection, :application_checklist, :edit, :eligibility_results, :submit_your_application, :wait_for_eligibility_response] if EnrollRegistry.feature_enabled?(:bs4_consumer_flow)
 
     around_action :cache_current_hbx, :only => [:index_with_filter]
 
@@ -384,8 +384,10 @@ def enable_bs4_layout
 
     def resolve_layout
       case action_name
-      when "edit", "step", "review_and_submit", "eligibility_response_error", "application_publish_error", "preferences"
-        "financial_assistance_nav"
+      when "step", "review_and_submit", "eligibility_response_error", "application_publish_error", "preferences"
+        "financial_assistance_progress"
+      when "edit"
+        EnrollRegistry.feature_enabled?(:bs4_consumer_flow) ? "financial_assistance_progress" : "financial_assistance_nav"
       when "submit_your_application"
         EnrollRegistry.feature_enabled?(:bs4_consumer_flow) ? "financial_assistance_progress" : "financial_assistance_nav"
       when "application_year_selection", "application_checklist"
diff --git a/components/financial_assistance/app/views/financial_assistance/applicants/other_questions.html.erb b/components/financial_assistance/app/views/financial_assistance/applicants/other_questions.html.erb
index 90e878c5613..8197964725c 100644
--- a/components/financial_assistance/app/views/financial_assistance/applicants/other_questions.html.erb
+++ b/components/financial_assistance/app/views/financial_assistance/applicants/other_questions.html.erb
@@ -18,8 +18,10 @@
       <% if @applicant.present? && @applicant.no_ssn == "1" && @applicant.is_applying_coverage %>
         <fieldset class="mb-4 row-form-wrapper">
           <legend class="weight-n required"><%= applicant_prompt('ssn_apply') %></legend>
-          <label class="weight-n"><%= f.radio_button :is_ssn_applied, true, id: "is_ssn_applied_yes" %> <%= l10n('yes') %></label>
-          <label class="weight-n"><%= f.radio_button :is_ssn_applied, false, id: "is_ssn_applied_no" %> <%= l10n('no') %></label>
+          <div class="focus d-inline-flex">
+            <label class="weight-n"><%= f.radio_button :is_ssn_applied, true, id: "is_ssn_applied_yes" %> <%= l10n('yes') %></label>
+            <label class="weight-n"><%= f.radio_button :is_ssn_applied, false, id: "is_ssn_applied_no" %> <%= l10n('no') %></label>
+          </div>
         </fieldset>
 
           <% no_ssn_dropdown = FinancialAssistanceRegistry.feature_enabled?(:no_ssn_reason_dropdown) %>
@@ -40,8 +42,10 @@
       <div class="mb-4 row-form-wrapper">
         <fieldset>
           <legend class="weight-n required"><%= applicant_prompt('is_pregnant') %></legend>
-          <label class="weight-n"><%= f.radio_button :is_pregnant, true, id: "is_pregnant_yes" %> <%= l10n('yes') %></label>
-          <label class="weight-n"><%= f.radio_button :is_pregnant, false, id: "is_pregnant_no" %> <%= l10n('no') %></label>
+          <div class="focus d-inline-flex">
+            <label class="weight-n"><%= f.radio_button :is_pregnant, true, id: "is_pregnant_yes" %> <%= l10n('yes') %></label>
+            <label class="weight-n"><%= f.radio_button :is_pregnant, false, id: "is_pregnant_no" %> <%= l10n('no') %></label>
+          </div>
         </fieldset>
         <div>
           <a href="#is_pregnant" data-toggle="modal" data-target="#is_pregnant"><%= l10n('faa.question.not_sure') %></a>
@@ -66,8 +70,10 @@
       <fieldset class="mb-4 row-form-wrapper">
         <% post_partum_prompt_key = FinancialAssistanceRegistry.feature_enabled?(:post_partum_period_one_year) ? "pregnant_last_year" : "pregnant_last_60d" %>
         <legend class="weight-n required"><%= applicant_prompt(FinancialAssistanceRegistry.feature_enabled?(:post_partum_period_one_year) ? "pregnant_last_year" : "pregnant_last_60d") %></legend>
-        <label class="weight-n"><%= f.radio_button :is_post_partum_period, true, id: "is_post_partum_period_yes" %> <%= l10n('yes') %></label>
-        <label class="weight-n"><%= f.radio_button :is_post_partum_period, false, id: "is_post_partum_period_no" %> <%= l10n('no') %></label>
+        <div class="focus d-inline-flex">
+          <label class="weight-n"><%= f.radio_button :is_post_partum_period, true, id: "is_post_partum_period_yes" %> <%= l10n('yes') %></label>
+          <label class="weight-n"><%= f.radio_button :is_post_partum_period, false, id: "is_post_partum_period_no" %> <%= l10n('no') %></label>
+        </div>
       </fieldset>
 
       <fieldset class="mb-4 row-form-wrapper">
@@ -80,14 +86,18 @@
       <% if @applicant.present? && @applicant.is_applying_coverage %>
         <fieldset class="mb-4 row-form-wrapper">
           <legend class="weight-n required"><%= applicant_prompt("is_enrolled_on_medicaid") %></legend>
-          <label class="weight-n"><%= f.radio_button :is_enrolled_on_medicaid, true, id: "medicaid_pregnancy_yes" %> <%= l10n('yes') %></label>
-          <label class="weight-n"><%= f.radio_button :is_enrolled_on_medicaid, false, id: "medicaid_pregnancy_no" %> <%= l10n('no') %></label>
+          <div class="focus d-inline-flex">
+            <label class="weight-n"><%= f.radio_button :is_enrolled_on_medicaid, true, id: "medicaid_pregnancy_yes" %> <%= l10n('yes') %></label>
+            <label class="weight-n"><%= f.radio_button :is_enrolled_on_medicaid, false, id: "medicaid_pregnancy_no" %> <%= l10n('no') %></label>
+          </div>
         </fieldset>
 
         <fieldset class="mb-4 row-form-wrapper">
           <legend class="weight-n required"><%= applicant_prompt("foster_care_at18") %></legend>
-          <label class="weight-n"><%= f.radio_button :is_former_foster_care, true, id: "medicaid_pregnancy_yes" %> <%= l10n('yes') %></label>
-          <label class="weight-n"><%= f.radio_button :is_former_foster_care, false, id: "medicaid_pregnancy_no" %> <%= l10n('no') %></label>
+          <div class="focus d-inline-flex">
+            <label class="weight-n"><%= f.radio_button :is_former_foster_care, true, id: "medicaid_pregnancy_yes" %> <%= l10n('yes') %></label>
+            <label class="weight-n"><%= f.radio_button :is_former_foster_care, false, id: "medicaid_pregnancy_no" %> <%= l10n('no') %></label>
+          </div>
         </fieldset>
 
         <fieldset class="mb-4 row-form-wrapper">
@@ -106,15 +116,19 @@
 
         <fieldset class="mb-4 row-form-wrapper">
           <legend class="weight-n"><%= applicant_prompt("foster_care_medicaid") %></legend>
-          <label class="weight-n"><%= f.radio_button :had_medicaid_during_foster_care, true, id: "had_medicaid_during_foster_care_yes" %> <%= l10n('yes') %></label>
-          <label class="weight-n"><%= f.radio_button :had_medicaid_during_foster_care, false, id: "had_medicaid_during_foster_care_no" %> <%= l10n('no') %></label>
+          <div class="focus d-inline-flex">
+            <label class="weight-n"><%= f.radio_button :had_medicaid_during_foster_care, true, id: "had_medicaid_during_foster_care_yes" %> <%= l10n('yes') %></label>
+            <label class="weight-n"><%= f.radio_button :had_medicaid_during_foster_care, false, id: "had_medicaid_during_foster_care_no" %> <%= l10n('no') %></label>
+          </div>
         </fieldset>
 
         <% if @applicant.display_student_question? %>
           <fieldset class="mb-4 row-form-wrapper">
             <legend class="weight-n"><%= applicant_prompt("is_student") %></legend>
-            <label class="weight-n"><%= f.radio_button :is_student, true, id: "is_student_yes" %> <%= l10n('yes') %></label>
-            <label class="weight-n"><%= f.radio_button :is_student, false, id: "is_student_no" %> <%= l10n('no') %></label>
+            <div class="focus d-inline-flex">
+              <label class="weight-n"><%= f.radio_button :is_student, true, id: "is_student_yes" %> <%= l10n('yes') %></label>
+              <label class="weight-n"><%= f.radio_button :is_student, false, id: "is_student_no" %> <%= l10n('no') %></label>
+            </div>
           </fieldset>
 
           <% if FinancialAssistanceRegistry.feature_enabled?(:student_follow_up_questions) %>
@@ -145,8 +159,10 @@
         <div class="mb-4 row-form-wrapper">
           <fieldset>
             <legend class="weight-n <%= 'required' if is_question_required %>"><%= applicant_prompt("is_blind") %></legend>
-            <label class="weight-n"><%= f.radio_button :is_self_attested_blind, true, id: "is_self_attested_blind_yes" %> <%= l10n('yes') %></label>
-            <label class="weight-n"><%= f.radio_button :is_self_attested_blind, false, id: "is_self_attested_blind_no" %> <%= l10n('no') %></label>
+            <div class="focus d-inline-flex">
+              <label class="weight-n"><%= f.radio_button :is_self_attested_blind, true, id: "is_self_attested_blind_yes" %> <%= l10n('yes') %></label>
+              <label class="weight-n"><%= f.radio_button :is_self_attested_blind, false, id: "is_self_attested_blind_no" %> <%= l10n('no') %></label>
+            </div>
           </fieldset>
           <div>
             <a href="#is_self_assisted_blind" data-toggle="modal" data-target="#is_self_assisted_blind"><%= l10n('faa.question.not_sure') %></a>
@@ -157,8 +173,10 @@
         <div class="mb-4 row-form-wrapper">
           <fieldset>
             <legend class="weight-n <%= 'required' if is_question_required %>"><%= applicant_prompt("daily_living_help") %></legend>
-            <label class="weight-n"><%= f.radio_button :has_daily_living_help, true, id: "has_daily_living_help_yes" %> <%= l10n('yes') %></label>
-            <label class="weight-n"><%= f.radio_button :has_daily_living_help, false, id: "has_daily_living_help_no" %> <%= l10n('no') %></label>
+            <div class="focus d-inline-flex">
+              <label class="weight-n"><%= f.radio_button :has_daily_living_help, true, id: "has_daily_living_help_yes" %> <%= l10n('yes') %></label>
+              <label class="weight-n"><%= f.radio_button :has_daily_living_help, false, id: "has_daily_living_help_no" %> <%= l10n('no') %></label>
+            </div>
           </fieldset>
           <div>
             <a href="#has_daily_living_help" data-toggle="modal" data-target="#has_daily_living_help"><%= l10n('faa.question.not_sure') %></a>
@@ -169,8 +187,10 @@
         <div class="mb-4 row-form-wrapper">
           <fieldset>
             <legend class="weight-n <%= 'required' if is_question_required %>"><%= applicant_prompt("help_paying_bills") %></legend>
-            <label class="weight-n"><%= f.radio_button :need_help_paying_bills, true, id: "need_help_paying_bills_yes" %> <%= l10n('yes') %></label>
-            <label class="weight-n"><%= f.radio_button :need_help_paying_bills, false, id: "need_help_paying_bills_no" %> <%= l10n('no') %></label>
+            <div class="focus d-inline-flex">
+              <label class="weight-n"><%= f.radio_button :need_help_paying_bills, true, id: "need_help_paying_bills_yes" %> <%= l10n('yes') %></label>
+              <label class="weight-n"><%= f.radio_button :need_help_paying_bills, false, id: "need_help_paying_bills_no" %> <%= l10n('no') %></label>
+            </div>
           </fieldset>
           <div>
             <a href="#need_help_paying_bills" data-toggle="modal" data-target="#need_help_paying_bills"><%= l10n('faa.question.not_sure') %></a>
@@ -181,8 +201,10 @@
         <div class="mb-4 row-form-wrapper">
           <fieldset>
             <legend class="weight-n <%= 'required' if is_question_required %>"><%= applicant_prompt("disability_question") %></legend>
-            <label class="weight-n"><%= f.radio_button :is_physically_disabled, true, id: "radio_physically_disabled_yes" %> <%= l10n('yes') %></label>
-            <label class="weight-n"><%= f.radio_button :is_physically_disabled, false, id: "radio_physically_disabled_no" %> <%= l10n('no') %></label>
+            <div class="focus d-inline-flex">
+              <label class="weight-n"><%= f.radio_button :is_physically_disabled, true, id: "radio_physically_disabled_yes" %> <%= l10n('yes') %></label>
+              <label class="weight-n"><%= f.radio_button :is_physically_disabled, false, id: "radio_physically_disabled_no" %> <%= l10n('no') %></label>
+            </div>
           </fieldset>
           <div>
             <a href="#is_physically_disabled" data-toggle="modal" data-target="#is_physically_disabled"><%= l10n('faa.question.not_sure') %></a>
@@ -194,8 +216,10 @@
           <div class="mb-4 row-form-wrapper">
             <fieldset>
               <legend class="weight-n required"><%= applicant_prompt("primary_caretaker_question_text") %></legend>
-              <label class="weight-n"><%= f.radio_button :is_primary_caregiver, true, id: "is_primary_caregiver_yes" %> <%= l10n('yes') %></label>
-              <label class="weight-n"><%= f.radio_button :is_primary_caregiver, false, id: "is_primary_caregiver_no" %> <%= l10n('no') %></label>
+              <div class="focus d-inline-flex">
+                <label class="weight-n"><%= f.radio_button :is_primary_caregiver, true, id: "is_primary_caregiver_yes" %> <%= l10n('yes') %></label>
+                <label class="weight-n"><%= f.radio_button :is_primary_caregiver, false, id: "is_primary_caregiver_no" %> <%= l10n('no') %></label>
+              </div>
             </fieldset>
             <div>
               <a href="#primary_caretaker_question" data-toggle="modal" data-target="#primary_caretaker_question"><%= l10n('faa.question.not_sure') %></a>
@@ -216,21 +240,27 @@
         <% if @applicant.eligible_immigration_status.present? %>
           <fieldset class="mb-4 row-form-wrapper">
             <legend class="weight-n"> <%= l10n("faa.other_ques.is_resident_post_092296") %></legend>
-            <label class="weight-n"><%= f.radio_button :is_resident_post_092296, true, id: "is_resident_post_092296_yes" %> <%= l10n('yes') %></label>
-            <label class="weight-n"><%= f.radio_button :is_resident_post_092296, false, id: "is_resident_post_092296_no" %> <%= l10n('no') %></label>
+            <div class="focus d-inline-flex">
+              <label class="weight-n"><%= f.radio_button :is_resident_post_092296, true, id: "is_resident_post_092296_yes" %> <%= l10n('yes') %></label>
+              <label class="weight-n"><%= f.radio_button :is_resident_post_092296, false, id: "is_resident_post_092296_no" %> <%= l10n('no') %></label>
+            </div>
           </fieldset>
 
           <fieldset class="mb-4 row-form-wrapper">
             <legend class="weight-n"> <%= l10n("faa.other_ques.is_veteran_or_active_military") %></legend>
-            <label class="weight-n"><%= f.radio_button :is_veteran_or_active_military, true, id: "is_veteran_or_active_military_yes" %> <%= l10n('yes') %></label>
-            <label class="weight-n"><%= f.radio_button :is_veteran_or_active_military, false, id: "is_veteran_or_active_military_no" %> <%= l10n('no') %></label>
+            <div class="focus d-inline-flex">
+              <label class="weight-n"><%= f.radio_button :is_veteran_or_active_military, true, id: "is_veteran_or_active_military_yes" %> <%= l10n('yes') %></label>
+              <label class="weight-n"><%= f.radio_button :is_veteran_or_active_military, false, id: "is_veteran_or_active_military_no" %> <%= l10n('no') %></label>
+            </div>
           </fieldset>
         <% end %>
       
         <fieldset class="mb-4 row-form-wrapper">
           <legend class="weight-n"> <%= l10n("faa.other_ques.is_vets_spouse_or_child") %></legend>
-          <label class="weight-n"><%= f.radio_button :is_vets_spouse_or_child, true, id: "is_vets_spouse_or_child_yes" %> <%= l10n('yes') %></label>
-          <label class="weight-n"><%= f.radio_button :is_vets_spouse_or_child, false, id: "is_vets_spouse_or_child_no" %> <%= l10n('no') %></label>
+          <div class="focus d-inline-flex">
+            <label class="weight-n"><%= f.radio_button :is_vets_spouse_or_child, true, id: "is_vets_spouse_or_child_yes" %> <%= l10n('yes') %></label>
+            <label class="weight-n"><%= f.radio_button :is_vets_spouse_or_child, false, id: "is_vets_spouse_or_child_no" %> <%= l10n('no') %></label>
+          </div>
         </fieldset>
 
       <% end %>
diff --git a/components/financial_assistance/db/seedfiles/translations/en/me/financial_assistance.rb b/components/financial_assistance/db/seedfiles/translations/en/me/financial_assistance.rb
index fdde5f78557..f66bc78f9ce 100644
--- a/components/financial_assistance/db/seedfiles/translations/en/me/financial_assistance.rb
+++ b/components/financial_assistance/db/seedfiles/translations/en/me/financial_assistance.rb
@@ -213,7 +213,7 @@
   "en.faa.parent_living_outside_of_home_1" => "If yes, I know that, if anyone in my application group is found eligible for MaineCare, I will be asked to cooperate with the Child Support Agency ",
   "en.faa.parent_living_outside_of_home_2" => "to collect medical support from the parent who lives outside the home. If I think that cooperating to collect medical support will harm me or my children, ",
   "en.faa.parent_living_outside_of_home_3" => "I can tell my caseworker and I may not have to cooperate.",
-  "en.submission_terms_question" => "I have reviewed the information in this application and I attest, under penalty of perjury, that it is accurate and complete to the best of my knowledge. I understand that if I am not truthful, there may be a penalty."
+  "en.submission_terms_question" => "I have reviewed the information in this application and I attest, under penalty of perjury, that it is accurate and complete to the best of my knowledge. I understand that if I am not truthful, there may be a penalty.",
   "en.electronic_signature" => "Electronic Signature",
   "en.submit_application" => "Submit Application",
   "en.submit_application_header" => "Submit Your Application",