Merge pull request #6455 from NHSDigital/next

Author: thomasleese

CONTRIBUTING.md

@@ -1,16 +1,22 @@
 # Contributing
 
-## Code reviews
+## Branching strategy
 
-All pull requests should be reviewed by another developer on the team before
-they can be merged in.
+We have three named long-lasting branches in the repo:
 
-Don't be afraid to use "Request changes" when suggesting changes to a pull
-request. This helps to make it easier to filter in lists of pull requests
-which are still in need of a review, and the person who raised the pull
-request can still dismiss the review if they disagree.
+- `release` - This represents the version of the code that is deployed to
+  production.
+- `main` - This represents the version of the code that is either deployed
+  to production or assured to be deployed to production.
+- `next`- This represents the code that is currently in development and not
+  yet ready to be deployed to production.
 
-## Branch naming
+In most cases, new PRs should be raised against the `next` branch, where once
+merged, will go out in the next scheduled release. In the case of an emergency
+release it can sometimes be necessary to raise a PR against the `main` branch,
+where the `next` branch is then rebased against `main` once merged in.
+
+### Naming
 
 We use simple descriptive names for branches such as `add-patient-model`.
 To tie commits to Jira tickets etc. we use Git trailers in the comment, e.g.
@@ -19,8 +25,18 @@ To tie commits to Jira tickets etc. we use Git trailers in the comment, e.g.
 Jira-Issue: MAV-1234
 ```
 
+## Code reviews
+
+All pull requests should be reviewed by another developer on the team before
+they can be merged in.
+
+Don't be afraid to use "Request changes" when suggesting changes to a pull
+request. This helps to make it easier to filter in lists of pull requests
+which are still in need of a review, and the person who raised the pull
+request can still dismiss the review if they disagree.
+
 ## Merging
 
-We use a simple merge rather than a squash merge. Consider doing an interactive
-rebase first, to squash any trivial commits that don't add any value to change
-history by themselves.
+We use a simple merge rather than a squash merge. Consider doing an
+interactive rebase first, to squash any trivial commits that don't add any
+value to change history by themselves.

Gemfile

@@ -4,7 +4,7 @@ source "https://rubygems.org"
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 ruby file: ".ruby-version"
-gem "rails", "8.1.2.1"
+gem "rails", "8.1.3"
 
 # Framework gems
 gem "bootsnap", require: false

Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/citizensadvice/capybara_accessible_selectors.git
-  revision: dd47f6a892ecffbc76154336dba7c43a28eb4913
+  revision: 69cddaeb83625b539f32df22adbee29b3d0ed255
   specs:
     capybara_accessible_selectors (0.15.0)
       capybara (~> 3.36)
@@ -27,9 +27,9 @@ GEM
   specs:
     action_text-trix (2.1.17)
       railties
-    actioncable (8.1.2.1)
-      actionpack (= 8.1.2.1)
-      activesupport (= 8.1.2.1)
+    actioncable (8.1.3)
+      actionpack (= 8.1.3)
+      activesupport (= 8.1.3)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
@@ -39,54 +39,54 @@ GEM
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (8.1.2.1)
-      actionpack (= 8.1.2.1)
-      activejob (= 8.1.2.1)
-      activerecord (= 8.1.2.1)
-      activestorage (= 8.1.2.1)
-      activesupport (= 8.1.2.1)
+    actionmailbox (8.1.3)
+      actionpack (= 8.1.3)
+      activejob (= 8.1.3)
+      activerecord (= 8.1.3)
+      activestorage (= 8.1.3)
+      activesupport (= 8.1.3)
       mail (>= 2.8.0)
-    actionmailer (8.1.2.1)
-      actionpack (= 8.1.2.1)
-      actionview (= 8.1.2.1)
-      activejob (= 8.1.2.1)
-      activesupport (= 8.1.2.1)
+    actionmailer (8.1.3)
+      actionpack (= 8.1.3)
+      actionview (= 8.1.3)
+      activejob (= 8.1.3)
+      activesupport (= 8.1.3)
       mail (>= 2.8.0)
       rails-dom-testing (~> 2.2)
-    actionpack (8.1.2.1)
-      actionview (= 8.1.2.1)
-      activesupport (= 8.1.2.1)
+    actionpack (8.1.3)
+      actionview (= 8.1.3)
+      activesupport (= 8.1.3)
       nokogiri (>= 1.8.5)
       rack (>= 2.2.4)
       rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
       useragent (~> 0.16)
-    actiontext (8.1.2.1)
+    actiontext (8.1.3)
       action_text-trix (~> 2.1.15)
-      actionpack (= 8.1.2.1)
-      activerecord (= 8.1.2.1)
-      activestorage (= 8.1.2.1)
-      activesupport (= 8.1.2.1)
+      actionpack (= 8.1.3)
+      activerecord (= 8.1.3)
+      activestorage (= 8.1.3)
+      activesupport (= 8.1.3)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (8.1.2.1)
-      activesupport (= 8.1.2.1)
+    actionview (8.1.3)
+      activesupport (= 8.1.3)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
     active_record_union (1.4.0)
       activerecord (>= 6.0)
-    activejob (8.1.2.1)
-      activesupport (= 8.1.2.1)
+    activejob (8.1.3)
+      activesupport (= 8.1.3)
       globalid (>= 0.3.6)
-    activemodel (8.1.2.1)
-      activesupport (= 8.1.2.1)
-    activerecord (8.1.2.1)
-      activemodel (= 8.1.2.1)
-      activesupport (= 8.1.2.1)
+    activemodel (8.1.3)
+      activesupport (= 8.1.3)
+    activerecord (8.1.3)
+      activemodel (= 8.1.3)
+      activesupport (= 8.1.3)
       timeout (>= 0.4.0)
     activerecord-import (2.2.0)
       activerecord (>= 4.2)
@@ -96,13 +96,13 @@ GEM
       cgi (>= 0.3.6)
       rack (>= 2.0.8, < 4)
       railties (>= 7.0)
-    activestorage (8.1.2.1)
-      actionpack (= 8.1.2.1)
-      activejob (= 8.1.2.1)
-      activerecord (= 8.1.2.1)
-      activesupport (= 8.1.2.1)
+    activestorage (8.1.3)
+      actionpack (= 8.1.3)
+      activejob (= 8.1.3)
+      activerecord (= 8.1.3)
+      activesupport (= 8.1.3)
       marcel (~> 1.0)
-    activesupport (8.1.2.1)
+    activesupport (8.1.3)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.3.1)
@@ -175,7 +175,7 @@ GEM
       protocol-websocket (~> 0.17)
     attr_required (1.0.2)
     aws-eventstream (1.4.0)
-    aws-partitions (1.1228.0)
+    aws-partitions (1.1229.0)
     aws-sdk-accessanalyzer (1.86.0)
       aws-sdk-core (~> 3, >= 3.244.0)
       aws-sigv4 (~> 1.5)
@@ -199,7 +199,7 @@ GEM
     aws-sdk-kms (1.123.0)
       aws-sdk-core (~> 3, >= 3.244.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-rds (1.309.0)
+    aws-sdk-rds (1.310.0)
       aws-sdk-core (~> 3, >= 3.244.0)
       aws-sigv4 (~> 1.5)
     aws-sdk-s3 (1.217.0)
@@ -360,14 +360,14 @@ GEM
     fiber-local (1.1.0)
       fiber-storage
     fiber-storage (1.0.1)
-    flipper (1.4.0)
+    flipper (1.4.1)
       concurrent-ruby (< 2)
-    flipper-active_record (1.4.0)
+    flipper-active_record (1.4.1)
       activerecord (>= 4.2, < 9)
-      flipper (~> 1.4.0)
-    flipper-ui (1.4.0)
+      flipper (~> 1.4.1)
+    flipper-ui (1.4.1)
       erubi (>= 1.0.0, < 2.0.0)
-      flipper (~> 1.4.0)
+      flipper (~> 1.4.1)
       rack (>= 1.4, < 4)
       rack-protection (>= 1.5.3, < 5.0.0)
       rack-session (>= 1.0.2, < 3.0.0)
@@ -386,7 +386,7 @@ GEM
       activemodel (>= 6.1)
       activesupport (>= 6.1)
       html-attributes-utils (~> 1)
-    govuk_markdown (2.0.3)
+    govuk_markdown (2.0.4)
       activesupport
       redcarpet
     haml (7.1.0)
@@ -424,7 +424,7 @@ GEM
     jmespath (1.6.2)
     jsbundling-rails (1.3.1)
       railties (>= 6.0.0)
-    json (2.19.2)
+    json (2.19.3)
     json-jwt (1.17.0)
       activesupport (>= 4.2)
       aes_key_wrap
@@ -618,20 +618,20 @@ GEM
       rack (>= 1.0.0)
     rackup (2.3.1)
       rack (>= 3)
-    rails (8.1.2.1)
-      actioncable (= 8.1.2.1)
-      actionmailbox (= 8.1.2.1)
-      actionmailer (= 8.1.2.1)
-      actionpack (= 8.1.2.1)
-      actiontext (= 8.1.2.1)
-      actionview (= 8.1.2.1)
-      activejob (= 8.1.2.1)
-      activemodel (= 8.1.2.1)
-      activerecord (= 8.1.2.1)
-      activestorage (= 8.1.2.1)
-      activesupport (= 8.1.2.1)
+    rails (8.1.3)
+      actioncable (= 8.1.3)
+      actionmailbox (= 8.1.3)
+      actionmailer (= 8.1.3)
+      actionpack (= 8.1.3)
+      actiontext (= 8.1.3)
+      actionview (= 8.1.3)
+      activejob (= 8.1.3)
+      activemodel (= 8.1.3)
+      activerecord (= 8.1.3)
+      activestorage (= 8.1.3)
+      activesupport (= 8.1.3)
       bundler (>= 1.15.0)
-      railties (= 8.1.2.1)
+      railties (= 8.1.3)
     rails-dom-testing (2.3.0)
       activesupport (>= 5.0.0)
       minitest
@@ -643,9 +643,9 @@ GEM
       rack
       railties (>= 5.1)
       semantic_logger (~> 4.16)
-    railties (8.1.2.1)
-      actionpack (= 8.1.2.1)
-      activesupport (= 8.1.2.1)
+    railties (8.1.3)
+      actionpack (= 8.1.3)
+      activesupport (= 8.1.3)
       irb (~> 1.13)
       rackup (>= 1.0.0)
       rake (>= 12.2)
@@ -667,7 +667,7 @@ GEM
     redcarpet (3.6.1)
     redis (5.4.1)
       redis-client (>= 0.22.0)
-    redis-client (0.27.0)
+    redis-client (0.28.0)
       connection_pool
     redis-prescription (2.6.0)
     regexp_parser (2.11.3)
@@ -782,7 +782,7 @@ GEM
       sidekiq (>= 5.0)
     shoulda-matchers (7.0.1)
       activesupport (>= 7.1)
-    sidekiq (8.1.1)
+    sidekiq (8.1.2)
       connection_pool (>= 3.0.0)
       json (>= 2.16.0)
       logger (>= 1.7.0)
@@ -992,7 +992,7 @@ DEPENDENCIES
   pstore
   pundit
   rack_session_access
-  rails (= 8.1.2.1)
+  rails (= 8.1.3)
   rails_semantic_logger
   rainbow
   redis

app/components/app_activity_log_component.rb

@@ -429,13 +429,14 @@ def pre_screening_events
   end
 
   def session_events
-    patient_locations.map do |patient_location|
-      [
-        {
-          title: "Added to the session at #{patient_location.location.name}",
-          at: patient_location.created_at
-        }
-      ]
+    patient_locations.filter_map do |patient_location|
+      location = patient_location.location
+      next if location.generic_school?
+
+      {
+        title: "Added to the session at #{location.name}",
+        at: patient_location.created_at
+      }
     end
   end
 

app/components/app_location_card_component.rb

@@ -21,13 +21,9 @@ def call
 
   delegate :govuk_summary_list, to: :helpers
 
-  def link_to
-    school_patients_path(
-      location.generic_clinic? ? Location::URN_UNKNOWN : location
-    )
-  end
+  def link_to = school_patients_path(location)
 
-  def heading = location.school_name
+  def heading = location.name
 
   def rows
     [

app/components/app_patient_programme_vaccination_card_component.html.erb

@@ -50,4 +50,12 @@
       <% end %>
     <% end %>
   <% end %>
+
+  <% if can_record_new_vaccination? %>
+    <div class="nhsuk-button-group">
+      <%= govuk_button_to "Record a vaccination in clinic",
+                          record_new_vaccination_patient_programme_path(patient, programme),
+                          secondary: true %>
+    </div>
+  <% end %>
 <% end %>

app/components/app_patient_programme_vaccination_card_component.rb

@@ -10,10 +10,14 @@ def initialize(patient, academic_year:, programme: nil, show_caption: false)
 
   private
 
-  delegate :govuk_table, :vaccination_record_source, to: :helpers
-
   attr_reader :patient, :academic_year, :programme, :show_caption
 
+  delegate :govuk_button_to,
+           :govuk_table,
+           :policy,
+           :vaccination_record_source,
+           to: :helpers
+
   def vaccination_records
     patient
       .vaccination_records
@@ -40,4 +44,14 @@ def programme_status_tag
       resolved_status.fetch(:prefix) => resolved_status
     )
   end
+
+  def can_record_new_vaccination?
+    programme_status = patient.programme_status(programme, academic_year:)
+
+    if programme_status.not_eligible? || programme_status.vaccinated?
+      return false
+    end
+
+    policy(VaccinationRecord.new).new?
+  end
 end