Merge pull request #804 from NHSDigital/DTOSS-11583-small-buttons

Small buttons for the medical information page

Author: MatMoore

manage_breast_screening/mammograms/jinja2/mammograms/medical_information/medical_history/forms/mastectomy_or_lumpectomy_history.jinja

@@ -6,7 +6,7 @@
 {% block form %}
   <p>
     This is designed to capture information on prophylactic or elective surgery.
-    <a href="{{ presenter.add_breast_cancer_history_link.href }}" class="nhsuk-link">
+    <a href="{{ presenter.add_breast_cancer_history_button.href }}" class="nhsuk-link">
       Add breast cancer details
     </a>
     if that was the reason for this surgery.

manage_breast_screening/mammograms/jinja2/mammograms/record_medical_information.jinja

@@ -1,4 +1,5 @@
 {% extends "wizard_step.jinja" %}
+{% from "nhsuk/components/button/macro.jinja" import button %}
 {% from "nhsuk/components/card/macro.jinja" import card %}
 {% from "nhsuk/components/inset-text/macro.jinja" import insetText %}
 {% from "nhsuk/components/summary-list/macro.jinja" import summaryList %}
@@ -23,13 +24,18 @@
     }) }}
   {% endif %}
 
-  <p class="nhsuk-u-margin-top-4 nhsuk-u-margin-bottom-0">
-    <a href="{{ presenter.add_lump_link.href }}" class="nhsuk-link nhsuk-link--no-visited-state">{{ presenter.add_lump_link.text }}</a><br>
-    <a href="{{ presenter.add_swelling_or_shape_change_link.href }}" class="nhsuk-link nhsuk-link--no-visited-state">{{ presenter.add_swelling_or_shape_change_link.text }}</a><br>
-    <a href="{{ presenter.add_skin_change_link.href }}" class="nhsuk-link nhsuk-link--no-visited-state">{{ presenter.add_skin_change_link.text }}</a><br>
-    <a href="{{ presenter.add_nipple_change_link.href }}" class="nhsuk-link nhsuk-link--no-visited-state">{{ presenter.add_nipple_change_link.text }}</a><br>
-    <a href="{{ presenter.add_other_symptom_link.href }}" class="nhsuk-link nhsuk-link--no-visited-state">{{ presenter.add_other_symptom_link.text }}</a>
-  </p>
+  <hr>
+  <h3>Add symptoms</h3>
+
+  <div class="nhsuk-button-group app-button-group--small">
+    {% for button_info in presenter.symptom_buttons %}
+      {{ button({
+        "text": button_info.text,
+        "href": button_info.href,
+        "classes": "nhsuk-button--secondary nhsuk-button--small"
+      }) }}
+    {% endfor %}
+  </div>
 {% endcall %}
 
 {% set medical_history_card_html %}
@@ -40,7 +46,6 @@
       </a><br>
       {{ summaryList(presented_item.summary_list_params) }}
     {% endfor %}
-    <a href="{{ presenter.add_breast_cancer_history_link.href }}" class="nhsuk-link nhsuk-link--no-visited-state">{{ presenter.add_breast_cancer_history_link.text }}</a><br>
   {% endset %}
 
   {% set mastectomy_or_lumpectomy_history_html %}
@@ -50,7 +55,6 @@
       </a><br>
       {{ summaryList(presented_item.summary_list_params) }}
     {% endfor %}
-    <a href="{{ presenter.add_mastectomy_or_lumpectomy_history_link.href }}" class="nhsuk-link nhsuk-link--no-visited-state">{{ presenter.add_mastectomy_or_lumpectomy_history_link.text }}</a><br>
   {% endset %}
 
   {% set implanted_medical_device_history_html %}
@@ -60,7 +64,6 @@
       </a><br>
       {{ summaryList(presented_item.summary_list_params) }}
     {% endfor %}
-    <a href="{{ presenter.add_implanted_medical_device_history_link.href }}" class="nhsuk-link nhsuk-link--no-visited-state">{{ presenter.add_implanted_medical_device_history_link.text }}</a><br>
   {% endset %}
 
   {% set breast_augmentation_history_html %}
@@ -70,7 +73,6 @@
       </a><br>
       {{ summaryList(presented_item.summary_list_params) }}
     {% endfor %}
-    <a href="{{ presenter.add_breast_augmentation_history_link.href }}" class="nhsuk-link nhsuk-link--no-visited-state">{{ presenter.add_breast_augmentation_history_link.text }}</a><br>
   {% endset %}
 
   {% set other_procedure_history_html %}
@@ -80,7 +82,6 @@
       </a><br>
       {{ summaryList(presented_item.summary_list_params) }}
     {% endfor %}
-    <a href="{{ presenter.add_other_procedure_history_link.href }}" class="nhsuk-link nhsuk-link--no-visited-state">{{ presenter.add_other_procedure_history_link.text }}</a><br>
   {% endset %}
 
   {% set cyst_history_html %}
@@ -90,22 +91,15 @@
       </a><br>
       {{ summaryList(presented_item.summary_list_params) }}
     {% endfor %}
-    <a href="{{ presenter.add_cyst_history_link.href }}" class="nhsuk-link nhsuk-link--no-visited-state">{{ presenter.add_cyst_history_link.text }}</a><br>
   {% endset %}
 
-  {% set non_cancerous_lump_diagnosis_link %}
-  <a class="nhsuk-link" href="#">Enter non-cancerous lump diagnosis</a>
-  {% endset %}
   {% set benign_lump_history_html %}
     {% for presented_item in presenter.benign_lump_history %}
       {{ summaryList(presented_item.summary_list_params) }}
       <p><a href="{{ presented_item.change_link.href }}" class="nhsuk-link nhsuk-link--no-visited-state">{{ presented_item.change_link.text }}</a></p>
     {% endfor %}
-    <a href="{{ presenter.add_benign_lump_history_link.href }}" class="nhsuk-link nhsuk-link--no-visited-state">{{ presenter.add_benign_lump_history_link.text }}</a><br>
-  {% endset %}
-  {% set chest_procedures_link %}
-  <a class="nhsuk-link" href="#">Enter other breast or chest procedures</a>
   {% endset %}
+
   {{ summaryList({
     "rows": [
      {
@@ -206,6 +200,20 @@
      }
     ]
   }) }}
+
+  <hr>
+  <h3>Add medical history</h3>
+
+  <div class="nhsuk-button-group app-button-group--small">
+    {% for button_info in presenter.medical_history_buttons %}
+      {{ button({
+        "text": button_info.text,
+        "href": button_info.href,
+        "classes": "nhsuk-button--secondary nhsuk-button--small"
+      }) }}
+    {% endfor %}
+  </div>
+
 {% endset %}
 {{ card({
   "heading": "Medical history",

manage_breast_screening/mammograms/presenters/medical_information_presenter.py

@@ -24,7 +24,6 @@
 from manage_breast_screening.mammograms.presenters.symptom_presenter import (
     SymptomPresenter,
 )
-from manage_breast_screening.participants.models.symptom import SymptomType
 
 from .appointment_presenters import AppointmentPresenter
 
@@ -79,165 +78,151 @@ def symptom_rows(self):
         return [symptom.summary_list_row for symptom in self.symptoms]
 
     @property
-    def add_lump_link(self):
+    def symptom_buttons(self):
+        return [
+            self.add_lump_button,
+            self.add_swelling_or_shape_change_button,
+            self.add_skin_change_button,
+            self.add_nipple_change_button,
+            self.add_other_symptom_button,
+        ]
+
+    @property
+    def medical_history_buttons(self):
+        return [
+            self.add_breast_cancer_history_button,
+            self.add_implanted_medical_device_history_button,
+            self.add_breast_augmentation_history_button,
+            self.add_mastectomy_or_lumpectomy_history_button,
+            self.add_cyst_history_button,
+            self.add_benign_lump_history_button,
+            self.add_other_procedure_history_button,
+        ]
+
+    @property
+    def add_lump_button(self):
         url = reverse("mammograms:add_symptom_lump", kwargs={"pk": self.appointment.pk})
 
-        return {
-            "href": url,
-            "text": (
-                "Add another lump"
-                if SymptomType.LUMP in self.existing_symptom_type_ids
-                else "Add a lump"
-            ),
-        }
+        return {"href": url, "text": "Lump"}
 
     @property
-    def add_swelling_or_shape_change_link(self):
+    def add_swelling_or_shape_change_button(self):
         url = reverse(
             "mammograms:add_symptom_swelling_or_shape_change",
             kwargs={"pk": self.appointment.pk},
         )
 
-        return {
-            "href": url,
-            "text": (
-                "Add another swelling or shape change"
-                if SymptomType.SWELLING_OR_SHAPE_CHANGE
-                in self.existing_symptom_type_ids
-                else "Add a swelling or shape change"
-            ),
-        }
+        return {"href": url, "text": "Swelling or shape change"}
 
     @property
-    def add_skin_change_link(self):
+    def add_skin_change_button(self):
         url = reverse(
             "mammograms:add_symptom_skin_change",
             kwargs={"pk": self.appointment.pk},
         )
 
-        return {
-            "href": url,
-            "text": (
-                "Add another skin change"
-                if SymptomType.SKIN_CHANGE in self.existing_symptom_type_ids
-                else "Add a skin change"
-            ),
-        }
+        return {"href": url, "text": "Skin change"}
 
     @property
-    def add_nipple_change_link(self):
+    def add_nipple_change_button(self):
         url = reverse(
             "mammograms:add_symptom_nipple_change",
             kwargs={"pk": self.appointment.pk},
         )
 
-        return {
-            "href": url,
-            "text": (
-                "Add another nipple change"
-                if SymptomType.NIPPLE_CHANGE in self.existing_symptom_type_ids
-                else "Add a nipple change"
-            ),
-        }
+        return {"href": url, "text": "Nipple change"}
 
     @property
-    def add_other_symptom_link(self):
+    def add_other_symptom_button(self):
         url = reverse(
             "mammograms:add_symptom_other",
             kwargs={"pk": self.appointment.pk},
         )
 
-        return {
-            "href": url,
-            "text": (
-                "Add another symptom (other symptom)"
-                if SymptomType.NIPPLE_CHANGE in self.existing_symptom_type_ids
-                else "Add a symptom (other symptom)"
-            ),
-        }
+        return {"href": url, "text": "Other"}
 
     @property
-    def add_breast_cancer_history_link(self):
+    def add_breast_cancer_history_button(self):
         url = reverse(
             "mammograms:add_breast_cancer_history_item",
             kwargs={"pk": self.appointment.pk},
         )
 
         return {
             "href": url,
-            "text": ("Add breast cancer history"),
+            "text": "Breast cancer",
         }
 
     @property
-    def add_implanted_medical_device_history_link(self):
+    def add_implanted_medical_device_history_button(self):
         url = reverse(
             "mammograms:add_implanted_medical_device_history_item",
             kwargs={"pk": self.appointment.pk},
         )
 
         return {
             "href": url,
-            "text": ("Add implanted medical device history"),
+            "text": "Implanted medical device",
         }
 
     @property
-    def add_cyst_history_link(self):
+    def add_cyst_history_button(self):
         url = reverse(
             "mammograms:add_cyst_history_item",
             kwargs={"pk": self.appointment.pk},
         )
 
         return {
             "href": url,
-            "text": ("Add cyst history"),
+            "text": ("Cysts"),
         }
 
     @property
-    def add_breast_augmentation_history_link(self):
+    def add_breast_augmentation_history_button(self):
         url = reverse(
             "mammograms:add_breast_augmentation_history_item",
             kwargs={"pk": self.appointment.pk},
         )
 
         return {
             "href": url,
-            "text": ("Add breast augmentation history"),
+            "text": "Breast implants or augmentation",
         }
 
     @property
-    def add_benign_lump_history_link(self):
+    def add_benign_lump_history_button(self):
         url = reverse(
             "mammograms:add_benign_lump_history_item",
             kwargs={"pk": self.appointment.pk},
         )
 
         return {
             "href": url,
-            "text": "Add benign lump history",
+            "text": "Benign lumps",
         }
 
     @property
-    def add_mastectomy_or_lumpectomy_history_link(self):
+    def add_mastectomy_or_lumpectomy_history_button(self):
         url = reverse(
             "mammograms:add_mastectomy_or_lumpectomy_history_item",
             kwargs={"pk": self.appointment.pk},
         )
 
         return {
             "href": url,
-            "text": "Add mastectomy or lumpectomy history",
+            "text": "Mastectomy or lumpectomy",
         }
 
     @property
-    def add_other_procedure_history_link(self):
+    def add_other_procedure_history_button(self):
         url = reverse(
             "mammograms:add_other_procedure_history_item",
             kwargs={"pk": self.appointment.pk},
         )
 
         return {
             "href": url,
-            "text": "Add other procedure history",
+            "text": "Other procedures",
         }
 
     def _present_items(self, items, presenter_class):