wip

Author: thomasleese

app/components/app_patient_session_record_component.rb

@@ -8,11 +8,12 @@ class AppPatientSessionRecordComponent < ViewComponent::Base
     <% end %>
   ERB
 
-  def initialize(patient_session, programme:, vaccinate_form: nil)
+  def initialize(patient_session, programme:, current_user:, vaccinate_form:)
     super
 
     @patient_session = patient_session
     @programme = programme
+    @current_user = current_user
     @vaccinate_form = vaccinate_form || default_vaccinate_form
   end
 
@@ -27,7 +28,7 @@ def render?
 
   private
 
-  attr_reader :patient_session, :programme, :vaccinate_form
+  attr_reader :patient_session, :current_user, :programme, :vaccinate_form
 
   delegate :patient, :session, to: :patient_session
   delegate :academic_year, to: :session
@@ -39,7 +40,12 @@ def vaccination_record
   def default_vaccinate_form
     pre_screening_confirmed = patient.pre_screenings.today.exists?(programme:)
 
-    VaccinateForm.new(patient_session:, programme:, pre_screening_confirmed:)
+    VaccinateForm.new(
+      current_user:,
+      patient_session:,
+      programme:,
+      pre_screening_confirmed:
+    )
   end
 
   def heading

app/components/app_vaccinate_form_component.html.erb

@@ -1,5 +1,5 @@
 <%= form_with(
-     model: vaccinate_form,
+     model: form,
      url:,
      method: :post,
      class: "nhsuk-card",
@@ -54,6 +54,20 @@
       <% end %>
 
       <%= f.govuk_text_area :pre_screening_notes, label: { text: "Pre-screening notes (optional)" }, rows: 3 %>
+
+      <% if form.requires_supplied_by_user_id? %>
+        <%= f.govuk_select :supplied_by_user_id,
+                           label: { text: "Which nurse identified and pre-screened the child and supplied the vaccine?" },
+                           data: { module: "autocomplete" } do %>
+          <%= tag.option "", value: "" %>
+          <% form.supplied_by_users.each do |user| %>
+            <%= tag.option user.full_name,
+                           value: user.id,
+                           selected: user.id == form.supplied_by_user_id,
+                           data: { hint: user.email } %>
+          <% end %>
+        <% end %>
+      <% end %>
     </section>
 
     <hr class="nhsuk-section-break nhsuk-section-break--visible nhsuk-section-break--l">

app/components/app_vaccinate_form_component.rb

@@ -1,17 +1,17 @@
 # frozen_string_literal: true
 
 class AppVaccinateFormComponent < ViewComponent::Base
-  def initialize(vaccinate_form)
+  def initialize(form)
     super
 
-    @vaccinate_form = vaccinate_form
+    @form = form
   end
 
   private
 
-  attr_reader :vaccinate_form
+  attr_reader :form
 
-  delegate :patient_session, :programme, to: :vaccinate_form
+  delegate :patient_session, :programme, to: :form
   delegate :patient, :session, to: :patient_session
   delegate :academic_year, to: :session
 

app/components/app_vaccination_record_summary_component.rb

@@ -201,6 +201,13 @@ def call
         end
       end
 
+      if @vaccination_record.supplied_by.present?
+        summary_list.with_row do |row|
+          row.with_key { "Supplier" }
+          row.with_value { supplier_value }
+        end
+      end
+
       if @vaccination_record.performed_by.present?
         summary_list.with_row do |row|
           row.with_key { "Vaccinator" }
@@ -331,6 +338,13 @@ def time_value
     )
   end
 
+  def supplier_value
+    highlight_if(
+      @vaccination_record.supplied_by&.full_name,
+      @vaccination_record.supplied_by_user_id_changed?
+    )
+  end
+
   def vaccinator_value
     value =
       if @vaccination_record.performed_by == @current_user

app/controllers/draft_vaccination_records_controller.rb

@@ -17,6 +17,7 @@ class DraftVaccinationRecordsController < ApplicationController
   before_action :validate_params, only: :update
   before_action :set_batches, if: -> { current_step == :batch }
   before_action :set_locations, if: -> { current_step == :location }
+  before_action :set_supplied_by_users, if: -> { current_step == :supplier }
   before_action :set_back_link_path
 
   after_action :verify_authorized
@@ -231,6 +232,10 @@ def set_locations
     @locations = policy_scope(Location).community_clinic
   end
 
+  def set_supplied_by_users
+    @supplied_by_users = current_team.users.show_in_suppliers
+  end
+
   def set_back_link_path
     @back_link_path =
       if @draft_vaccination_record.editing?

app/forms/vaccinate_form.rb

@@ -13,6 +13,8 @@ class VaccinateForm
   attribute :pre_screening_confirmed, :boolean
   attribute :pre_screening_notes, :string
 
+  attribute :supplied_by_user_id, :integer
+
   attribute :vaccine_method, :string
   attribute :delivery_site, :string
   attribute :dose_sequence, :integer
@@ -31,10 +33,16 @@ class VaccinateForm
               maximum: 300
             }
 
-  validates :vaccine_method, inclusion: { in: :vaccine_method_options }
   validates :pre_screening_notes, length: { maximum: 1000 }
-
   validates :pre_screening_confirmed, presence: true, if: :administered?
+
+  validates :supplied_by_user_id,
+            inclusion: {
+              in: :supplied_by_user_id_values
+            },
+            if: :requires_supplied_by_user_id?
+
+  validates :vaccine_method, inclusion: { in: :vaccine_method_options }
   validates :delivery_site,
             inclusion: {
               in: :delivery_site_options
@@ -59,6 +67,10 @@ def delivery_site
     super
   end
 
+  def supplied_by_users = current_user.selected_team.users.show_in_suppliers
+
+  def requires_supplied_by_user_id? = !current_user.show_in_suppliers
+
   def save(draft_vaccination_record:)
     return nil if invalid?
 
@@ -93,6 +105,7 @@ def save(draft_vaccination_record:)
     draft_vaccination_record.patient_id = patient_session.patient_id
     draft_vaccination_record.performed_at = Time.current
     draft_vaccination_record.performed_by_user = current_user
+    draft_vaccination_record.supplied_by_user_id = supplied_by_user_id
     draft_vaccination_record.performed_ods_code = organisation.ods_code
     draft_vaccination_record.programme = programme
     draft_vaccination_record.session_id = patient_session.session_id
@@ -106,6 +119,8 @@ def save(draft_vaccination_record:)
 
   def administered? = vaccine_method != "none"
 
+  def supplied_by_user_id_values = supplied_by_users.pluck(:id)
+
   def vaccine_method_options
     programme.vaccine_methods + ["none"]
   end

app/models/draft_vaccination_record.rb

@@ -11,8 +11,8 @@ class DraftVaccinationRecord
   attribute :delivery_method, :string
   attribute :delivery_site, :string
   attribute :dose_sequence, :integer
+  attribute :first_active_wizard_step, :string
   attribute :full_dose, :boolean
-  attribute :protocol, :string
   attribute :identity_check_confirmed_by_other_name, :string
   attribute :identity_check_confirmed_by_other_relationship, :string
   attribute :identity_check_confirmed_by_patient, :boolean
@@ -27,8 +27,9 @@ class DraftVaccinationRecord
   attribute :performed_by_user_id, :integer
   attribute :performed_ods_code, :string
   attribute :programme_id, :integer
+  attribute :protocol, :string
   attribute :session_id, :integer
-  attribute :first_active_wizard_step, :string
+  attribute :supplied_by_user_id, :integer
 
   def initialize(current_user:, **attributes)
     @current_user = current_user
@@ -198,6 +199,16 @@ def session=(value)
     self.session_id = value.id
   end
 
+  def supplied_by
+    return nil if supplied_by_user_id.nil?
+
+    User.find(supplied_by_user_id)
+  end
+
+  def supplied_by=(value)
+    self.supplied_by_user_id = value.id
+  end
+
   def vaccination_record
     return nil if editing_id.nil?
 
@@ -276,7 +287,6 @@ def writable_attribute_names
       delivery_site
       dose_sequence
       full_dose
-      protocol
       identity_check
       location_id
       location_name
@@ -289,7 +299,9 @@ def writable_attribute_names
       performed_by_user_id
       performed_ods_code
       programme_id
+      protocol
       session_id
+      supplied_by_user_id
       vaccine_id
     ]
   end

app/models/user.rb

@@ -72,6 +72,9 @@ class User < ApplicationRecord
   scope :recently_active,
         -> { where(last_sign_in_at: 1.week.ago..Time.current) }
 
+  scope :show_in_suppliers,
+        -> { recently_active.where(show_in_suppliers: true) }
+
   enum :fallback_role,
        {
          nurse: 0,

app/views/draft_vaccination_records/confirm.html.erb

@@ -20,6 +20,7 @@
      delivery_site: wizard_path("delivery"),
      dose_volume: @draft_vaccination_record.wizard_steps.include?(:dose) ? wizard_path("dose") : nil,
      identity: wizard_path("identity"),
+     supplier: wizard_path("supplier"),
      location: @draft_vaccination_record.wizard_steps.include?(:location) ? wizard_path("location") : nil,
      notes: wizard_path("notes"),
      outcome: @draft_vaccination_record.wizard_steps.include?(:outcome) ? wizard_path("outcome") : nil,

app/views/draft_vaccination_records/supplier.html.erb

@@ -0,0 +1,22 @@
+<% content_for :before_main do %>
+  <%= render AppBacklinkComponent.new(@back_link_path) %>
+<% end %>
+
+<% title = "Which nurse identified and pre-screened the child and supplied the vaccine?" %>
+<% content_for :page_title, title %>
+
+<%= form_with model: @draft_vaccination_record, url: wizard_path, method: :put do |f| %>
+  <%= f.govuk_error_summary %>
+
+  <%= f.govuk_radio_buttons_fieldset :supplied_by_user_id,
+                                     caption: { text: @patient.full_name, size: "l" },
+                                     legend: { size: "l", tag: "h1",
+                                               text: title } do %>
+
+    <% @supplied_by_users.each do |user| %>
+      <%= f.govuk_radio_button :supplied_by_user_id, user.id, label: { text: user.full_name } %>
+    <% end %>
+  <% end %>
+
+  <%= f.govuk_submit "Continue" %>
+<% end %>