Addition of groups to the FaF journey#873
Merged
Merged
Conversation
* added step view, updating journey order and framework_requests_controller * switching to openstruct for step 2 * hint with openstruct - still need to remove bold * view in place with correct validation * added group attribute to framework_request table - DSI and no-DSI journeys both successful * updated tests for previous DSI journey, accounting for new step order and group validation * updated tests for create non-dsi journey * uncommenting capybara helper lines Co-authored-by: Simon Piper <simonpiper@C02FL95VMD6M.local>
- add "Search for a group or trust" page to the FaF journey - add group_uid to framework_requests - update "Search for a school" help text
* updated step 5 view, framework_request_controller and presenter * added uid to framework_request model * removing uid from framework_requests and schema * add conditional render for group uid for mats * updating comments * added to tests for create framework * fixing rubocop * updated tests inc presenter * addressed comments * fixing rubocop Co-authored-by: Simon Piper <simonpiper@C02FL95VMD6M.local>
…863) - allow users belonging to groups (MATs and SATs) to use the service
* feature in place - tests to be updated * fixed validation message for 302 * updated tests * fix rubocop * uncommenting capybara helper lines Co-authored-by: Simon Piper <simonpiper@C02FL95VMD6M.local> Co-authored-by: Simon Piper <simonpiper@C02FL95VMD6M.broadband>
…on-schools Add group and school search to the non-dsi faf journey
* updated step 5 view, framework_request_controller and presenter * added uid to framework_request model * removing uid from framework_requests and schema * add conditional render for group uid for mats * updating comments * added to tests for create framework * fixing rubocop * updated tests inc presenter * addressed comments * fixing rubocop * validation and navigation working - legend to be removed * removed legend * added test Co-authored-by: Simon Piper <simonpiper@C02FL95VMD6M.local> Co-authored-by: Simon Piper <simonpiper@C02FL95VMD6M.broadband>
- update content for kick-out page - add trusts to the DSI journey school page - add (MAT) string to trusts listed on DSI journey school page Co-authored-by: Simon Piper <simonpiper@C02FL95VMD6M.local> Co-authored-by: Edwin Kruglov <edwin.kruglov@education.gov.uk>
|
This pull request is split into 8 parts for easier review. Changed files are located in these folders:
|
kennyevil
approved these changes
Feb 14, 2022
Contributor
|
@EdwinKruglov a reminder that work @kennyevil has done on forms give us the option to use |
peterdavidhamilton
suggested changes
Feb 14, 2022
peterdavidhamilton
left a comment
peterdavidhamilton
left a comment
Contributor
There was a problem hiding this comment.
Should use position? instead. Made a few other comments.
peterdavidhamilton
suggested changes
Feb 14, 2022
* change to update method and change to test * addressed comments Co-authored-by: Simon Piper <simonpiper@C02FL95VMD6M.local>
peterdavidhamilton
suggested changes
Feb 14, 2022
| instance_variable_get :@group | ||
| end | ||
|
|
||
| # @return [nil] |
Contributor
There was a problem hiding this comment.
Nice one @EdwinKruglov. Can these be a 2 liner, maybe with guard clause? Also, every method is currently public but I'm sure that's not the case anymore. @d-a-v-e is looking at getting the feature coverage of FaF up, but can you get unit test coverage for this form class in this branch, currently the whole file is being skipped.
peterdavidhamilton
approved these changes
Feb 14, 2022
AndrewCowle
pushed a commit
that referenced
this pull request
Feb 23, 2022
- Make navigation changes - Add "Is this the group or trust?" page - Add trusts to DSI journey and update kick-out page - Add school type to non-DSI CYA page - Add group search page - Add "Is it a school or group?" page - Make trust members eligible to access the service
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Changes in this PR