Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bs4 fix ssn exclusivity #4316

Merged
merged 7 commits into from
Aug 15, 2024
Merged

bs4 fix ssn exclusivity #4316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
83ab3f4
apply missing class used to ensure exclusivity on dep ssn fields
charlienparker Aug 14, 2024
67e4a4e
add classes and ids to other forms
charlienparker Aug 14, 2024
a0323b7
allow submit to not be listened
charlienparker Aug 14, 2024
fd91826
only exclusive when creating not editing
charlienparker Aug 14, 2024
98c0fdc
restore time jump
charlienparker Aug 14, 2024
8d401e5
restore edit
charlienparker Aug 14, 2024
6f0cc15
fix syntax
charlienparker Aug 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions app/views/insured/family_members/_dependent_form.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<% if @bs4 %>
<div id="<%= employee_dependent_form_id(dependent) %>" class="dependent_list">
<h2><%= dependent.id.present? ? l10n("edit_member") : l10n("add_member") %></h2>
<% is_editing = dependent.id.present? %>
<h2><%= is_editing ? l10n("edit_member") : l10n("add_member") %></h2>
<div id="add_info_<%= dependent.id %>" class="<%= pundit_class Family, :updateable? %>">
<%= form_for dependent, employee_dependent_submission_options_for(dependent) do |f| %>
<%= hidden_field_tag :consumer_role_id, params[:consumer_role_id] %>
Expand Down Expand Up @@ -65,7 +66,7 @@
</div>
</div>

<div class="d-flex mb-md-4">
<div class="d-flex mb-md-4 <%= 'new_dependent' unless is_editing %>">
<div class="col-md-6 col-lg-3 p-0">
<%= f.label :ssn, "Social Security" %>
<% if EnrollRegistry.feature_enabled?(:ssn_ui_validation) %>
Expand Down
13 changes: 7 additions & 6 deletions ...s/financial_assistance/app/views/financial_assistance/applicants/_dependent_form.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<% if @bs4 %>
<% dependent = @applicant %>
<div id="<%= employee_dependent_form_id(dependent) %>" class="dependent_list">
<h2><%= dependent.id.present? ? l10n("edit_member") : l10n("add_member") %></h2>
<% is_editing = dependent.id.present? %>
<h2><%= is_editing ? l10n("edit_member") : l10n("add_member") %></h2>
<div id="add_info_<%= dependent.id %>" class="<%= pundit_class Family, :updateable? %>">
<%= form_for @applicant, {url: application_applicants_path(@application), as: :applicant, remote: true} do |f| %>
<%= hidden_field_tag :consumer_role_id, params[:consumer_role_id] %>
Expand Down Expand Up @@ -65,21 +66,21 @@
</div>
</div>

<div class="d-flex mb-md-4">
<div class="col-md-6 col-lg-3 p-0">
<div class="d-flex mb-md-4 <%= 'new_dependent' unless is_editing %>">
<div class="col-md-6 col-lg-3 p-0 ">
<%= f.label :ssn, "Social Security" %>
<% if EnrollRegistry.feature_enabled?(:ssn_ui_validation) %>
<%= f.text_field :ssn, placeholder: "000-00-0000", class: "required keep-label mask-ssn",
<%= f.text_field :ssn, placeholder: "000-00-0000", id: "dependent_ssn", class: "required keep-label mask-ssn",
pattern: "(?!666|000|9\\d{2})\\d{3}[\\- ]{0,1}(?!00)\\d{2}[\\- ]{0,1}(?!0{4})\\d{4}", oninvalid: "this.setCustomValidity('Invalid Social Security number.')",
oninput: "this.setCustomValidity('')", disabled: false, readonly: f.object.is_a?(Forms::EmployeeRole) %>
<% else %>
<%= f.text_field :ssn, placeholder: "000-00-0000", class: "required", disabled: false,
<%= f.text_field :ssn, placeholder: "000-00-0000", id: "dependent_ssn", class: "required", disabled: false,
readonly: f.object.is_a?(Forms::EmployeeRole) %>
<% end %>
</div>
<div class="col-md-6 col-lg-3 p-0 pt-md-4 no-ssn-container mr-auto">
<%= f.label :no_ssn, class: "mt-1 d-inline-block" do %>
<%= f.check_box :no_ssn %><span class='no_ssn'><%= l10n("do_not_have_ssn") %></span>
<%= f.check_box :no_ssn, id: "dependent_no_ssn" %><span class='no_ssn'><%= l10n("do_not_have_ssn") %></span>
<a href="#no_ssn_info" data-toggle="modal" data-target="#no_ssn_info" class="d-block"><%= l10n("not_sure") %></a>
<%= render partial: 'shared/modal_support_text_household', locals: {key: "no_ssn_info"} %>
<% end %>
Expand Down
Loading