Nj 125 income editing #5288

mluedke2 · 2024-12-24T16:15:43Z

Link to pivotal/JIRA issue

https://github.com/newjersey/affordability-pm/issues/125

Is PM acceptance required? (delete one)

Yes - don't merge until JIRA issue is accepted!

Reminder: merge main into this branch and get green tests before merging to main

What was done?

Adapted to the new XML schema for UI/WF/SWF to UIWFSWF and UIHCWD
I decided to reuse the existing and put in if NJ checks... if we should break into our component I could do that instead but I felt this was simpler.
There weren't E2E tests yet specifically for just income review so I added NJ-specific tests there for this ticket's AC and removed NJ from running related shared tests

How to test?

Use Zeus Box 14 to see W2 editing, and Streep for seeing messaging for other income forms.

Screenshots (for visual changes)

Zeus Box 14

Streep

github-actions · 2024-12-24T16:20:41Z

Heroku app: https://gyr-review-app-5288-23108a88e363.herokuapp.com/
View logs: heroku logs --app gyr-review-app-5288 (optionally add --tail)

config/locales/en.yml

arinchoi03

Some questions/suggestions

arinchoi03 · 2024-12-24T16:50:34Z

app/services/state_file/state_information_service.rb

@@ -202,7 +202,7 @@ def state_intake_class_names
        vita_link_es: "",
        voucher_form_name: "NJ Voucher Form",
        voucher_path: "",
-        w2_supported_box14_codes: ["UI_WF_SWF", "UI_HC_WD", "FLI"],
+        w2_supported_box14_codes: ["UI_WF_SWF", "FLI"],


why isn't this one changing to "UIWFSWF"? Is it possible to change and then we won't need to remove the _ in return_w2.rb submission builder?

oh good catch, will do

arinchoi03 · 2024-12-24T17:13:37Z

app/views/state_file/questions/income_review/edit.html.erb

+          t(".nj_not_taxed")
+        else
+          t(".no_info_needed")
+        end %>


[dust] I think we generally have been trying to steer away from checking current_state_code to enter in state-specific content. Ways we've been trying to avoid it:

adding descriptive flags on the StateFileBaseIntake and StateFile[state]Intake

creating partials

creating state-specific translations

For this above scenario, is it possible to do something like below? (from app/views/state_file/questions/return_status/_accepted.html.erb:

<% # i18n-tasks-use t("state_file.questions.return_status.accepted.check_payable_html") # hint for the i18n linter that, yes, we are using this key (sometimes) %> <%= t(".#{current_state_code}.check_payable_html", default: :'.check_payable_html', payable_to: @department_of_taxation, filing_year: current_tax_year, form_number: @tax_form_number) %>

we have a default (.no_info_needed) here and state-specific copy (.nj_not_taxed -> .nj.no_info_needed)?

thanks -- that is a great tip about the linter hint; i definitely wrestled a bit with that on this. i'll update to use your suggestion to not check state code there...

arinchoi03 · 2024-12-24T17:17:00Z

app/views/state_file/questions/w2/edit.html.erb

@@ -46,13 +49,17 @@
      <% end %>
    </div>

-    <% if t(".box14_explanation.#{@state_code}_html", default: nil) %>
+    <% explanation_key = ".box14_explanation_#{@state_code}_html" %>
+    <% button_text = @state_code == "nj" ? t(".what_is_box14_nj") : t(".what_is_box14") %>


only two states support box 14, is there a way to make this dynamic?
<% button_text = t(".what_is_box14_#{state_code}") %>

sounds good, will do!

jachan

Great work! Had some small questions/comments!

jachan · 2024-12-24T16:45:29Z

spec/controllers/state_file/questions/w2_controller_spec.rb

+      it "sets box14_ui_wf_swf to box14_ui_hc_wd" do
+        get :edit, params: { id: state_file_w2.id }
+        expect(assigns(:w2).box14_ui_wf_swf).to eq 340


[Pebble?] Do we need to add asserts on what UI/HC/WD should be? Is this information part of the return, or is it overwritten by UI/WF/SWF? Either way, it might be helpful to assert expected behavior for both fields when both fields are defined.

expect(assigns(:w2).box14_ui_hc_wd).to eq 340

That's a good point-- box14_ui_hc_wd doesn't matter from here on out so I didn't bother adding an expectation for it. I will be making an update to the w2 model that will help make it clear that we aren't using that value...

jachan · 2024-12-26T15:17:09Z

spec/features/state_file/income_review_spec.rb

+      expect(page).to have_field('state_file_w2_employer_state_id_num', with: '12345')
+      expect(page).to have_field('state_file_w2_state_wages_amount', with: '12345.0')
+      expect(page).to have_field('state_file_w2_state_income_tax_amount', with: '500.0')
+      expect(page).to have_button("What should I put in Box 14?")


[PEBBLE] Original tests in review_page_spec test that clicking continue takes you back to the review screen. Since we're removing NJ from those tests, mind putting that check here as well?

true - will make sure that everything that was tested before is still covered...

mmazanec22 · 2024-12-26T16:51:03Z

app/views/state_file/questions/income_review/edit.html.erb

@@ -27,7 +27,11 @@
  <% if current_intake.direct_file_data.fed_unemployment > 0 %>
    <div class="white-group unemployment" id="form1099gs">
      <p class="text--bold spacing-below-0"><%= t(".unemployment_title") %></p>
-      <% if current_intake.state_file1099_gs.count > 0 %>
+      <% if current_state_code == "nj" %>


[dust] This is another place where you might refactor to remove the state code check

mmazanec22 · 2024-12-26T16:51:19Z

app/views/state_file/questions/w2/edit.html.erb

@@ -9,6 +9,9 @@
      <p class="spacing-below-25"><%= @w2.employer_name %></p>

      <% if @box14_codes.present? %>
+        <% if @state_code == "nj" %>


[dust] State code check

mmazanec22 · 2024-12-26T16:53:02Z

config/locales/en.yml

-          box14_explanation:
-            md_html: For tax year %{year}, we will only process the <strong>STPICKUP</strong> code, which represents any contributions you made to the state retirement system.
+          box14_explanation_md_html: For tax year %{year}, we will only process the <strong>STPICKUP</strong> code, which represents any contributions you made to the state retirement system.
+          box14_explanation_nj_html: 'For this year, we will only need the amounts for <strong>UI/WF/SWF</strong> (may also appear as <strong>"UI/HC/WD"</strong> on your W2) and FLI.<br/><br/><strong>If you do not see these, please leave these fields blank.</strong><br/><br/><strong>Definitions:</strong><br/><br/><strong>UI/WF/SWF</strong> (may also appear as <strong>"UI/HC/WD"</strong> on your W2) represents:<ul><li><strong>UI</strong> refers to unemployment insurance contributions</li><li><strong>WF</strong> and <strong>WD</strong> refer to  workforce development partnership fund contributions</li><li><strong>SWF</strong> refers to supplemental workforce fund contributions</li><li><strong>HC</strong> refers to healthcare contributions</li><li><strong>WD</strong> refers to workforce development contributions</li></ul><strong>FLI</strong>: Represents contributions withheld for Family Leave Insurance. Family Leave Insurance (FLI) provides paid leave benefits to bond with a new child, care for a loved one, or cope with domestic/sexual violence. If you have a number for this on your paycheck, it means you have paid into this program and may be eligible to receive cash benefits.<br/><br/>We use the amounts to determine if you  might be eligible for a credit.<br/><br/>There may be other information in box 14 - those don''t need to be reported with this tool.'


[dust] Will taxpayers see UI/WF/SWF on their returns or UIWFSWF? Might want to update copy to reflect the most likely case

mluedke2 · 2024-12-26T17:52:53Z

Thanks all for the comments (and the discussion at our check-in). I'll be adding a couple error messages and making a change to the w2 model to make sure Line 59 doesn't get broken (I suspect it is actually broken right now and just wasn't caught by tests).

Since that will likely be a pretty big set of changes I'll re-tag people when ready for review again. But for now will go back to Draft while I'm working...

…culate using just one field

…y is named overwrite

mluedke2 added 30 commits December 17, 2024 09:46

work in progress - comments on relevant lines

be6ee8c

Merge branch 'main' into nj-125-income-editing

c4b0a65

one way to hide the unemployment box in nj

b04f37a

use mailing state instead

aaaa000

hide ssa-1099 if nj as well

46f7b6d

only show income review if there is something to review

8848c80

share display condition logic between controller and erb

026f17b

Merge branch 'main' into nj-125-income-editing

2d736b0

for now just check for state is nj

89fcc1a

Merge branch 'main' into nj-125-income-editing

bf0927f

remove comment for out of scope

60e06ab

remove extra comment

505c8a8

add e2e tests for income review visual changes

37bdf9c

remove unused imports

648e1ae

update lucky w2

a74cca3

nj-specific content

c1192ca

dry and condition styling

b0ddea4

edit text for box14

850a75d

Merge branch 'main' into nj-125-income-editing

f8465ab

update xml for box 14

1b36583

Merge branch 'main' into nj-125-income-editing

71bd8d5

sync es

1c6ba7d

conform to new format without slashes

5ac1833

expectations for w2 editing

fc59a55

proper test for assigning box 14 values

496b44f

update more syntax for the no-slash format

609969e

don't use shared tests for nj since it's tested separately

d23cc09

missing key in es

7bb59ea

normalize strings

34db50e

Merge branch 'main' into nj-125-income-editing

2826eda

mluedke2 added 4 commits December 23, 2024 11:58

don't catch on conditional strings for unused test

ea26a0c

rearrange translation string keys to not need to add to ignore list

52a2faf

fix syntax

fd8644f

Merge branch 'main' into nj-125-income-editing

92cc4ee

mluedke2 marked this pull request as ready for review December 24, 2024 16:21

mluedke2 requested review from mmazanec22 and jachan December 24, 2024 16:21

Merge branch 'main' into nj-125-income-editing

d8ba042

mmazanec22 reviewed Dec 24, 2024

View reviewed changes

config/locales/en.yml Show resolved Hide resolved

remove unneeded p

57ceb03

arinchoi03 reviewed Dec 24, 2024

View reviewed changes

jachan reviewed Dec 26, 2024

View reviewed changes

Merge branch 'main' into nj-125-income-editing

741c76c

mmazanec22 approved these changes Dec 26, 2024

View reviewed changes

mluedke2 marked this pull request as draft December 26, 2024 17:53

mluedke2 added 6 commits December 26, 2024 11:44

overwrite in model getter instead of just in controller for form, cal…

0bdbedf

…culate using just one field

refactor to use one UI_MAX constant, and a method name that explicitl…

471d383

…y is named overwrite

fix one of the failing tests

2876f29

fix field name

c28f4cb

partially undo renaming constants - still keep overwrite function name

a857576

use without slashes or underscores since that is XML format

e52ac21

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Nj 125 income editing #5288

Nj 125 income editing #5288

mluedke2 commented Dec 24, 2024 •

edited

Loading

github-actions bot commented Dec 24, 2024

arinchoi03 left a comment

arinchoi03 Dec 24, 2024

mluedke2 Dec 24, 2024

arinchoi03 Dec 24, 2024 •

edited

Loading

mluedke2 Dec 24, 2024

arinchoi03 Dec 24, 2024

mluedke2 Dec 24, 2024

jachan left a comment

jachan Dec 24, 2024

mluedke2 Dec 26, 2024

jachan Dec 26, 2024

mluedke2 Dec 26, 2024

mmazanec22 Dec 26, 2024

mmazanec22 Dec 26, 2024

mmazanec22 Dec 26, 2024

mluedke2 commented Dec 26, 2024

Nj 125 income editing #5288

Are you sure you want to change the base?

Nj 125 income editing #5288

Conversation

mluedke2 commented Dec 24, 2024 • edited Loading

Link to pivotal/JIRA issue

Is PM acceptance required? (delete one)

What was done?

How to test?

Screenshots (for visual changes)

Zeus Box 14

Streep

github-actions bot commented Dec 24, 2024

arinchoi03 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

arinchoi03 Dec 24, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jachan left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mluedke2 commented Dec 26, 2024

mluedke2 commented Dec 24, 2024 •

edited

Loading

arinchoi03 Dec 24, 2024 •

edited

Loading