Merge pull request #940 from NHSDigital/DTOSS-12064-check-info-personal-info

Add personal information feature card - check information

Author: cameronhargreaves1-nhs

manage_breast_screening/mammograms/jinja2/mammograms/check_information.jinja

@@ -1,12 +1,36 @@
 {% extends 'workflow_step.jinja' %}
+{% from "nhsuk/components/card/macro.jinja" import card %}
+{% from "nhsuk/components/summary-list/macro.jinja" import summaryList %}
+{% from "components/participant-details/summary_list_rows.jinja" import ethnicity_html %}
 
 {% set active_workflow_step = 'CHECK_INFORMATION' %}
 
 {% block step_content %}
   <p>Before concluding this appointment, confirm that the information recorded is correct.</p>
 {% endblock %}
 
+
 {% block wizard_form %}
+    {% block page_content %}
+        {% call card({
+        "heading": "Personal Information"
+        }) %}
+
+        {{ summaryList({
+            "rows": [
+            {
+                "key": {
+                    "text": "Ethnicity"
+                },
+                "value" : {
+                    "text": ethnicity_html(presented_appointment.participant) | default("Not provided", true) 
+                }
+            }
+            ]
+        }) }}
+
+        {% endcall %}
+    {% endblock %}
   <form action="{{ url('mammograms:complete_screening', kwargs={'pk': presented_appointment.pk}) }}" method="post" novalidate>
     {{ csrf_input }}
     {{ button({

manage_breast_screening/mammograms/views/mammogram_views.py

@@ -187,10 +187,12 @@ def check_information(request, pk):
     provider = request.user.current_provider
     try:
         appointment = provider.appointments.select_related(
+            "clinic_slot__clinic",
             "screening_episode__participant",
+            "screening_episode__participant__address",
         ).get(pk=pk)
     except Appointment.DoesNotExist:
-        raise Http404(APPOINTMENT_NOT_FOUND)
+        raise Http404("Appointment not found")
 
     return render(
         request,