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.

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 income adjustments #3954

Merged
merged 148 commits into from
Jun 26, 2024
Merged
Changes from 1 commit
Commits
Show all changes
148 commits
Select commit Hold shift + click to select a range
379fb07
todos
charlienparker Jun 6, 2024
9b76c4d
add red required asterisk
charlienparker Jun 7, 2024
057dc92
remove date debug comments
charlienparker Jun 7, 2024
650e27a
remove newline
charlienparker Jun 7, 2024
a25064b
more section work
charlienparker Jun 10, 2024
5a8fbcb
work through coverage
charlienparker Jun 11, 2024
8e54e86
remove hack for frozen string and update displayable_field?
charlienparker Jun 11, 2024
7ec7204
add income table
charlienparker Jun 11, 2024
8145505
translation work, use existing gray colors for table borders
charlienparker Jun 11, 2024
b0b8217
modal work
charlienparker Jun 12, 2024
eeb32ab
fix modal id
charlienparker Jun 12, 2024
7b296c6
modal title fix
charlienparker Jun 12, 2024
b9223bf
continue text for mec banner
charlienparker Jun 12, 2024
c1b0b84
coverage required fixes
charlienparker Jun 12, 2024
9b27fd8
move caretaker string to review section
charlienparker Jun 12, 2024
81c1a63
translation cleanup
charlienparker Jun 12, 2024
1c3683c
more localization work
charlienparker Jun 12, 2024
b4a9782
fix hover color
charlienparker Jun 12, 2024
62506df
fix asterisk
charlienparker Jun 12, 2024
ad4c0bb
m
charlienparker Jun 12, 2024
c061e47
debug removal, translation esi work
charlienparker Jun 12, 2024
a622403
move esi fields to partial
charlienparker Jun 12, 2024
2986f91
add bottom sections
charlienparker Jun 12, 2024
800b5db
fix formatted string
charlienparker Jun 12, 2024
c25b83e
add subsection partial
charlienparker Jun 12, 2024
7d07eb9
pass in applicant for summary section
charlienparker Jun 12, 2024
c12806a
move hash helpers to new file
charlienparker Jun 13, 2024
2b43328
add translation helper for review and submit hashes
charlienparker Jun 13, 2024
a48eb40
add private helpers for displayable field and add missing row map cal…
charlienparker Jun 13, 2024
4520b11
move translator module into helper module, fix displayable helper cal…
charlienparker Jun 13, 2024
706911c
cleanup
charlienparker Jun 13, 2024
78e2060
use key for expected
charlienparker Jun 13, 2024
f04eb16
fix caretaker key, view cleanup
charlienparker Jun 14, 2024
dddf700
use human boolean for parent outside
charlienparker Jun 14, 2024
eceadd5
undo rebase issue
charlienparker Jun 14, 2024
0f0c68d
fix continue application content
charlienparker Jun 14, 2024
16bbc5f
add missing upcase
charlienparker Jun 14, 2024
ced8fe1
undo lock file change
charlienparker Jun 14, 2024
9129dcb
update hover
charlienparker Jun 14, 2024
49f1d8f
remove todo
charlienparker Jun 14, 2024
270d56f
titleize relationship, add helpers for hash constructors
charlienparker Jun 14, 2024
9b212e9
classify displayable helpers
charlienparker Jun 14, 2024
ada9d79
remove class_name method
charlienparker Jun 15, 2024
6071802
add include, fix wrong variable name for relationship builder
charlienparker Jun 17, 2024
741d43f
remove unneeded helper declaration
charlienparker Jun 17, 2024
dbf34b2
remove newline
charlienparker Jun 18, 2024
410494d
add bs4 outline to view, logic to controller
charlienparker Jun 15, 2024
45b9e36
inital review work - update controller to support action, implement P…
charlienparker Jun 10, 2024
a7bd45a
fix for review and submit layout
charlienparker Jun 12, 2024
214932e
move selectric handling to js for other questions
charlienparker Jun 15, 2024
31bf93e
initial page work
charlienparker Jun 16, 2024
2e61122
update form, update date formatting for date fields, disable selectri…
charlienparker Jun 17, 2024
477faa9
save cancel button work
charlienparker Jun 17, 2024
a8abe60
remove debug
charlienparker Jun 17, 2024
c83fbd3
remove unneeded ids, fix error on translations but still need correct…
charlienparker Jun 17, 2024
02112b3
add nav, update form partial to default save button to disabled
charlienparker Jun 17, 2024
ecf5b54
fix save button and form disabling
charlienparker Jun 17, 2024
bab437b
fix add more link permeance after removal
charlienparker Jun 17, 2024
dbc1922
fix created income UI showing legacy, fix edit button not working
charlienparker Jun 17, 2024
4d2ae52
remove unneeded bs4 set
charlienparker Jun 18, 2024
0eed00e
move other actions to conditional
charlienparker Jun 18, 2024
40f8e4d
add date field for income, fix bug causing fake input fields to be en…
charlienparker Jun 18, 2024
dd8a76b
use date field for unemployment
charlienparker Jun 18, 2024
acaa28e
fix add button permeance bug after remove for unemployment
charlienparker Jun 18, 2024
34d7dfe
cleanup
charlienparker Jun 18, 2024
f4a777b
update disable for deductions
charlienparker Jun 18, 2024
9e3ef29
cleanup
charlienparker Jun 18, 2024
f034585
cancel fix, other income form class fixes
charlienparker Jun 18, 2024
8a86dfb
fix cancel button reseting checkbox bug, update padding for elements …
charlienparker Jun 18, 2024
c5e783e
update edit and remove buttons for deductions, remove repeated edit c…
charlienparker Jun 18, 2024
a8e0415
swap id and class for add more button in both legacy and bs4
charlienparker Jun 18, 2024
8a65913
add missing enable from rebase
charlienparker Jun 18, 2024
47ce1d4
add missing when from rebase
charlienparker Jun 18, 2024
053c212
Merge branch 'bs4-fa-review-and-submit' into bs4-income-adjustments
charlienparker Jun 18, 2024
1b4a798
fix destroy/destroy all handling to ensure permeance of add new butto…
charlienparker Jun 18, 2024
fc891ad
update add new button hiding
charlienparker Jun 19, 2024
5454598
button fixes - use outline for remove and use button class for edit t…
charlienparker Jun 19, 2024
f07a0a2
remove add more on destroy all
charlienparker Jun 19, 2024
0e9889d
modal and translation work
charlienparker Jun 19, 2024
5387201
add logic to reset deduction form when empty and uncheck
charlienparker Jun 19, 2024
b8aa5a0
edit, cancel, add new fixes for other income
charlienparker Jun 19, 2024
e1e07cf
fix deduction remove not causing checkbox reset, break out deduction …
charlienparker Jun 19, 2024
b41e80f
disable all income edit buttons while editing for other/unemployment …
charlienparker Jun 19, 2024
b778552
support add new disable for unemployment, remove unneeded selector fr…
charlienparker Jun 19, 2024
2f56c90
support add more disable for other income
charlienparker Jun 19, 2024
4bd9963
margin fixes for buttons, apply other income add disable universally
charlienparker Jun 19, 2024
063d719
add more fixes
charlienparker Jun 19, 2024
f110c2b
add progress button disable functionality
charlienparker Jun 20, 2024
4d6c9a5
fix new form permeating when removing all deduction kinds, fix add mo…
charlienparker Jun 20, 2024
cf752cd
fix other income add more permeating when unchecking kind with an inc…
charlienparker Jun 20, 2024
5022c7c
cleanup cancel, fix unemployment add more to not appear for initial e…
charlienparker Jun 20, 2024
a06ad06
remove cleanup
charlienparker Jun 20, 2024
a540671
add legacy handling for deductions
charlienparker Jun 20, 2024
7f187fb
hide add more on cancel when no other existing
charlienparker Jun 20, 2024
e40bc97
auto uncheck unemployment on final delete, fix cancel handling
charlienparker Jun 20, 2024
b4e8fd9
fix add more permeance for cancel new deduction, break out reset into…
charlienparker Jun 20, 2024
b9287b3
selector fixes, make frequency required
charlienparker Jun 20, 2024
e8ee346
update modals and allow disabling of a tags
charlienparker Jun 20, 2024
afb15d5
fix broken translation
charlienparker Jun 20, 2024
c08173a
translation cleanup for me, remove labels from subsection partial and…
charlienparker Jun 20, 2024
34eea28
rename key string
charlienparker Jun 20, 2024
56bfa9b
remove unneeded style
charlienparker Jun 20, 2024
4306494
remove unused strings
charlienparker Jun 20, 2024
ab0a5e6
update margins of form buttons and checkboxes to match mockups
charlienparker Jun 20, 2024
50d2f94
remove add new deduction bottom margin, add x margin for deduction/ot…
charlienparker Jun 20, 2024
8b65746
restructure other markup, update save input class to button to match …
charlienparker Jun 20, 2024
b972675
class fixes
charlienparker Jun 20, 2024
52013bd
update edit toggling selectors to not disable divs which directly own…
charlienparker Jun 20, 2024
9b171e9
ss string fix
charlienparker Jun 20, 2024
95aa88e
fix leave warning modal
charlienparker Jun 20, 2024
9f4097f
cleanup
charlienparker Jun 20, 2024
7e6df89
add support for ai an
charlienparker Jun 21, 2024
cd31d7c
set deductions actions from params
charlienparker Jun 21, 2024
9c78e01
restore legacy add replace
charlienparker Jun 21, 2024
2601675
consolidate add link
charlienparker Jun 21, 2024
f6fcff4
update disabled style to select all bottom level, non a & button elem…
charlienparker Jun 21, 2024
2478263
remove debug
charlienparker Jun 21, 2024
2915f49
comment fixes
charlienparker Jun 21, 2024
ccddc44
update forms to validate date warnings using bs4 date format, add dat…
charlienparker Jun 21, 2024
556bccc
fix date parsing for bs4
charlienparker Jun 21, 2024
493226e
income note field work
charlienparker Jun 21, 2024
16904d1
add end date translation
charlienparker Jun 21, 2024
22cd19c
fix syntax error
charlienparker Jun 21, 2024
236c03c
Merge branch 'clean-bootstrap-4-upgrade' of ssh://github.com/ideacrew…
charlienparker Jun 21, 2024
c4a00b4
Merge branch 'bs4-fa-review-and-submit' into bs4-income-adjustments
charlienparker Jun 21, 2024
12afc80
remove unneeded keys from merge
charlienparker Jun 21, 2024
54b18d6
Merge branch 'clean-bootstrap-4-upgrade' of ssh://github.com/ideacrew…
charlienparker Jun 21, 2024
fe4b8c3
fix legacy income note
charlienparker Jun 21, 2024
a62bc39
translation cleanup
charlienparker Jun 21, 2024
18036ef
update leave edit to not enable submit buttons, remove redundant disa…
charlienparker Jun 21, 2024
0191312
more translation cleanup
charlienparker Jun 21, 2024
198e01d
disable help links
charlienparker Jun 21, 2024
7aae65c
fix review description list
charlienparker Jun 22, 2024
13c9672
cleanup
charlienparker Jun 22, 2024
088adc9
fix unemployment edit delete
charlienparker Jun 23, 2024
7f6cbd5
fix date parsing
charlienparker Jun 23, 2024
bdf5097
update other questions date parsing
charlienparker Jun 23, 2024
7de1b66
modal work
charlienparker Jun 24, 2024
22cedbc
add date warning to other income, remove undefined check in js
charlienparker Jun 24, 2024
576f457
move warning partials
charlienparker Jun 24, 2024
4dab4fe
flex work
charlienparker Jun 24, 2024
83bd44f
rollback debug
charlienparker Jun 24, 2024
524f6d8
remove extra semi colon
charlienparker Jun 24, 2024
8d0cf4f
disable yes/no text
charlienparker Jun 24, 2024
8bc7581
remove left margins on inputs
charlienparker Jun 24, 2024
ae418ab
more margin updates
charlienparker Jun 24, 2024
6c5265e
remove margin on unemployment add more
charlienparker Jun 24, 2024
ea20542
add leave ids
charlienparker Jun 25, 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
Next Next commit
todos
charlienparker committed Jun 18, 2024
commit 379fb07c856a615bcc719c6f6455ba0150133379
4 changes: 4 additions & 0 deletions app/assets/javascripts/date.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
console.log("date.js loaded");

function check_dateformat(date) {
var dateformat = /^(0?[1-9]|1[012])\/(0?[1-9]|[12][0-9]|3[01])\/\d{4}$/;
if(date.match(dateformat)){
@@ -35,12 +37,14 @@ function check_dateformat(date) {

$(document).on('blur', 'input.jq-datepicker, input.date-picker, input.datepicker-js', function(){
var date = $(this).val();
// TODO: IF this is needed, update format... also look into stack overflow that implies we can change format from picker?
if(date != "" && !check_dateformat(date)){
var memo_element = $('.memo')
var invalid_dob_element = $('.dependent-invalid-dob')
if (invalid_dob_element.length) {
invalid_dob_element.html("<div class='alert-plan-year alert-error'><h4><b>Invalid date format.</b> You must enter 2 numbers for the month, 2 numbers for the day, and 4 numbers for the year. Example: 05/09/1980.</h4> <br/></div>");
}else if(memo_element.length) {
// TODO: if memo is needed, update this inserted html to follow BS4 UX
memo_element.html("<div class='alert-plan-year alert-error'><h4><b>Invalid date format.</b> You must enter 2 numbers for the month, 2 numbers for the day, and 4 numbers for the year. Example: 05/09/1980.</h4> <br/></div>");
} else {
alert("invalid date format");