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

Jump to bottom

Feature branch/funding redesign #6435

Merged
merged 194 commits into from
Dec 11, 2024
Merged

Feature branch/funding redesign #6435

merged 194 commits into from
Dec 11, 2024

Conversation

duncanc19
Copy link
Collaborator

@duncanc19 duncanc19 commented Dec 2, 2024 •
edited
Loading

Work done

Tests

Does this PR include tests for the changes introduced?

  • Yes
  • No, I found it difficult to test
  • No, they are not required for this change

duncanc19 and others added 30 commits October 8, 2024 14:51
@duncanc19
Update WDF option in registration survey to be generic funding option
452faa5
@duncanc19
Create card for funding on home tab and move benefits bundle to Other…
db9d27b 
… links section
@duncanc19
Merge pull request #6381 from NMDSdevopsServiceAdm/feat/1536-registra…
fbadc2d 
…tion-survey-funding-option

Update WDF option in registration survey to be generic funding option
@ssrome
Update title for wdf journey
d216d09
@duncanc19
Replace WDF image
3180af2
@duncanc19
Update funding card text on parent home tab
ca9fb25
@duncanc19
Add WDF report permission check for consistency across home tabs
a48d7a5
@duncanc19
Update spacing to match the designs more closely
9dc467c
@duncanc19
Merge pull request #6384 from NMDSdevopsServiceAdm/feat/1531-funding-…
2f5ec4f 
…stand-alone-home-page-changes

Feat/1531 funding stand alone home page changes
@duncanc19
Update messages for staff record meeting/not meeting
d7013b6
@duncanc19
Add grey box for staff record status message
9b2a1f8
@duncanc19
Add pagination buttons to top of staff record and fix alignment
27e4e3d
@duncanc19
Move Close staff record link into pagination component to reduce dupl…
4c3e71f 
…ication
@duncanc19
Switch the staff record name and caption
7077137
@duncanc19
Update styling for needs to be added message for single field (DOB)
dc55dcb
@duncanc19
Move WDF warning message into component
496113e
@ssrome
Add summary panel for wdf
6f027e5
@duncanc19
Add message for new workers on eligible workplace
876f981
@duncanc19
Change format of last updated date
2f65e76
@duncanc19
Add WDF warning for gender question
59efa98
@duncanc19
Add WDF warning for nationality question
4c2b058
@duncanc19
Add 'add info' messages to employment section of staff record
ab841c4
@ssrome
Update wdf overview
729f586
@duncanc19
Add updated add info messages to training and quals section of staff …
cd55cbb 
…record
@ssrome
Move wdf messages and logic into summary panel
3700074
@ssrome
Merge branch 'feature-branch/funding-redesign' into feat/1542-funding…
dc23020 
…-stand-alone-main-funding-page-changes
@ssrome
Remove un-used code from wdf journey
e2ebe18
@ssrome
Update green icon on wdf summary panel
e951786
@ssrome
Add wdf find out more page
5628248
@ssrome
Add new path to wdf journey
ea3196b
duncanc19 and others added 18 commits December 5, 2024 11:11
@duncanc19
Merge pull request #6440 from NMDSdevopsServiceAdm/fix/funding-no-sta…
a677f6c 
…ff-records-link

Fix: Set links for staff records tab correctly for no staff records message
@duncanc19
Create funding report resolver
c40bb27
@duncanc19
Update wdf-data page to use report resolver
4f96771
@duncanc19
Update funding-requirements page to use report resolver
fdf8b25
@duncanc19
Update wdf-overview page to use report resolver
4e03383
@duncanc19
Update wdf-staff-summary to pass in eligibility as report already loa…
18d2d21 
…ded in parent component
@duncanc19
Update wdf-staff-record to use report resolver
05f42c4
@duncanc19
Add getWDFReport back into wdf-data to refresh data when workplace fi…
9255af4 
…elds all confirmed
@duncanc19
Make requested spacing changes to make the pages closer to the designs
4c8b524
@duncanc19
Update wording of section heading from 'mandatory details' to 'mandat…
038cc79 
…ory information'
@duncanc19
Update summary panel to use large icons and delete now unused tick-ic…
eefbb48 
…on-green-24 image
@duncanc19
Update svgs for funding and benchmark cards on home tab
1cf2cb7
@duncanc19
Set widths on staff summary table to prevent wrapping of titles
4f713ad
@duncanc19
Merge pull request #6441 from NMDSdevopsServiceAdm/fix/flickering-dat…
84c4441 
…es-on-funding-pages

Fix/flickering dates on funding pages
@duncanc19
Merge pull request #6442 from NMDSdevopsServiceAdm/fix/funding-stylin…
0230c59 
…g-fixes

Fix/funding styling fixes
@duncanc19
Update staff mismatch warning message on funding workplaces summary t…
bae819c 
…o be generic as other cases for becoming ineligible
@duncanc19
Set specific warning message for Capacities to make clear they must a…
82af290 
…dd for main service
@duncanc19
Merge pull request #6447 from NMDSdevopsServiceAdm/fix/update-funding…
82bd40a 
…-warning-messaging-for-capacities

Fix/update funding warning messaging for capacities
@duncanc19 duncanc19 marked this pull request as ready for review December 10, 2024 09:27
duncanc19 and others added 8 commits December 10, 2024 15:11
@duncanc19
Update wdf-summary-panel to allow for specific messages
f04c27f
@duncanc19
Refactor tests to destructure setup tools
4a2c6d7
@duncanc19
Update spacing to prevent wrapping when displaying some data not meet…
07aabde 
…ing message
@duncanc19
Update overview page to have some data message for Your other workpla…
ccdc0f4 
…ces section
@duncanc19
Pass in subsidiaries eligibility to summary panel so correctly shows …
58fcaf7 
…meeting message when all subs meeting even if parent not meeting
@duncanc19
Fix WDF overview to display date last workplace met eligibility in me…
da79442 
…t eligibility message
@duncanc19
Update WDF data page to have some data message for My other workplace…
34e305a 
…s summary section
@duncanc19
Merge pull request #6451 from NMDSdevopsServiceAdm/fix/add-some-subs-…
a50a554 
…meeting-message-to-summary-panel

Fix/add some subs meeting message to summary panel
@duncanc19 duncanc19 merged commit efad3af into main Dec 11, 2024
5 checks passed
@duncanc19 duncanc19 deleted the feature-branch/funding-redesign branch December 11, 2024 09:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kapppa-joe kapppa-joe kapppa-joe approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@duncanc19 @kapppa-joe @ssrome @Jonopono123