Merge pull request #3532 from nhsuk/patient-cards-in-session-lists-should-show-a-status-name

Patient cards in session lists should show a status name

Author: jhenderson

app/components/app_patient_session_search_result_card_component.rb

@@ -25,8 +25,8 @@ class AppPatientSessionSearchResultCardComponent < ViewComponent::Base
 
             if status_tag
               summary_list.with_row do |row|
-                row.with_key { "Status" }
-                row.with_value { status_tag }
+                row.with_key { I18n.t(status_tag[:key], scope: %i[status label]) }
+                row.with_value { status_tag[:value] }
               end
             end
           end %>
@@ -100,27 +100,54 @@ def status_tag
 
     case context
     when :register
-      render AppRegisterStatusTagComponent.new(
-               patient_session.registration_status&.status || "unknown"
-             )
+      {
+        key: :register,
+        value:
+          render(
+            AppRegisterStatusTagComponent.new(
+              patient_session.registration_status&.status || "unknown"
+            )
+          )
+      }
     when :consent
-      statuses =
-        patient_session.programmes.index_with do |programme|
-          patient.consent_status(programme:).status
-        end
-      render AppProgrammeStatusTagsComponent.new(statuses, outcome: :consent)
+      {
+        key: :consent,
+        value:
+          render(
+            AppProgrammeStatusTagsComponent.new(
+              patient_session.programmes.index_with do |programme|
+                patient.consent_status(programme:).status
+              end,
+              outcome: :consent
+            )
+          )
+      }
     when :triage
-      statuses =
-        patient_session.programmes.index_with do |programme|
-          patient.triage_status(programme:).status
-        end
-      render AppProgrammeStatusTagsComponent.new(statuses, outcome: :triage)
+      {
+        key: :triage,
+        value:
+          render(
+            AppProgrammeStatusTagsComponent.new(
+              patient_session.programmes.index_with do |programme|
+                patient.triage_status(programme:).status
+              end,
+              outcome: :triage
+            )
+          )
+      }
     else
-      statuses =
-        patient_session.programmes.index_with do |programme|
-          patient_session.session_status(programme:).status
-        end
-      render AppProgrammeStatusTagsComponent.new(statuses, outcome: :session)
+      {
+        key: :session,
+        value:
+          render(
+            AppProgrammeStatusTagsComponent.new(
+              patient_session.programmes.index_with do |programme|
+                patient_session.session_status(programme:).status
+              end,
+              outcome: :session
+            )
+          )
+      }
     end
   end
 end

app/components/app_search_component.rb

@@ -30,7 +30,7 @@ class AppSearchComponent < ViewComponent::Base
         <% end %>
 
         <% if triage_statuses.any? %>
-          <%= f.govuk_radio_buttons_fieldset :triage_status, legend: { text: "Triage outcome", size: "s" } do %>
+          <%= f.govuk_radio_buttons_fieldset :triage_status, legend: { text: "Triage status", size: "s" } do %>
             <%= f.govuk_radio_button :triage_status, "", label: { text: "Any" } %>
             <% triage_statuses.each do |status| %>
               <%= f.govuk_radio_button :triage_status, status, label: { text: t(status, scope: %i[status triage label]) } %>
@@ -48,7 +48,7 @@ class AppSearchComponent < ViewComponent::Base
         <% end %>
 
         <% if session_statuses.any? %>
-          <%= f.govuk_radio_buttons_fieldset :session_status, legend: { text: "Vaccination status", size: "s" } do %>
+          <%= f.govuk_radio_buttons_fieldset :session_status, legend: { text: "Session outcome", size: "s" } do %>
             <%= f.govuk_radio_button :session_status, "", label: { text: "Any" } %>
             <% session_statuses.each do |status| %>
               <%= f.govuk_radio_button :session_status, status, label: { text: t(status, scope: %i[status session label]) } %>

config/locales/status.en.yml

@@ -1,5 +1,10 @@
 en:
   status:
+    label:
+      consent: Consent status
+      triage: Triage status
+      register: Registration status
+      session: Session outcome
     consent:
       label:
         conflicts: Conflicting consent

spec/components/app_patient_session_search_result_card_component_spec.rb

@@ -27,7 +27,7 @@
 
   it { should have_link("SELDON, Hari", href:) }
   it { should have_text("Year 8") }
-  it { should have_text("Status") }
+  it { should have_text("Consent status") }
 
   context "when context is register" do
     let(:context) { :register }

spec/features/hpv_vaccination_delayed_spec.rb

@@ -107,7 +107,7 @@ def when_i_go_to_the_outcome_tab
   end
 
   def then_i_see_the_patient_has_no_outcome_yet
-    expect(page).to have_content("Status\nHPVUnwell")
+    expect(page).to have_content("Session outcome\nHPVUnwell")
   end
 
   def when_vaccination_confirmations_are_sent