Skip to content

Commit

Permalink
bs4 health coverage delete fixes (#4241)
Browse files Browse the repository at this point in the history
  • Loading branch information
@charlienparker @kristinmerbach
charlienparker authored and kristinmerbach committed Sep 10, 2024
1 parent ea2fcec commit 4f9d157
Show file tree
Hide file tree
Showing 8 changed files with 243 additions and 102 deletions.
96 changes: 76 additions & 20 deletions components/financial_assistance/app/assets/javascripts/financial_assistance/benefit.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ function startEditingBenefit(benefit_kind) {
};

function currentlyEditing() {
return $('.interaction-click-control-continue').hasClass('disabled');
return $('.interaction-click-control-continue').hasClass('disabled') || $('#nav-buttons a').hasClass('disabled');
};

function afterDestroyHide(selector_id, kind){
Expand Down Expand Up @@ -48,6 +48,35 @@ function stopEditing() {
$('.driver-question, .instruction-row, .disabled a, .benefits-list, #nav-buttons a, .benefit, .add_new_benefit_kind').removeClass('disabled');
};

function deleteAllBenefits(e, kind) {
benefitList = $('.benefits-list.is_' + kind + ' .benefit');
if (benefitList.length) {
e.preventDefault();
// prompt to delete all these benefits
$("#destroyAllBenefits").modal();

$("#destroyAllBenefits .modal-cancel-button").click(function(e) {
$("#destroyAllBenefits").modal('hide');
$('#has_' + kind + '_health_coverage_true').prop('checked', true).trigger('change');
});

$("#destroyAllBenefits .modal-continue-button").click(function(e) {
$("#destroyAllBenefits").modal('hide');

benefitList.each(function(i, benefit) {
var url = $(benefit).attr('id').replace('benefit_', 'benefits/');
$(benefit).remove();
$.ajax({
type: 'DELETE',
url: url
});
});

$('select#insurance_kind_is_' + kind).prop('selectedIndex', 0);
});
}
}

function handleEsiFields(form, isEsi, isHra, isMvsq) {

// do all the esi specific hiding and showing
Expand Down Expand Up @@ -260,27 +289,54 @@ document.addEventListener("turbolinks:load", function() {
if (event.type === 'keydown' && event.key !== 'Enter') {
return;
}

event.preventDefault();
var self = this;
$("#destroyBenefit").modal();

$("#destroyBenefit .modal-cancel-button").off('click');
$("#destroyBenefit .modal-cancel-button").on('click', function() {
$("#destroyBenefit").modal('hide');
});

var benefit = $(event.target).parents('.benefit')
var benefitList = benefit.parents('.benefits-list')[0];
var url = $(benefit).attr('id').replace('benefit_', 'benefits/');
var kind = $(event.target).data('kind')

$(benefit).remove();

$.ajax({
type: 'DELETE',
url: url
$("#destroyBenefit .modal-continue-button").off('click');
$("#destroyBenefit .modal-continue-button").on('click', function() {
$("#destroyBenefit").modal('hide');

var benefit = $(self).parents('.benefit');
var url = $(benefit).attr('id').replace('benefit_', 'benefits/');
$.ajax({
type: 'DELETE',
url: url,
success: function() {
var benefitList = benefit.parents('.benefits-list')[0];
var kind = $(self).data('kind')

$(benefit).remove();

if (benefitList.querySelectorAll('.benefit').length == 0) {
document.getElementById('new-benefit-form-' + kind).classList.remove('hidden');
$('select#insurance_kind_' + kind).prop('selectedIndex', 0);
document.getElementById('add_new_benefit_kind_' + kind).classList.add('hidden');
} else {
document.getElementById('add_new_benefit_kind_' + kind).classList.remove('hidden');
}
stopEditing()
}
});
});
});

if (benefitList.querySelectorAll('.benefit').length == 0) {
document.getElementById('new-benefit-form-' + kind).classList.remove('hidden');
$('select#insurance_kind_' + kind).prop('selectedIndex', 0);
document.getElementById('add_new_benefit_kind_' + kind).classList.add('hidden');
} else {
document.getElementById('add_new_benefit_kind_' + kind).classList.remove('hidden');
}
stopEditing()
/* DELETING all enrolled benefits on selcting 'no' on Driver Question */
$(document).off('change', '#has_enrolled_health_coverage_false');
$(document).on('change', '#has_enrolled_health_coverage_false', function(e) {
deleteAllBenefits(e, 'enrolled');
});

/* DELETING all eligible benefits on selcting 'no' on Driver Question */
$(document).off('change', '#has_eligible_health_coverage_false');
$(document).on('change', '#has_eligible_health_coverage_false', function(e) {
deleteAllBenefits(e, 'eligible');
});

// stop bs4 code ----------------------------------
Expand All @@ -299,7 +355,7 @@ document.addEventListener("turbolinks:load", function() {
var self = this;

$('#unsavedBenefitChangesWarning').modal('show');
$('.btn.btn-danger').click(function() {
$('.btn.btn-danger, #leave').click(function() {
window.location.href = $(self).attr('href');
});

Expand Down
93 changes: 91 additions & 2 deletions components/financial_assistance/app/views/financial_assistance/benefits/index.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -216,8 +216,97 @@
</div>
<% end %>

<%= render partial: 'financial_assistance/shared/progress_navigation_buttons',
locals: {previous_link: application_applicant_deductions_path(@application, @applicant), next_link: other_questions_application_applicant_path(@application, @applicant), show_back_to_household_button: true } %>
<div id="nav-buttons">
<%= render partial: 'financial_assistance/shared/progress_navigation_buttons',
locals: {previous_link: application_applicant_deductions_path(@application, @applicant), next_link: other_questions_application_applicant_path(@application, @applicant), show_back_to_household_button: true } %>
</div>
</div>

<!-- Hidden destroy benefit modal -->
<div class="modal" id="destroyBenefit" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
<div class="modal-dialog" role="document">
<div class="container pt-2 pb-4 modal-content">
<div class="d-flex mb-4 align-items-center">
<div class="col-auto px-0 mr-1">
<div class="warning-icon icon" alt="Info">&nbsp;</div>
</div>
<div class="col pl-0">
<h4 class="modal-title"><%= l10n('faa.edit.confirm_deletion') %></h4>
</div>
<div class="col-auto px-0">
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<div class="close-icon icon align-self-start m-0" aria-hidden="true">&nbsp;</div>
</button>
</div>
</div>
<div class="modal-body">
<p><%= l10n('faa.edit.sure_remove', income_type: l10n('faa.incomes.benefit')) %></p>
<strong><%= l10n('faa.edit.remove_warning') %></strong>
</div>
<div class="d-flex align-items-center mt-4 justify-content-end">
<button type="button" class="btn outline modal-cancel-button mr-1" data-dismiss="modal"><%= l10n("faa.cancel") %></button>
<button type="button" class="btn error modal-continue-button"><%= l10n("faa.edit.confirm_deletion") %></button>
</div>
</div>
</div>
</div>

<!-- Hidden destroy all benefits modal -->
<div class="modal" id="destroyAllBenefits" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
<div class="modal-dialog" role="document">
<div class="container pt-2 pb-4 modal-content">
<div class="d-flex mb-4 align-items-center">
<div class="col-auto px-0 mr-1">
<div class="warning-icon icon" alt="Info">&nbsp;</div>
</div>
<div class="col pl-0">
<h4 class="modal-title"><%= l10n('faa.edit.confirm_deletion') %></h4>
</div>
<div class="col-auto px-0">
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<div class="close-icon icon align-self-start m-0" aria-hidden="true">&nbsp;</div>
</button>
</div>
</div>
<div class="modal-body">
<p><%= l10n("faa.edit.sure_remove_all", income_type: l10n("faa.incomes.benefit")) %></p>
<strong><%= l10n('faa.edit.remove_warning') %></strong>
</div>
<div class="d-flex align-items-center mt-4 justify-content-end">
<button type="button" class="btn outline modal-cancel-button mr-1" data-dismiss="modal"><%= l10n('faa.cancel') %></button>
<button type="button" class="btn error modal-continue-button"><%= l10n("faa.edit.confirm_deletion") %></button>
</div>
</div>
</div>
</div>

<!-- Hidden unsaved benefits modal -->
<div class="modal" id="unsavedBenefitChangesWarning" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
<div class="modal-dialog" role="document">
<div class="container pt-2 pb-4 modal-content">
<div class="d-flex mb-4 align-items-center">
<div class="col-auto px-0 mr-1">
<div class="warning-icon icon" alt="Info">&nbsp;</div>
</div>
<div class="col pl-0">
<h4 class="modal-title darkblue" id="myModalLabel"><%= l10n('faa.edit.unsaved') %></h4>
</div>
<div class="col-auto px-0">
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<div class="close-icon icon align-self-start m-0" aria-hidden="true">&nbsp;</div>
</button>
</div>
</div>
<div class="modal-body">
<p><%= l10n('faa.edit.leave_warning') %></p>
<strong><%= l10n('faa.edit.remove_warning') %></strong>
</div>
<div class="d-flex align-items-center mt-4 justify-content-end">
<button type="button" class="btn outline mr-1" data-dismiss="modal"><%= l10n('faa.edit.stay') %></button>
<button type="button" id="leave" class="btn error"><%= l10n('faa.edit.leave') %></button>
</div>
</div>
</div>
</div>

<% else %>
Expand Down
16 changes: 8 additions & 8 deletions components/financial_assistance/app/views/financial_assistance/deductions/index.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
<div class="warning-icon icon" alt="Info">&nbsp;</div>
</div>
<div class="col pl-0">
<h4 class="modal-title"><%= l10n('faa.other_incomes.confirm_deletion') %></h4>
<h4 class="modal-title"><%= l10n('faa.edit.confirm_deletion') %></h4>
</div>
<div class="col-auto px-0">
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
Expand All @@ -84,12 +84,12 @@
</div>
</div>
<div class="modal-body">
<p><%= l10n('faa.edit.sure_remove') %></p>
<p><%= l10n('faa.edit.sure_remove', income_type: l10n('faa.incomes.deduction')) %></p>
<strong><%= l10n('faa.edit.remove_warning') %></strong>
</div>
<div class="d-flex align-items-center mt-4 justify-content-end">
<button type="button" class="btn outline modal-cancel-button mr-1" data-dismiss="modal"><%= l10n("faa.edit.do_not_remove") %></button>
<button type="button" class="btn error modal-continue-button"><%= l10n("faa.edit.remove") %></button>
<button type="button" class="btn outline modal-cancel-button mr-1" data-dismiss="modal"><%= l10n("faa.cancel") %></button>
<button type="button" class="btn error modal-continue-button"><%= l10n("faa.edit.confirm_deletion") %></button>
</div>
</div>
</div>
Expand All @@ -104,7 +104,7 @@
<div class="warning-icon icon" alt="Info">&nbsp;</div>
</div>
<div class="col pl-0">
<h4 class="modal-title"><%= l10n('faa.other_incomes.confirm_deletion') %></h4>
<h4 class="modal-title"><%= l10n('faa.edit.confirm_deletion') %></h4>
</div>
<div class="col-auto px-0">
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
Expand All @@ -113,12 +113,12 @@
</div>
</div>
<div class="modal-body">
<p><%= l10n("faa.other_incomes.delete_all") %></p>
<p><%= l10n("faa.edit.sure_remove_all", income_type: l10n("faa.incomes.deduction")) %></p>
<strong><%= l10n('faa.edit.remove_warning') %></strong>
</div>
<div class="d-flex align-items-center mt-4 justify-content-end">
<button type="button" class="btn outline modal-cancel-button mr-1" data-dismiss="modal"><%= l10n('faa.edit.do_not_remove') %></button>
<button type="button" class="btn error modal-continue-button"><%= l10n("faa.edit.remove") %></button>
<button type="button" class="btn outline modal-cancel-button mr-1" data-dismiss="modal"><%= l10n('faa.cancel') %></button>
<button type="button" class="btn error modal-continue-button"><%= l10n("faa.edit.confirm_deletion") %></button>
</div>
</div>
</div>
Expand Down
33 changes: 17 additions & 16 deletions components/financial_assistance/app/views/financial_assistance/incomes/index.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,19 +123,19 @@
<div class="warning-icon icon" alt="warning" aria-hidden="true">&nbsp;</div>
</div>
<div class="mt-1 mb-1">
<h4 class="modal-title darkblue" id="myModalLabel"><%= l10n("faa.incomes.confirm_deletion") %></h4>
<h4 class="modal-title darkblue" id="myModalLabel"><%= l10n("faa.edit.confirm_deletion") %></h4>
</div>
<span tabindex="0" onkeydown="handleButtonKeyDown(event, 'unsaved-delete')" id="unsaved-delete" class="glyphicon glyphicon-remove close" aria-hidden="true" data-dismiss="modal" aria-label="Close"></span>
</div>
<div class="pl-3">
<%= l10n("faa.incomes.remove_all") %>
<%= l10n("faa.edit.sure_remove", income_type: l10n('faa.incomes.job_income').downcase) %>
</div>
<div class="pl-3 pt-3 pb-3">
<strong><%= l10n("faa.other_incomes.cannot_be_undone") %></strong>
<strong><%= l10n("faa.edit.remove_warning") %></strong>
</div>
<div class="pr-3 pt-3 pb-3 align-self-end">
<button type="button" class="mr-2 btn btn-default outline modal-cancel-button"><%= l10n("cancel") %></button>
<button type="button" class="btn error modal-continue-button"><%= l10n("faa.incomes.confirm_deletion") %></button>
<button type="button" class="btn error modal-continue-button"><%= l10n("faa.edit.confirm_deletion") %></button>
</div>
</div>
</div>
Expand All @@ -150,19 +150,19 @@
<div class="warning-icon icon" alt="warning" aria-hidden="true">&nbsp;</div>
</div>
<div class="mt-1 mb-1">
<h4 class="modal-title darkblue" id="myModalLabel"><%= l10n("faa.incomes.confirm_deletion") %></h4>
<h4 class="modal-title darkblue" id="myModalLabel"><%= l10n("faa.edit.confirm_deletion") %></h4>
</div>
<span tabindex="0" onkeydown="handleButtonKeyDown(event, 'unsaved-delete')" id="unsaved-delete" class="glyphicon glyphicon-remove close" aria-hidden="true" data-dismiss="modal" aria-label="Close"></span>
</div>
<div class="pl-3">
<%= l10n("faa.incomes.remove_all") %>
<%= l10n("faa.edit.sure_remove", income_type: l10n('faa.incomes.income')) %>
</div>
<div class="pl-3 pt-3 pb-3">
<strong><%= l10n("faa.other_incomes.cannot_be_undone") %></strong>
<strong><%= l10n("faa.edit.remove_warning") %></strong>
</div>
<div class="pr-3 pt-3 pb-3 align-self-end">
<button type="button" class="mr-2 btn btn-default outline modal-cancel-button"><%= l10n("cancel") %></button>
<button type="button" class="btn error modal-continue-button"><%= l10n("faa.incomes.confirm_deletion") %></button>
<button type="button" class="btn error modal-continue-button"><%= l10n("faa.edit.confirm_deletion") %></button>
</div>
</div>
</div>
Expand All @@ -177,23 +177,24 @@
<div class="warning-icon icon" alt="warning" aria-hidden="true">&nbsp;</div>
</div>
<div class="mt-1 mb-1">
<h4 class="modal-title darkblue" id="myModalLabel"><%= l10n("faa.incomes.confirm_deletion") %></h4>
<h4 class="modal-title darkblue" id="myModalLabel"><%= l10n("faa.edit.confirm_deletion") %></h4>
</div>
<span tabindex="0" onkeydown="handleButtonKeyDown(event, 'unsaved-delete')" id="unsaved-delete" class="glyphicon glyphicon-remove close" aria-hidden="true" data-dismiss="modal" aria-label="Close"></span>
</div>
<div class="pl-3">
<%= l10n("faa.incomes.remove_all") %>
<%= l10n("faa.edit.sure_remove_all", income_type: l10n('faa.incomes.job_income').downcase) %>
</div>
<div class="pl-3 pt-3 pb-3">
<strong><%= l10n("faa.other_incomes.cannot_be_undone") %></strong>
<strong><%= l10n("faa.edit.remove_warning") %></strong>
</div>
<div class="pr-3 pt-3 pb-3 align-self-end">
<button type="button" class="mr-2 btn btn-default outline modal-cancel-button"><%= l10n("cancel") %></button>
<button type="button" class="btn error modal-continue-button"><%= l10n("faa.incomes.confirm_deletion") %></button>
<button type="button" class="btn error modal-continue-button"><%= l10n("faa.edit.confirm_deletion") %></button>
</div>
</div>
</div>
</div>

<!-- Destroy all Exsting Self Employment Incomes (modal) -->
<div class="modal" id="destroyAllSelfEmploymentIncomes" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
<div class="modal-dialog" role="document">
Expand All @@ -203,19 +204,19 @@
<div class="warning-icon icon" alt="warning" aria-hidden="true">&nbsp;</div>
</div>
<div class="mt-1 mb-1">
<h4 class="modal-title darkblue" id="myModalLabel"><%= l10n("faa.incomes.confirm_deletion") %></h4>
<h4 class="modal-title darkblue" id="myModalLabel"><%= l10n("faa.edit.confirm_deletion") %></h4>
</div>
<span tabindex="0" onkeydown="handleButtonKeyDown(event, 'unsaved-delete')" id="unsaved-delete" class="glyphicon glyphicon-remove close" aria-hidden="true" data-dismiss="modal" aria-label="Close"></span>
</div>
<div class="pl-3">
<%= l10n("faa.incomes.remove_all") %>
<%= l10n("faa.edit.sure_remove_all", income_type: l10n('faa.incomes.income').downcase) %>
</div>
<div class="pl-3 pt-3 pb-3">
<strong><%= l10n("faa.other_incomes.cannot_be_undone") %></strong>
<strong><%= l10n("faa.edit.remove_warning") %></strong>
</div>
<div class="pr-3 pt-3 pb-3 align-self-end">
<button type="button" class="mr-2 btn btn-default outline modal-cancel-button"><%= l10n("cancel") %></button>
<button type="button" class="btn error modal-continue-button"><%= l10n("faa.incomes.confirm_deletion") %></button>
<button type="button" class="btn error modal-continue-button"><%= l10n("faa.edit.confirm_deletion") %></button>
</div>
</div>
</div>
Expand Down
Loading

0 comments on commit 4f9d157

Please sign in to comment.