Merge pull request #1134 from NHSDigital/DTOSS-12364-design-tweaks

cameronhargreaves1-nhs · web-flow · commit 752944ec4fd9 · 2026-03-10T13:47:02.000Z
Design tweaks from snagging
diff --git a/manage_breast_screening/core/jinja2/components/appointment-header/template.jinja b/manage_breast_screening/core/jinja2/components/appointment-header/template.jinja
@@ -5,7 +5,7 @@
 
 <p class="nhsuk-u-secondary-text-colour"><span>NHS Number: {{ participant.nhs_number }}</span></p>
 
-<p>{{ clinic_slot.slot_time_and_clinic_date }}</p>
+<p>{{ clinic_slot.slot_timestamp_multi_line }}</p>
 
 {% if appointment.can_be_started_by(user) %}
   <form action="{{ url('mammograms:start_appointment', kwargs={'pk': appointment.pk}) }}" method="post">
diff --git a/manage_breast_screening/core/jinja2/layout-appointment.jinja b/manage_breast_screening/core/jinja2/layout-appointment.jinja
@@ -32,11 +32,6 @@
         {{ app_appointment_status(presented_appointment) }}
 
         <ul class="nhsuk-list">
-          {% if not appointment.current_status.is_screened %}
-            <li>
-              <a href="#" class="nhsuk-link--no-visited-state">Cancel or reschedule appointment</a>
-            </li>
-          {% endif %}
           <li>
             <a href="{{ presented_appointment.special_appointment_url }}" class="nhsuk-link--no-visited-state"> 
               {% if presented_appointment.can_be_made_special %} Make special appointment
diff --git a/manage_breast_screening/mammograms/jinja2/mammograms/medical_information/other_information/forms/hormone_replacement_therapy.jinja b/manage_breast_screening/mammograms/jinja2/mammograms/medical_information/other_information/forms/hormone_replacement_therapy.jinja
@@ -23,10 +23,14 @@
 
         <div class="nhsuk-button-group">
           {{ button({
-            "text": "Save"
+            "text": "Continue"
           }) }}
         </div>
       </form>
+
+      <p>
+        <a class="nhsuk-link nhsuk-link--no-visited-state" href="{{ appointment_cannot_proceed_href }}">Appointment cannot proceed</a>
+      </p>
     </div>
   </div>
 {% endblock %}
diff --git a/manage_breast_screening/mammograms/jinja2/mammograms/medical_information/section_cards.jinja b/manage_breast_screening/mammograms/jinja2/mammograms/medical_information/section_cards.jinja
@@ -52,10 +52,10 @@
       "html": insetHtml,
       "classes": "nhsuk-u-margin-top-0 nhsuk-u-margin-bottom-4"
     }) }}
+    <hr>
   {% endif %}
 
   {% if not read_only %}
-    <hr>
     <h3>Add symptoms</h3>
 
     <div class="nhsuk-button-group app-button-group--small">
diff --git a/manage_breast_screening/mammograms/jinja2/mammograms/medical_information/symptoms/forms/inline_area_radios.jinja b/manage_breast_screening/mammograms/jinja2/mammograms/medical_information/symptoms/forms/inline_area_radios.jinja
@@ -69,9 +69,6 @@
         {
           "value": "OTHER",
           "text": "Other",
-          "hint": {
-            "text": "For example, the armpit"
-          },
           "conditional": {
             "html":  form.area_description_other.as_field_group()
           }
diff --git a/manage_breast_screening/mammograms/jinja2/mammograms/medical_information/symptoms/forms/simple_symptom.jinja b/manage_breast_screening/mammograms/jinja2/mammograms/medical_information/symptoms/forms/simple_symptom.jinja
@@ -3,6 +3,12 @@
 {% from "nhsuk/components/fieldset/macro.jinja" import fieldset %}
 
 {% block form %}
+  {% if heading_description %}
+    <div class="nhsuk-inset-text nhsuk-u-margin-top-0 nhsuk-u-margin-bottom-4">
+      <p>{{ heading_description }}</p>
+    </div>
+  {% endif %}
+
   {% include "mammograms/medical_information/symptoms/forms/inline_area_radios.jinja" %}
 
   {% do form.when_started.add_divider_after("OVER_THREE_YEARS", "or") %}
diff --git a/manage_breast_screening/mammograms/jinja2/mammograms/record_medical_information.jinja b/manage_breast_screening/mammograms/jinja2/mammograms/record_medical_information.jinja
@@ -29,17 +29,17 @@
 {% endcall %}
 
 {% call card_with_status(
-  presented_section=presenter.get_section(sections.SYMPTOMS),
+  presented_section=presenter.get_section(sections.MEDICAL_HISTORY),
   csrf_input=csrf_input,
   ) %}
-  {{ symptoms_content(presenter) }}
+  {{ medical_history_content(presenter) }}
 {% endcall %}
 
 {% call card_with_status(
-  presented_section=presenter.get_section(sections.MEDICAL_HISTORY),
+  presented_section=presenter.get_section(sections.SYMPTOMS),
   csrf_input=csrf_input,
   ) %}
-  {{ medical_history_content(presenter) }}
+  {{ symptoms_content(presenter) }}
 {% endcall %}
 
 {% call card_with_status(
diff --git a/manage_breast_screening/mammograms/jinja2/mammograms/show/appointment_details.jinja b/manage_breast_screening/mammograms/jinja2/mammograms/show/appointment_details.jinja
@@ -22,7 +22,7 @@
            "text": "Scheduled date and time"
          },
          "value": {
-           "text": presented_appointment.clinic_slot.slot_time_and_clinic_date| nl2br
+           "text": presented_appointment.clinic_slot.slot_timestamp_single_line | nl2br
          }
        },
        {
diff --git a/manage_breast_screening/mammograms/jinja2/mammograms/show/medical_information.jinja b/manage_breast_screening/mammograms/jinja2/mammograms/show/medical_information.jinja
@@ -11,15 +11,15 @@
 {% endcall %}
 
 {% call card({
-  "heading": "Symptoms"
+  "heading": "Medical history"
 }) %}
-  {{ symptoms_content(presenter, read_only=true) }}
+  {{ medical_history_content(presenter, read_only=true) }}
 {% endcall %}
 
 {% call card({
-  "heading": "Medical history"
+  "heading": "Symptoms"
 }) %}
-  {{ medical_history_content(presenter, read_only=true) }}
+  {{ symptoms_content(presenter, read_only=true) }}
 {% endcall %}
 
 {% call card({
diff --git a/manage_breast_screening/mammograms/presenters/appointment_presenters.py b/manage_breast_screening/mammograms/presenters/appointment_presenters.py
@@ -294,11 +294,18 @@ def clinic_url(self):
         return reverse("clinics:show_clinic", kwargs={"pk": self._clinic.pk})
 
     @cached_property
-    def slot_time_and_clinic_date(self):
+    def slot_timestamp_multi_line(self):
         clinic_slot = self._clinic_slot
         clinic = self._clinic
 
-        return f"{format_date(clinic.starts_at)} ({format_relative_date(clinic.starts_at)}) \n {format_time(clinic_slot.starts_at)} ({clinic_slot.duration_in_minutes} minutes)"
+        return f"{format_time(clinic_slot.starts_at)} ({clinic_slot.duration_in_minutes} minutes) - {format_date(clinic.starts_at)} ({format_relative_date(clinic.starts_at)})"
+
+    @cached_property
+    def slot_timestamp_single_line(self):
+        clinic_slot = self._clinic_slot
+        clinic = self._clinic
+
+        return f"{format_date(clinic_slot.starts_at)} ({format_relative_date(clinic.starts_at)}) \n {format_time(clinic.starts_at)} ({clinic_slot.duration_in_minutes} minutes)"
 
     @cached_property
     def clinic_date_and_slot_time(self):
diff --git a/manage_breast_screening/mammograms/tests/presenters/test_appointment_presenters.py b/manage_breast_screening/mammograms/tests/presenters/test_appointment_presenters.py
@@ -742,14 +742,14 @@ def test_clinic_url(self, clinic_slot_mock):
         )
 
     @time_machine.travel(datetime(2025, 5, 19, tzinfo=tz.utc))
-    def test_slot_time_and_clinic_date(self, clinic_slot_mock):
+    def test_slot_timestamp_multi_line(self, clinic_slot_mock):
         clinic_slot_mock.starts_at = datetime(2025, 1, 2, 9, 30)
         clinic_slot_mock.duration_in_minutes = 30
         clinic_slot_mock.clinic.starts_at = date(2025, 1, 2)
 
         assert (
-            ClinicSlotPresenter(clinic_slot_mock).slot_time_and_clinic_date
-            == "2 January 2025 (4 months, 17 days ago) \n 9:30am (30 minutes)"
+            ClinicSlotPresenter(clinic_slot_mock).slot_timestamp_multi_line
+            == "9:30am (30 minutes) - 2 January 2025 (4 months, 17 days ago)"
         )
 
     @time_machine.travel(datetime(2025, 5, 19, tzinfo=tz.utc))
diff --git a/manage_breast_screening/mammograms/views/other_information/hormone_replacement_therapy_views.py b/manage_breast_screening/mammograms/views/other_information/hormone_replacement_therapy_views.py
@@ -1,6 +1,7 @@
 import logging
 
 from django.shortcuts import redirect
+from django.urls import reverse
 
 from manage_breast_screening.core.views.generic import (
     AddWithAuditView,
@@ -23,6 +24,20 @@ class AddHormoneReplacementTherapyView(MedicalInformationMixin, AddWithAuditView
     template_name = TEMPLATE_NAME
     thing_name = THING_NAME
 
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+
+        context.update(
+            {
+                "appointment_cannot_proceed_href": reverse(
+                    "mammograms:appointment_cannot_go_ahead",
+                    kwargs={"pk": self.appointment.pk},
+                )
+            }
+        )
+
+        return context
+
     def dispatch(self, request, *args, **kwargs):
         if hasattr(self.appointment, "hormone_replacement_therapy"):
             return redirect(
diff --git a/manage_breast_screening/mammograms/views/symptom_views.py b/manage_breast_screening/mammograms/views/symptom_views.py
@@ -38,7 +38,7 @@ def get_back_link_params(self):
                 "mammograms:record_medical_information",
                 kwargs={"pk": self.appointment_pk},
             ),
-            "text": "Back to appointment",
+            "text": "Back",
         }
 
     def get_context_data(self, **kwargs):
@@ -131,6 +131,13 @@ class AddLumpView(AddSymptomView):
     form_class = LumpForm
     template_name = "mammograms/medical_information/symptoms/forms/simple_symptom.jinja"
 
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context["heading_description"] = (
+            "Lumps are a recognised symptom of breast cancer. Information recorded here will be highlighted during image reading."
+        )
+        return context
+
 
 class AddSwellingOrShapeChangeView(AddSymptomView):
     """
@@ -199,6 +206,13 @@ class ChangeLumpView(ChangeSymptomView):
     def extra_filters(self):
         return {"symptom_type_id": SymptomType.LUMP}
 
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context["heading_description"] = (
+            "Record whether the lump is in the left breast, right breast or both."
+        )
+        return context
+
 
 class ChangeSwellingOrShapeChangeView(ChangeSymptomView):
     """
diff --git a/manage_breast_screening/tests/system/clinical/test_add_hormone_replacement_therapy.py b/manage_breast_screening/tests/system/clinical/test_add_hormone_replacement_therapy.py
@@ -19,11 +19,11 @@ def test_adding_hormone_replacement_therapy(self):
         self.when_i_click_add_hormone_replacement_therapy()
         self.then_i_see_the_add_hormone_replacement_therapy_form()
 
-        self.when_i_click_save()
+        self.when_i_click_continue()
         self.then_i_see_validation_error_for_missing_status()
 
         self.when_i_select_no()
-        self.and_i_click_save()
+        self.and_i_click_continue()
 
         self.then_i_am_back_on_the_medical_information_page()
         self.and_the_message_says_hormone_replacement_therapy_added()
@@ -34,7 +34,7 @@ def test_adding_hormone_replacement_therapy(self):
 
         self.when_i_select_yes()
         self.and_enter_a_duration()
-        self.and_i_click_save()
+        self.and_i_click_continue()
 
         self.then_i_am_back_on_the_medical_information_page()
         self.and_the_message_says_hormone_replacement_therapy_updated()
@@ -103,10 +103,10 @@ def and_enter_a_duration(self):
             "August 2024"
         )
 
-    def and_i_click_save(self):
-        self.page.get_by_text("Save").click()
+    def and_i_click_continue(self):
+        self.page.get_by_text("Continue").click()
 
-    when_i_click_save = and_i_click_save
+    when_i_click_continue = and_i_click_continue
 
     def then_i_see_validation_error_for_missing_status(self):
         self.expect_validation_error(

Original file line number	Diff line number	Diff line change
`@@ -69,9 +69,6 @@`
`69`	`69`	`{`
`70`	`70`	`"value": "OTHER",`
`71`	`71`	`"text": "Other",`
`72`		`- "hint": {`
`73`		`- "text": "For example, the armpit"`
`74`		`- },`
`75`	`72`	`"conditional": {`
`76`	`73`	`"html": form.area_description_other.as_field_group()`
`77`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`"text": "Scheduled date and time"`
`23`	`23`	`},`
`24`	`24`	`"value": {`
`25`		`- "text": presented_appointment.clinic_slot.slot_time_and_clinic_date\| nl2br`
	`25`	`+ "text": presented_appointment.clinic_slot.slot_timestamp_single_line \| nl2br`
`26`	`26`	`}`
`27`	`27`	`},`
`28`	`28`	`{`