v2.2.2 (work in progress)#3508
Merged
thomasleese merged 84 commits intomainfrom May 14, 2025
Merged
Conversation
Added phone_instructions string field to organisations and teams models to store additional context for phone numbers. Updated tests to verify that the field can be populated both through the onboarding YAML and manual editing. This allows staff to provide callers with guidance on phone menu options.
Added phone instructions display to user-facing views and notify personalisation. Phone instructions now appear in brackets next to phone numbers across the application interface. Updated the Notify personalisation variables to include these instructions in all automated communications.
We want to be able to authenticate with a client secret in dev environments, but the patch we made to OmniAuth's OpenID Connect strategy only worked with private key.
This allows us to return a more meaningful error when someone from an organisation that hasn't been setup in Mavis but that is otherwise setup correctly tries to login. This will be useful for pre-launch checks by orgs.
While fixing the feature specs for the change to the order that we check authentication details, it was obvious that the way mock_cis2_auth works is much too convoluted. This fixes that aspect of the test but also allows us to greatly simplify the interface to mock_cis2_auth in a future commit.
Additional wording to help make it clearer for onboarding.
- `scope.search_by_name` in `@form.apply` already sorts by match score - but `@form.apply` is given a scope that’s already ordered by the name alphabetically - `ActiveRecord.order(x).order(y)` merges the `order` criteria instead of applying them sequentially Signed-off-by: Alistair White-Horne <alistair.whitehorne@tngtech.com>
Changed update method from update! to update_column to prevent vaccination confirmation emails from updating the RECORD_UPDATED_AT column. This ensures that only genuine user edits to the record are reflected in the report, providing a more accurate last updated timestamp.
We have validation in place to ensure these numbers are valid.
Moved card rendering (children, vaccinations, consent notifications) from the show view into AppProgrammeStatsComponent. This will make it easier to test changes to the stats displayed, in isolation.
Turns out we don't use the class imports. Generating these dependend on data in the db, and removing them allows this generator to be run anywhere, not just in the environment that has the locations we're generating the data for.
This allows us to decouple the generator from the database, if desired.
This only generates cohort imports now.
This wasn't showing up because of the addition of programme type to the URL
The deadline action was an outlier in that it is accessible through nested routes either with the consent id, or session slug and programme types. This refactoring allows it to work with either routes.
Stops us from running out of memory.
There is an edge case where parents giving consent would get an error page if they begin the consent journey before the deadline has passed, but only finish it after. Instead of getting the helpful "the deadline has passed, please contact the SAIS team", they got the generic 500 error page. This fixes that and adds a test. https://good-machine.sentry.io/issues/6428092252/ https://nhsd-jira.digital.nhs.uk/browse/MAV-1123
This fixes an issue where schools that don't have children in year groups elligible were being added to the cohort import when using user-provided school year groups.
When changing the consent response from a child, currently this doesn't reset the "route" from self-consent, meaning that the consent continues to show as part of the self-consent journey even if the consent has been changed to be from a parent.
When changing the consent response from a child, currently this doesn't reset the "route" from self-consent, meaning that the consent continues to show as part of the self-consent journey even if the consent has been changed to be from a parent.
Incremental changes as a result of using these recently. See commits for the changes.
|
benilovj
approved these changes
May 14, 2025
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
8 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.
No description provided.