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/training #6316

Merged
merged 115 commits into from
Aug 30, 2024
Merged

Feature branch/training #6316

merged 115 commits into from
Aug 30, 2024

Conversation

duncanc19
Copy link
Collaborator

Jonopono123 and others added 30 commits July 12, 2024 14:07
@Jonopono123
added and populated new trainingCategoryGroup column
e5a0a30
@Jonopono123
Merge pull request #6295 from NMDSdevopsServiceAdm/feat/1460-training…
36ffb46 
…-category-groups

added and populated new trainingCategoryGroup column
@Jonopono123
ensure training group data is in correct format for page
4bd394f
@Jonopono123
implemented radio buttons in radio button accordion
b8fc0aa
@Jonopono123
added accordion functionality to new accordion
3b338b1
@Jonopono123
Started adding group accordion component
bce7c24
@Jonopono123
Resolved toggle on accordion group
59b8b0e
@Jonopono123
removed unnecessary logging
5b903b7
@Jonopono123
Undoing changes to main add-edit page, moving new functionality out t…
8eb5a01 
…o new page
@Jonopono123
Fixed issue with retreiving values from radio button controls
756d29d
@ssrome
Fix broken tests
ac11d5e
@ssrome
Added function in training service to pass the selected category id f…
1406fa6 
…or add record
@Jonopono123
added rudimentary navigation to training category page
501a9e3
@Jonopono123
Merge pull request #6301 from NMDSdevopsServiceAdm/feat/1459-addTrain…
c5829c9 
…ingRecord

Feat/1459 add training record
@Jonopono123
Added accordion open/close all functionality
f7255ba
@Jonopono123
Added checkbox, still need to fix styling
aab3c85
@ssrome
Add change link to add training record details
b9afb1e
@ssrome
Update radio btn accordion to also pass label
835220c
@ssrome
Merge pull request #6302 from NMDSdevopsServiceAdm/change-value-sent-…
456c1f1 
…in-add-training-record

Update radio btn accordion to also pass label
@ssrome
Merge branch 'featureBranch/training' into 1471-training-changes-to-t…
966d3cd 
…he-main-add-a-training-record-page-after-selecting-category
@ssrome
Remove unused code in training service
5919ec7
@ssrome
Add clear function for trainingCategorySelectedForTrainingRecord
f94f5ce
@ssrome
Add check to training service for category id
5e21cc2
@ssrome
Update styling on change link
d105101
@Jonopono123
resolved styling on checkbox radio
00e7f04
@ssrome
Add interface to training service
143b780
@ssrome
Remove repetitive test actions
3e465c8
@ssrome
Merge pull request #6304 from NMDSdevopsServiceAdm/1471-training-chan…
1ba85df 
…ges-to-the-main-add-a-training-record-page-after-selecting-category

1471-training-changes-to-the-main-add-a-training-record-page-after-selecting-category
@Jonopono123
Added accordion arrow icon
a0268af
@Jonopono123
Added styling for accordion button
9f4e07c
kapppa-joe and others added 27 commits August 16, 2024 14:58
@kapppa-joe
minor fix in unit test
131f390
@kapppa-joe
Merge pull request #6314 from NMDSdevopsServiceAdm/1481-training-add-…
978a58e 
…multiple-records-summary

1481 training add multiple records summary
@ssrome
Show the mandatory training category in select training category
3aa8b08
@ssrome
Show training category on edit training record
ed1bd15
@ssrome
Merge pull request #6318 from NMDSdevopsServiceAdm/fix/edit-training-…
8125111 
…record

Fix/edit training record
@ssrome
Add check to clear selected category at beginning of add training record
299c6d6
@ssrome
Merge pull request #6320 from NMDSdevopsServiceAdm/fix/clear-selected…
9084183 
…-category-on-navigation-click

Add check to clear selected category at beginning of add training record
@ssrome
Merge branch 'main' into featureBranch/training
9cf622d
@ssrome
Add styling change to only show header menu button on small screens
304a2ab
@ssrome
Merge pull request #6322 from NMDSdevopsServiceAdm/fix/menu-in-header
d0700b3 
fix/menu-button-in-header
@ssrome
Add parseInt for string category ids in queryParam
9943080
@ssrome
Remove detectChanges from test
a3bd9f9
@ssrome
Add spacing above cta on select staff
81e8d2f
@ssrome
Merge pull request #6326 from NMDSdevopsServiceAdm/fix/populate-categ…
d54994b 
…ory-from-training-tab-view

fix/populate-category-from-training-tab-view
@ssrome
Add second error message to the select training category
c5d48a7
@ssrome
Merge pull request #6327 from NMDSdevopsServiceAdm/fix/cta-spacing-mu…
3ab8562 
…ltiple-training-records

fix/cta-spacing-multiple-training-records
@ssrome
Merge branch 'main' into featureBranch/training
9a59596
@ssrome
Merge branch 'featureBranch/training' into fix/validation-on-select-t…
882a0e0 
…raining-category
@ssrome
Change accordion component appearance when error happens, also auto o…
5d28f90 
…pen the accordion
@Jonopono123
Fixed issues with show/hide all text
68ee283
@Jonopono123
fixed failing tests, removed unnecessary log, made setter public
0a60061
@ssrome
Merge pull request #6329 from NMDSdevopsServiceAdm/fix/validation-on-…
5648aff 
…select-training-category

Fix/validation on select training category
@Jonopono123
Added tests to grouped accordion show/hide all functionality
fc342f5
@Jonopono123
refactored accordion component
3fc23b6
@Jonopono123
Merge branch 'featureBranch/training' into bug/1494-show-hide-accordi…
eba08d1 
…on-text
@Jonopono123
Merge pull request #6330 from NMDSdevopsServiceAdm/bug/1494-show-hide…
c311950 
…-accordion-text

Fixed issues with show/hide all text
@kapppa-joe
Merge branch 'main' into featureBranch/training
9d430e7
@kapppa-joe kapppa-joe merged commit 92954a3 into main Aug 30, 2024
5 checks passed
@kapppa-joe kapppa-joe deleted the featureBranch/training branch August 30, 2024 09:35
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 @Jonopono123 @ssrome