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

Nj 182 review screen #5303

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open

Nj 182 review screen #5303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d62b2d5
basic content edits
aloverso Dec 30, 2024
b7376dd
update to Review and Edit
aloverso Dec 30, 2024
4669f4f
missing health insurance section
aloverso Dec 30, 2024
7cddaa5
qss review
aloverso Dec 30, 2024
0d80ffa
content doc updates
aloverso Dec 30, 2024
1b41915
normalize
aloverso Dec 30, 2024
f06773f
county muni section content
aloverso Dec 30, 2024
f3183a3
fix test failure
aloverso Dec 30, 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
178 changes: 102 additions & 76 deletions app/views/state_file/questions/nj_review/edit.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<%= render "state_file/questions/shared/review_header" %>

<% if current_intake.dependents.count(&:under_22?).positive? %>
<div id="college-dependents" class="white-group">
<section id="college-dependents" class="white-group">
<div class="spacing-below-5">
<h2 class="text--body text--bold spacing-below-5"><%=t(".college_dependents") %></h2>
<% current_intake.dependents.each do | dependent | %>
Expand All @@ -16,171 +16,195 @@
<p><%= t("general.none") %></p>
<% end %>
<%= link_to StateFile::Questions::NjCollegeDependentsExemptionController.to_path_helper(return_to_review: "y"), class: "button--small" do %>
<%= t("general.edit") %>
<%= t(".review_and_edit") %>
<span class="sr-only"><%= t(".college_dependents") %></span>
<% end %>
</div>
</div>
</section>
<% end %>

<div id="county" class="white-group">
<div class="spacing-below-5">
<h2 class="text--body text--bold spacing-below-5"><%=t(".county") %></h2>
<p><%=current_intake.county %></p>
<%= link_to StateFile::Questions::NjCountyController.to_path_helper(return_to_review: "y"), class: "button--small" do %>
<%= t("general.edit") %>
<span class="sr-only"><%= t(".county") %></span>
<% end %>
</div>
</div>
<% if current_intake.eligibility_all_members_health_insurance_no? %>
<section id="missing-health-insurance" class="white-group">
<div class="spacing-below-5">
<h2 class="text--body text--bold spacing-below-5"><%=t(".missing_health_insurance") %></h2>
<% current_intake.dependents.each do | dependent | %>
<% if dependent.nj_did_not_have_health_insurance_yes? %>
<p><%=dependent.full_name %></p>
<% end %>
<% end %>
<% if current_intake.dependents.all? { |dependent| dependent.nj_did_not_have_health_insurance_no? } %>
<p><%= t("general.none") %></p>
<% end %>
</div>
</section>
<% end %>

<% if current_intake.filing_status_qw? %>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[dust] - Is there a guideline about when we use qw vs qss?

<section id="year-of-death" class="white-group">
<div class="spacing-below-5">
<h2 class="text--body text--bold spacing-below-5"><%=t(".year_of_death") %></h2>
<p><%=current_intake.spouse_death_year %></p>

<div id="municipality" class="white-group">
<%= link_to StateFile::Questions::NjYearOfDeathController.to_path_helper(return_to_review: "y"), class: "button--small" do %>
<%= t(".review_and_edit") %>
<span class="sr-only"><%= t(".year_of_death") %></span>
<% end %>
</div>
</section>
<% end %>

<section id="county-municipality" class="white-group">
<div class="spacing-below-5">
<h2 class="text--body text--bold spacing-below-5"><%=t(".municipality") %></h2>
<p><%=current_intake.municipality_name %></p>
<%= link_to StateFile::Questions::NjMunicipalityController.to_path_helper(return_to_review: "y"), class: "button--small" do %>
<%= t("general.edit") %>
<span class="sr-only"><%= t(".municipality") %></span>
<h2 class="text--body text--bold spacing-below-5"><%=t(".county_municipality", filing_year: current_tax_year) %></h2>
<p><%=current_intake.county %>, <%=current_intake.municipality_name %></p>

<%= link_to StateFile::Questions::NjCountyController.to_path_helper(return_to_review: "y"), class: "button--small" do %>
<%= t(".review_and_edit") %>
<span class="sr-only"><%= t(".county_municipality") %></span>
<% end %>
</div>
</div>
</section>

<% if !current_intake.primary_disabled_unfilled? || !current_intake.spouse_disabled_unfilled? %>
<div id="disabled_exemption" class="white-group">
<section id="disabled_exemption" class="white-group">
<div class="spacing-below-5">
<% if !current_intake.primary_disabled_unfilled? %>
<h2 class="text--body text--bold spacing-below-5"><%=t(".primary_disabled") %></h2>
<p><%= current_intake.primary_disabled %></p>
<% end %>
<% if !current_intake.spouse_disabled_unfilled? %>
<h2 class="text--body text--bold spacing-below-5"><%=t(".spouse_disabled") %></h2>
<p><%= current_intake.spouse_disabled %></p>
<% end %>
<% unless current_intake.primary_disabled_unfilled? %>
<h2 class="text--body text--bold spacing-below-5"><%= t(".primary_disabled") %></h2>
<p><%= current_intake.primary_disabled_yes? ? t("general.affirmative") : t("general.negative") %></p>
<% end %>
<% unless current_intake.spouse_disabled_unfilled? %>
<h2 class="text--body text--bold spacing-below-5"><%= t(".spouse_disabled") %></h2>
<p><%= current_intake.spouse_disabled_yes? ? t("general.affirmative") : t("general.negative") %></p>
<% end %>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[pebble] there seem to be a few of these <% end %> with two spaces throughout the file, some already here and some new

<%= link_to StateFile::Questions::NjDisabledExemptionController.to_path_helper(return_to_review: "y"), class: "button--small" do %>
<%= t("general.edit") %>
<%= t(".review_and_edit") %>
<span class="sr-only"><%= t(".edit_disability")%></span>
<% end %>
</div>
</div>
</section>
<% end %>

<% if !current_intake.primary_veteran_unfilled? || !current_intake.spouse_veteran_unfilled? %>
<div id="veterans_exemption" class="white-group">
<section id="veterans_exemption" class="white-group">
<div class="spacing-below-5">
<% if !current_intake.primary_veteran_unfilled? %>
<h2 class="text--body text--bold spacing-below-5"><%=t(".primary_veteran") %></h2>
<p><%= current_intake.primary_veteran %></p>
<% end %>
<% if !current_intake.spouse_veteran_unfilled? %>
<h2 class="text--body text--bold spacing-below-5"><%=t(".spouse_veteran") %></h2>
<p><%= current_intake.spouse_veteran %></p>
<% end %>
<% unless current_intake.primary_veteran_unfilled? %>
<h2 class="text--body text--bold spacing-below-5"><%= t(".primary_veteran") %></h2>
<p><%= current_intake.primary_veteran_yes? ? t("general.affirmative") : t("general.negative") %></p>
<% end %>
<% unless current_intake.spouse_veteran_unfilled? %>
<h2 class="text--body text--bold spacing-below-5"><%= t(".spouse_veteran") %></h2>
<p><%= current_intake.spouse_veteran_yes? ? t("general.affirmative") : t("general.negative") %></p>
<% end %>
<%= link_to StateFile::Questions::NjVeteransExemptionController.to_path_helper(return_to_review: "y"), class: "button--small" do %>
<%= t("general.edit") %>
<%= t(".review_and_edit") %>
<span class="sr-only"><%= t(".edit_veteran") %></span>
<% end %>
</div>
</div>
</section>
<% end %>

<%# Dependents %>

<div id="medical_expenses" class="white-group">
<section id="medical_expenses" class="white-group">
<div class="spacing-below-5">
<h2 class="text--body text--bold spacing-below-5"><%=t(".medical_expenses") %></h2>
<p><%= number_to_currency(current_intake.medical_expenses, precision: 0) %></p>
<%= link_to StateFile::Questions::NjMedicalExpensesController.to_path_helper(return_to_review: "y"), class: "button--small" do %>
<%= t("general.edit") %>
<%= t(".review_and_edit") %>
<span class="sr-only"><%= t(".medical_expenses") %></span>
<% end %>
</div>
</div>
</section>

<div id="property-tax" class="white-group">
<section id="property-tax" class="white-group">
<div class="spacing-below-5">
<h2 class="text--body text--bold spacing-below-5"><%=t(".property_tax_credit_deduction") %></h2>

<h3 class="text--body spacing-below-5"><%=t(".household_rent_own") %></h3>
<p><%= current_intake.household_rent_own %></p>
<h3 class="text--body spacing-below-5"><%=t(".household_rent_own", filing_year: current_tax_year) %></h3>
<p><%=t(".household_rent_own_#{current_intake.household_rent_own}") unless current_intake.household_rent_own_unfilled? %></p>
aloverso marked this conversation as resolved.
Show resolved Hide resolved

<% unless current_intake.property_tax_paid.nil? %>
<h3 class="text--body text--bold spacing-below-5"><%= t(".property_tax_paid") %></h3>
<h3 class="text--body text--bold spacing-below-5"><%= t(".property_tax_paid", filing_year: current_tax_year) %></h3>
<p><%= number_to_currency(current_intake.property_tax_paid, precision: 0) %></p>
<% end %>

<% unless current_intake.rent_paid.nil? %>
<h3 class="text--body text--bold spacing-below-5"><%=t(".rent_paid") %></h3>
<h3 class="text--body text--bold spacing-below-5"><%=t(".rent_paid", filing_year: current_tax_year) %></h3>
<p><%= number_to_currency(current_intake.rent_paid, precision: 0) %></p>
<% end %>

<%= link_to StateFile::Questions::NjHouseholdRentOwnController.to_path_helper(return_to_review: "y"), class: "button--small" do %>
<%= t("general.edit") %>
<%= t(".review_and_edit") %>
<span class="sr-only"><%= t(".property_tax_credit_deduction") %></span>
<% end %>
</div>
</div>
</section>

<% unless current_intake.claimed_as_eitc_qualifying_child_unfilled? && current_intake.spouse_claimed_as_eitc_qualifying_child_unfilled? %>
<div id="eitc_qualifying_child" class="white-group">
<section id="eitc_qualifying_child" class="white-group">
<div class="spacing-below-5">
<h2 class="text--body text--bold spacing-below-5"><%=t(".eitc") %></h2>

<% unless current_intake.claimed_as_eitc_qualifying_child_unfilled? %>
<h2 class="text--body text--bold spacing-below-5"><%=t(".claimed_as_eitc_qualifying_child") %></h2>
<p><%= current_intake.claimed_as_eitc_qualifying_child %></p>
<h3 class="text--body text--bold spacing-below-5"><%=t(".primary_claimed_as_eitc_qualifying_child") %></h3>
<p><%=current_intake.claimed_as_eitc_qualifying_child_yes? ? t("general.affirmative") : t("general.negative") %></p>
<% end %>
<% unless current_intake.spouse_claimed_as_eitc_qualifying_child_unfilled? %>
<h2 class="text--body text--bold spacing-below-5"><%=t(".spouse_claimed_as_eitc_qualifying_child") %></h2>
<p><%= current_intake.spouse_claimed_as_eitc_qualifying_child %></p>
<h3 class="text--body text--bold spacing-below-5"><%=t(".spouse_claimed_as_eitc_qualifying_child") %></h3>
<p><%=current_intake.spouse_claimed_as_eitc_qualifying_child_yes? ? t("general.affirmative") : t("general.negative") %></p>
<% end %>
<%= link_to StateFile::Questions::NjEitcQualifyingChildController.to_path_helper(return_to_review: "y"), class: "button--small" do %>
<%= t("general.edit") %>
<span class="sr-only"><%= t(".claimed_as_eitc_qualifying_child") %></span>
<%= t(".review_and_edit") %>
<span class="sr-only"><%= t(".eitc") %></span>
<% end %>
</div>
</div>
</section>
<% end %>

<div id="estimated-tax-payments" class="white-group">
<section id="estimated-tax-payments" class="white-group">
<div class="spacing-below-5">
<h2 class="text--body text--bold spacing-below-5"><%=t(".estimated_tax_payments") %></h2>
<p><%= number_to_currency(current_intake.estimated_tax_payments || 0, precision: 0) %></p>
<%= link_to StateFile::Questions::NjEstimatedTaxPaymentsController.to_path_helper(return_to_review: "y"), class: "button--small" do %>
<%= t("general.edit") %>
<span class="sr-only"><%= t(".estimated_tax_payments") %></span>
<% end %>
<%= t(".review_and_edit") %>
<span class="sr-only"><%= t(".estimated_tax_payments") %></span>
<% end %>
</div>
</div>
</section>

<div id="use-tax" class="white-group">
<section id="use-tax" class="white-group">
<div class="spacing-below-5">
<h2 class="text--body text--bold spacing-below-5"><%=t(".use_tax_applied") %></h2>
<p><%=current_intake.untaxed_out_of_state_purchases_yes? ? t("general.affirmative") : t("general.negative") %></p>
<% if current_intake.untaxed_out_of_state_purchases_yes? %>
<p class="text--bold spacing-below-5"><%=t(".amount") %></p>
<p class="text--bold spacing-below-5">
<%=current_intake.sales_use_tax_calculation_method_automated? ? t(".amount_calculated") : t(".amount_entered") %>
</p>
<p><%=number_to_currency(current_intake.sales_use_tax, precision: 0)%></p>
<% end %>
<%= link_to StateFile::Questions::NjSalesUseTaxController.to_path_helper(return_to_review: "y"), class: "button--small" do %>
<%= t("general.edit") %>
<span class="sr-only"><%= t(".use_tax_applied") %></span>
<% end %>
<%= t(".review_and_edit") %>
<span class="sr-only"><%= t(".use_tax_applied") %></span>
<% end %>
</div>
</div>
</section>

<div class="white-group">
<section id="gubernatorial" class="white-group">
<div class="spacing-below-5">
<h2 class="text--body text--bold spacing-below-5"><%=t(".primary_gubernatorial") %></h2>
<p><%=current_intake.primary_contribution_gubernatorial_elections %></p>
<p><%=current_intake.primary_contribution_gubernatorial_elections_yes? ? t("general.affirmative") : t("general.negative") %></p>

<% if current_intake.filing_status_mfj? %>
<h2 class="text--body text--bold spacing-below-5"><%=t(".spouse_gubernatorial") %></h2>
<p><%=current_intake.spouse_contribution_gubernatorial_elections %></p>
<p><%=current_intake.spouse_contribution_gubernatorial_elections_yes? ? t("general.affirmative") : t("general.negative") %></p>
<% end %>

<%= link_to StateFile::Questions::NjGubernatorialElectionsController.to_path_helper(return_to_review: "y"), class: "button--small" do%>
<%= t("general.edit") %>
<%= t(".review_and_edit") %>
<span class="sr-only"><%= t(".edit_gubernatorial") %></span>
<% end %>
</div>
</div>
</section>

<section class="reveal" id="calculation-details">
<h2 class="text--body text--bold spacing-below-5"><button href="#" class="reveal__button"><%= t(".reveal.header") %></button></h2>
Expand All @@ -201,5 +225,7 @@
</div>
</section>

<p><%= t(".continue_helper") %></p>

<%= render "state_file/questions/shared/review_footer" %>
<% end %>
41 changes: 25 additions & 16 deletions config/locales/en.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3272,23 +3272,30 @@ en:
why_ask_this: Why are you asking for this information?
nj_review:
edit:
amount: Amount
claimed_as_eitc_qualifying_child: I could be someone else's qualifying child for the Earned Income Tax Credit.
college_dependents: Dependents attending college
county: County
amount_calculated: Calculated Amount
amount_entered: Amount Entered
college_dependents: Dependent(s) attending college exemption
continue_helper: Click "Continue" if all this looks right to you.
county_municipality: Where you lived as of Dec 31, %{filing_year}
edit_disability: disability status
edit_gubernatorial: gubernatorial fund contributions
edit_veteran: veteran status
estimated_tax_payments: Payments already made to New Jersey taxes
household_rent_own: Rent or own home
medical_expenses: Medical expenses
municipality: Municipality
primary_disabled: I have a disability
eitc: New Jersey Earned Income Tax Credit (NJEITC)
estimated_tax_payments: Payments already made towards New Jersey taxes
household_rent_own: Living situation in %{filing_year}
household_rent_own_both: Owned and rented
household_rent_own_neither: Other
household_rent_own_own: Owned
household_rent_own_rent: Rented
medical_expenses: Total medical expenses
missing_health_insurance: Missing Health Insurance
primary_claimed_as_eitc_qualifying_child: You could be someone's qualifying child
primary_disabled: Disability exemption (you)
primary_gubernatorial: I want $1 of my taxes to go to the gubernatorial elections fund
primary_veteran: I am a veteran
property_tax_credit_deduction: Property Tax Credit/Deduction
property_tax_paid: Property taxes paid
rent_paid: Rent paid
primary_veteran: Veteran exemption (you)
property_tax_credit_deduction: New Jersey Property Tax deduction or credit
property_tax_paid: Property taxes paid in %{filing_year}
rent_paid: Rent paid in %{filing_year}
reveal:
15_wages_salaries_tips: Wages, salaries, tips
16a_interest_income: Interest income
Expand All @@ -3310,11 +3317,13 @@ en:
65_nj_ctc: New Jersey child tax credit
66_total_payments_refundable_credits: Total payments and refundable credits
header: See detailed return information
spouse_claimed_as_eitc_qualifying_child: My spouse could be someone else's qualifying child for the Earned Income Tax Credit.
spouse_disabled: My spouse has a disability
review_and_edit: Review and Edit
spouse_claimed_as_eitc_qualifying_child: Your spouse could be someone's qualifying child
spouse_disabled: Disability exemption (spouse)
spouse_gubernatorial: My spouse wants $1 of their taxes to go to the gubernatorial elections fund
spouse_veteran: My spouse is a veteran
spouse_veteran: Veteran exemption (spouse)
use_tax_applied: Consumer Use Tax Applied
year_of_death: Year of spouse's passing
nj_sales_use_tax:
edit:
followup_radio_label: Select one of the following
Expand Down
Loading
Loading