Version 6.13#5823
Merged
thomasleese merged 103 commits intomainfrom Jan 20, 2026
Merged
Conversation
Current hint text is potentially misleading - users might think Mavis automatically reports uploaded records to GPs and/or NHS England, which is not the case. We replace it with something clearer. MAV-3047
Jira-Issue: MAV-2913
This allows the user to choose from radio buttons between 1 and `Programme.maximum_dose_sequence` Jira-Issue: MAV-2916
On records which were bulk uploaded Jira-Issue: MAV-2905
Before this change, Mavis generates mismatched procedure terms and codes for flu vaccinations. This change: * fixes the underlying mismatch * reduces the likelihood of this happening in future by bringing together the code and term structures into one JIRA: https://nhsd-jira.digital.nhs.uk/browse/MAV-3076
…ixtures This makes the fixtures more true-to-life. JIRA: https://nhsd-jira.digital.nhs.uk/browse/MAV-3076
Adds information displayed in the command so we can quickly see any sites associated with the same URN and also GIAS year groups that might differ from the LocationProgrammeYearGroups associated with the school.
- DDoS provided OOTB - Add basic protection rules - Block known bad IPs - Add a rate limiter based on IP
- Required to execute this as a pre-deployment step
This removes the scope and replaces it usage with `has_programme_status`. Jira-Issue: MAV-2660
This removes the scope and replaces it usage with `has_programme_status`. Jira-Issue: MAV-2660
This removes the scope and replaces it usage with `has_programme_status`. Jira-Issue: MAV-2660
This updates the scope to use the `Patient::ProgrammeStatus` model to filter on vaccine criteria rather than the `Patient::ConsentStatus` and `Patient::TriageStatus` models, allowing us to eventually remove these models. Jira-Issue: MAV-2660
Remove `Patient` scopes for consent, triage and vaccination statuses
This ensures that any values being joined together are escaped correctly and don't result in XSS vulnerabilities.
Use `safe_join` instead of `join(...).html_safe`
Bumps [@hotwired/turbo-rails](https://github.com/hotwired/turbo-rails) from 8.0.20 to 8.0.21. - [Release notes](https://github.com/hotwired/turbo-rails/releases) - [Commits](https://github.com/hotwired/turbo-rails/commits/v8.0.21) --- updated-dependencies: - dependency-name: "@hotwired/turbo-rails" dependency-version: 8.0.21 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [turbo-rails](https://github.com/hotwired/turbo-rails) from 2.0.20 to 2.0.21. - [Release notes](https://github.com/hotwired/turbo-rails/releases) - [Commits](hotwired/turbo-rails@v2.0.20...v2.0.21) --- updated-dependencies: - dependency-name: turbo-rails dependency-version: 2.0.21 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [aws-sdk-rds](https://github.com/aws/aws-sdk-ruby) from 1.305.0 to 1.306.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/version-3/gems/aws-sdk-rds/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) --- updated-dependencies: - dependency-name: aws-sdk-rds dependency-version: 1.306.0 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [aws-sdk-iam](https://github.com/aws/aws-sdk-ruby) from 1.139.0 to 1.140.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/version-3/gems/aws-sdk-iam/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) --- updated-dependencies: - dependency-name: aws-sdk-iam dependency-version: 1.140.0 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [aws-sdk-ec2](https://github.com/aws/aws-sdk-ruby) from 1.590.0 to 1.591.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/version-3/gems/aws-sdk-ec2/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) --- updated-dependencies: - dependency-name: aws-sdk-ec2 dependency-version: 1.591.0 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
…vaccinator Allow bulk upload users to edit vaccinator
…dose-sequence Allow bulk upload users to edit dose sequence
…outcome Disallow bulk upload users from changing `outcome`
…ired/turbo-rails-8.0.21
Bumps [aws-sdk-accessanalyzer](https://github.com/aws/aws-sdk-ruby) from 1.84.0 to 1.85.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/version-3/gems/aws-sdk-accessanalyzer/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) --- updated-dependencies: - dependency-name: aws-sdk-accessanalyzer dependency-version: 1.85.0 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [nhsuk-frontend](https://github.com/nhsuk/nhsuk-frontend) from 10.3.0 to 10.3.1. - [Release notes](https://github.com/nhsuk/nhsuk-frontend/releases) - [Changelog](https://github.com/nhsuk/nhsuk-frontend/blob/main/CHANGELOG.md) - [Commits](nhsuk/nhsuk-frontend@v10.3.0...v10.3.1) --- updated-dependencies: - dependency-name: nhsuk-frontend dependency-version: 10.3.1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [solargraph](https://github.com/castwide/solargraph) from 0.58.1 to 0.58.2. - [Changelog](https://github.com/castwide/solargraph/blob/master/CHANGELOG.md) - [Commits](castwide/solargraph@v0.58.1...v0.58.2) --- updated-dependencies: - dependency-name: solargraph dependency-version: 0.58.2 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.211.0 to 1.212.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/version-3/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) --- updated-dependencies: - dependency-name: aws-sdk-s3 dependency-version: 1.212.0 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
…cr-1.119.0 Bump aws-sdk-ecr from 1.118.0 to 1.119.0
…k-frontend-10.3.1 Bump nhsuk-frontend from 10.3.0 to 10.3.1
…h-0.58.2 Bump solargraph from 0.58.1 to 0.58.2
…3-1.212.0 Bump aws-sdk-s3 from 1.211.0 to 1.212.0
This updates the `Patient::ProgrammeStatus` model to include an optional location association that works the same as the `Patient::VaccinationStatus` `latest_location` association. We need this to be able to fully replace all the usage of the `Patient::VaccinationStatus` model with the `Patient::ProgrammeStatus` and replicate the logic related to eligiblity of a session depending on where the patient was vaccinated. Jira-Issue: MAV-2660
Track location on programme status
Prevent onboarding schools already assigned to other teams
Fix reporting API root URL
We aren't able to use X26 in production, so we're using this one instead. Jira-Issue: MAV-2756
Change ods code
Update managing teams documentation to include the site object format for schools with multiple physical locations. Add notes on validation rules for sites and team assignment restrictions.
Document school sites in onboarding configuration
…vaccinator-and-dose-sequence-fix Hide "Change" vaccinator and dose sequence buttons for PoC users
When using all the schools in Mavis, there were severe performance issues on this page; both loading the page, and also searching in the dropdown list. This reduces the scope from 52167 to 27131 schools, which may make the performance manageable.
…location-performance-fix Filter schools when editing location on NR records
If there are no statuses to show on the child's search card, then remove the entire "Programme status" row
Rename functional tests to end-to-end tests
…how-programme-status Don't show programme status row if there are no statuses
|
benilovj
approved these changes
Jan 20, 2026
TheOneFromNorway
approved these changes
Jan 20, 2026
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
9 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.