Merge pull request #5196 from nhsuk/rename-outcome-and-register

thomasleese · web-flow · commit 5769614b1a18 · 2025-11-12T19:06:37.000Z
Rename values to be more consistent
diff --git a/app/components/app_patient_search_form_component.rb b/app/components/app_patient_search_form_component.rb
@@ -86,16 +86,16 @@ class AppPatientSearchFormComponent < ViewComponent::Base
           <% end %>
         <% end %>
 
-        <% if register_statuses.any? %>
-          <%= f.govuk_radio_buttons_fieldset :register_status,
+        <% if registration_statuses.any? %>
+          <%= f.govuk_radio_buttons_fieldset :registration_status,
                                              legend: { text: "Registration status", size: "s" },
                                              small: true do %>
-            <%= f.govuk_radio_button :register_status, "", checked: form.register_status.blank?, label: { text: "Any" } %>
-            <% register_statuses.each do |status| %>
-              <%= f.govuk_radio_button :register_status,
+            <%= f.govuk_radio_button :registration_status, "", checked: form.registration_status.blank?, label: { text: "Any" } %>
+            <% registration_statuses.each do |status| %>
+              <%= f.govuk_radio_button :registration_status,
                                        status,
-                                       checked: form.register_status == status,
-                                       label: { text: t(status, scope: %i[status register label]) } %>
+                                       checked: form.registration_status == status,
+                                       label: { text: t(status, scope: %i[status registration label]) } %>
             <% end %>
           <% end %>
         <% end %>
@@ -236,7 +236,7 @@ def initialize(
     url:,
     programmes: [],
     consent_statuses: [],
-    register_statuses: [],
+    registration_statuses: [],
     triage_statuses: [],
     vaccination_statuses: [],
     patient_specific_direction_statuses: [],
@@ -252,7 +252,7 @@ def initialize(
 
     @programmes = programmes
     @consent_statuses = consent_statuses
-    @register_statuses = register_statuses
+    @registration_statuses = registration_statuses
     @triage_statuses = triage_statuses
     @vaccination_statuses = vaccination_statuses
     @patient_specific_direction_statuses = patient_specific_direction_statuses
@@ -270,7 +270,7 @@ def initialize(
               :url,
               :programmes,
               :consent_statuses,
-              :register_statuses,
+              :registration_statuses,
               :triage_statuses,
               :vaccination_statuses,
               :patient_specific_direction_statuses,
@@ -296,7 +296,7 @@ def open_details?
   def show_buttons_in_details?
     !(
       consent_statuses.any? || vaccination_statuses.any? ||
-        register_statuses.any? || triage_statuses.any? || year_groups.any?
+        registration_statuses.any? || triage_statuses.any? || year_groups.any?
     )
   end
 
diff --git a/app/components/app_patient_session_search_result_card_component.rb b/app/components/app_patient_session_search_result_card_component.rb
@@ -170,7 +170,7 @@ def status_tags
     when :record
       []
     when :register
-      [register_status_tag, vaccination_status_tag]
+      [registration_status_tag, vaccination_status_tag]
     when :consent
       [consent_status_tag]
     when :triage
@@ -196,14 +196,14 @@ def vaccination_status_tag
     }
   end
 
-  def register_status_tag
+  def registration_status_tag
     {
-      key: :register,
+      key: :registration,
       value:
         render(
           AppStatusTagComponent.new(
             patient.registration_status(session:)&.status || "unknown",
-            context: :register
+            context: :registration
           )
         )
     }
diff --git a/app/components/app_session_actions_component.rb b/app/components/app_session_actions_component.rb
@@ -96,7 +96,7 @@ def register_attendance_row
 
     status = "unknown"
     count = patients.has_registration_status(status, session:).count
-    href = session_register_path(session, register_status: status)
+    href = session_register_path(session, registration_status: status)
 
     generate_row(:children_to_register, count:, href:)
   end
diff --git a/app/controllers/concerns/patient_search_form_concern.rb b/app/controllers/concerns/patient_search_form_concern.rb
@@ -30,7 +30,7 @@ def patient_search_form_params
       :missing_nhs_number,
       :patient_specific_direction_status,
       :q,
-      :register_status,
+      :registration_status,
       :still_to_vaccinate,
       :triage_status,
       :vaccination_status,
diff --git a/app/forms/patient_search_form.rb b/app/forms/patient_search_form.rb
@@ -14,7 +14,7 @@ class PatientSearchForm < SearchForm
   attribute :patient_specific_direction_status, :string
   attribute :programme_types, array: true
   attribute :q, :string
-  attribute :register_status, :string
+  attribute :registration_status, :string
   attribute :still_to_vaccinate, :boolean
   attribute :triage_status, :string
   attribute :vaccination_status, :string
@@ -84,7 +84,7 @@ def apply(scope)
     scope = filter_programmes(scope)
     scope = filter_consent_statuses(scope)
     scope = filter_vaccination_statuses(scope)
-    scope = filter_register_status(scope)
+    scope = filter_registration_status(scope)
     scope = filter_triage_status(scope)
     scope = filter_vaccine_criteria(scope)
     scope = filter_patient_specific_direction_status(scope)
@@ -237,8 +237,8 @@ def filter_patient_specific_direction_status(scope)
     end
   end
 
-  def filter_register_status(scope)
-    if (status = register_status&.to_sym).present?
+  def filter_registration_status(scope)
+    if (status = registration_status&.to_sym).present?
       scope.has_registration_status(status, session:)
     else
       scope
diff --git a/app/lib/fhir_mapper/vaccination_record.rb b/app/lib/fhir_mapper/vaccination_record.rb
@@ -136,8 +136,7 @@ def fhir_status
       case outcome
       when "administered"
         "completed"
-      when "refused", "not_well", "contraindications", "already_had",
-           "absent_from_school", "absent_from_session"
+      when "refused", "unwell", "contraindicated", "already_had", "absent"
         "not-done"
       else
         raise ArgumentError, "Unknown outcome: #{outcome}"
diff --git a/app/lib/mavis_cli/stats/vaccinations.rb b/app/lib/mavis_cli/stats/vaccinations.rb
@@ -18,10 +18,10 @@ class Vaccinations < Dry::CLI::Command
       option :outcome,
              values: %w[
                administered
-               not_well
+               unwell
                already_had
-               contraindications
-               absent_from_session
+               contraindicated
+               absent
                refused
              ],
              desc: "Filter by specific outcome"
diff --git a/app/lib/status_generator/vaccination.rb b/app/lib/status_generator/vaccination.rb
@@ -117,20 +117,19 @@ def status_should_be_due?
   def status_should_be_eligible? = is_eligible?
 
   def latest_session_status_should_be_contraindicated?
-    vaccination_records.first&.contraindications?
+    vaccination_records.first&.contraindicated?
   end
 
   def latest_session_status_should_be_refused?
     vaccination_records.first&.refused?
   end
 
   def latest_session_status_should_be_absent?
-    vaccination_records.first&.absent_from_session? ||
-      attendance_record&.attending == false
+    vaccination_records.first&.absent? || attendance_record&.attending == false
   end
 
   def latest_session_status_should_be_unwell?
-    vaccination_records.first&.not_well?
+    vaccination_records.first&.unwell?
   end
 
   def latest_session_status_should_be_already_had?
diff --git a/app/models/immunisation_import_row.rb b/app/models/immunisation_import_row.rb
@@ -75,10 +75,10 @@ class ImmunisationImportRow
 
   REASONS_NOT_ADMINISTERED = {
     "refused" => :refused,
-    "unwell" => :not_well,
-    "vaccination contraindicated" => :contraindications,
+    "unwell" => :unwell,
+    "vaccination contraindicated" => :contraindicated,
     "already had elsewhere" => :already_had,
-    "did not attend" => :absent_from_session
+    "did not attend" => :absent
   }.freeze
 
   SCHOOL_URN_HOME_EDUCATED = "999999"
diff --git a/app/models/vaccination_record.rb b/app/models/vaccination_record.rb
@@ -163,10 +163,10 @@ class ActiveRecord_Relation < ActiveRecord::Relation
        {
          administered: 0,
          refused: 1,
-         not_well: 2,
-         contraindications: 3,
+         unwell: 2,
+         contraindicated: 3,
          already_had: 4,
-         absent_from_session: 6
+         absent: 6
        },
        validate: true
 
diff --git a/app/views/draft_vaccination_records/outcome.html.erb b/app/views/draft_vaccination_records/outcome.html.erb
@@ -21,11 +21,11 @@
 
     <%= f.govuk_radio_button :outcome, "already_had",
                              label: { text: "They have already had the vaccine" } %>
-    <%= f.govuk_radio_button :outcome, "contraindications",
+    <%= f.govuk_radio_button :outcome, "contraindicated",
                              label: { text: "They had contraindications" } %>
     <%= f.govuk_radio_button :outcome, "refused",
                              label: { text: "They refused it" } %>
-    <%= f.govuk_radio_button :outcome, "not_well",
+    <%= f.govuk_radio_button :outcome, "unwell",
                              label: { text: "They were not well enough" } %>
   <% end %>
 
diff --git a/app/views/patient_sessions/_header.html.erb b/app/views/patient_sessions/_header.html.erb
@@ -42,7 +42,7 @@
     <% attendance_record = @patient.attendance_records.find_or_initialize_by(location: @session.location, date:) %>
 
     <li class="app-action-list__item">
-      <%= render AppStatusTagComponent.new(@patient.registration_status(session: @session)&.status || "unknown", context: :register) %>
+      <%= render AppStatusTagComponent.new(@patient.registration_status(session: @session)&.status || "unknown", context: :registration) %>
     </li>
 
     <% attendance_record.session = @session %>
diff --git a/app/views/sessions/register/show.html.erb b/app/views/sessions/register/show.html.erb
@@ -16,7 +16,7 @@
             url: session_register_path(@session),
             programmes: @session.programmes,
             vaccination_statuses: Patient::VaccinationStatus.statuses.keys,
-            register_statuses: @statuses,
+            registration_statuses: @statuses,
             year_groups: @session.year_groups,
           ) %>
     </div>
diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -296,11 +296,11 @@ en:
           right_arm_lower_position: Right arm (lower position)
           right_arm_upper_position: Right arm (upper position)
         outcomes:
-          absent_from_session: Absent from session
+          absent: Absent from session
           administered: Vaccinated
           already_had: Already had the vaccine
-          contraindications: Had contraindications
-          not_well: Unwell
+          contraindicated: Had contraindications
+          unwell: Unwell
           refused: Refused vaccine
         protocols:
           national: National protocol
@@ -628,10 +628,10 @@ en:
         will_be_vaccinated_elsewhere: they will be given the vaccine elsewhere
     vaccination_mailer:
       reasons_did_not_vaccinate:
-        absent_from_session: they were not in the vaccination session
+        absent: they were not in the vaccination session
         already_had: they've already had the vaccine
-        contraindications: they had contraindications
-        not_well: the nurse decided %{short_patient_name} was not well
+        contraindicated: they had contraindications
+        unwell: the nurse decided %{short_patient_name} was not well
         refused: they refused when the nurse offered the vaccination
   notification_banner:
     info: Information
diff --git a/config/locales/status.en.yml b/config/locales/status.en.yml
@@ -3,7 +3,7 @@ en:
     label:
       consent: Consent status
       patient_specific_direction: PSD status
-      register: Registration status
+      registration: Registration status
       triage: Triage status
       vaccination: Programme status
     consent:
@@ -32,7 +32,7 @@ en:
       colour:
         added: green
         not_added: grey
-    register:
+    registration:
       label:
         attending: Attending session
         completed: Completed session
diff --git a/spec/components/app_patient_programmes_table_component_spec.rb b/spec/components/app_patient_programmes_table_component_spec.rb
@@ -76,7 +76,7 @@
           :vaccination_record,
           patient:,
           programme: programmes.first,
-          outcome: :contraindications,
+          outcome: :contraindicated,
           performed_at: today,
           session:
         )
@@ -95,7 +95,7 @@
           :vaccination_record,
           patient:,
           programme: programmes.first,
-          outcome: :not_well,
+          outcome: :unwell,
           performed_at: today,
           session:
         )
diff --git a/spec/components/app_vaccination_record_summary_component_spec.rb b/spec/components/app_vaccination_record_summary_component_spec.rb
@@ -57,7 +57,7 @@
     end
 
     context "when not administered" do
-      let(:outcome) { :not_well }
+      let(:outcome) { :unwell }
 
       it do
         expect(rendered).to have_css(
@@ -86,7 +86,7 @@
     end
 
     context "without a vaccine" do
-      let(:outcome) { :not_well }
+      let(:outcome) { :unwell }
       let(:vaccine) { nil }
       let(:batch) { nil }
       let(:other_batch) { nil }
@@ -122,7 +122,7 @@
     end
 
     context "without a vaccine" do
-      let(:outcome) { :not_well }
+      let(:outcome) { :unwell }
       let(:vaccine) { nil }
       let(:batch) { nil }
       let(:other_batch) { nil }
@@ -184,7 +184,7 @@
     it { should have_css(".nhsuk-summary-list__row", text: "Batch IDABC") }
 
     context "without a vaccine" do
-      let(:outcome) { :not_well }
+      let(:outcome) { :unwell }
       let(:vaccine) { nil }
       let(:batch) { nil }
       let(:other_batch) { nil }
@@ -202,7 +202,7 @@
     end
 
     context "without a vaccine" do
-      let(:outcome) { :not_well }
+      let(:outcome) { :unwell }
       let(:vaccine) { nil }
       let(:batch) { nil }
       let(:other_batch) { nil }
diff --git a/spec/factories/vaccination_records.rb b/spec/factories/vaccination_records.rb
@@ -134,7 +134,7 @@
     trait :not_administered do
       delivery_site { nil }
       delivery_method { nil }
-      outcome { "not_well" }
+      outcome { "unwell" }
       vaccine { nil }
       dose_sequence { nil }
       full_dose { nil }
@@ -145,19 +145,19 @@
       outcome { "already_had" }
     end
 
-    trait :contraindications do
+    trait :contraindicated do
       not_administered
-      outcome { "contraindications" }
+      outcome { "contraindicated" }
     end
 
     trait :refused do
       not_administered
       outcome { "refused" }
     end
 
-    trait :absent_from_session do
+    trait :absent do
       not_administered
-      outcome { "absent_from_session" }
+      outcome { "absent" }
     end
 
     trait :performed_by_not_user do
diff --git a/spec/features/cli_stats_vaccinations_spec.rb b/spec/features/cli_stats_vaccinations_spec.rb
diff --git a/spec/forms/patient_search_form_spec.rb b/spec/forms/patient_search_form_spec.rb
diff --git a/spec/lib/fhir_mapper/vaccination_record_spec.rb b/spec/lib/fhir_mapper/vaccination_record_spec.rb
diff --git a/spec/lib/stats/vaccinations_spec.rb b/spec/lib/stats/vaccinations_spec.rb
diff --git a/spec/lib/status_generator/vaccination_spec.rb b/spec/lib/status_generator/vaccination_spec.rb
diff --git a/spec/models/immunisation_import_row_spec.rb b/spec/models/immunisation_import_row_spec.rb

Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,7 @@ def status_tags`
`170`	`170`	`when :record`
`171`	`171`	`[]`
`172`	`172`	`when :register`
`173`		`- [register_status_tag, vaccination_status_tag]`
	`173`	`+ [registration_status_tag, vaccination_status_tag]`
`174`	`174`	`when :consent`
`175`	`175`	`[consent_status_tag]`
`176`	`176`	`when :triage`
`@@ -196,14 +196,14 @@ def vaccination_status_tag`
`196`	`196`	`}`
`197`	`197`	`end`
`198`	`198`
`199`		`- def register_status_tag`
	`199`	`+ def registration_status_tag`
`200`	`200`	`{`
`201`		`- key: :register,`
	`201`	`+ key: :registration,`
`202`	`202`	`value:`
`203`	`203`	`render(`
`204`	`204`	`AppStatusTagComponent.new(`
`205`	`205`	`patient.registration_status(session:)&.status \|\| "unknown",`
`206`		`- context: :register`
	`206`	`+ context: :registration`
`207`	`207`	`)`
`208`	`208`	`)`
`209`	`209`	`}`