Add hormone replacement therapy page by swebberuk · Pull Request #1016 · NHSDigital/dtos-manage-breast-screening

swebberuk · 2026-02-11T11:32:48Z

Added page to record details of hormone replacement therapy.

Page can be accessed from the 'record medical information' page.

Description

Jira link

https://nhsd-jira.digital.nhs.uk/browse/DTOSS-12223

Review notes

Review checklist

Check database queries are correctly scoped to current_provider

swebberuk · 2026-02-11T15:10:33Z

manage_breast_screening/mammograms/forms/other_information/hormone_replacement_therapy_form.py

+            choices=HormoneReplacementTherapy.Status,
+            label=f"Is {participant.full_name} currently taking HRT?",
+            label_classes="nhsuk-fieldset__legend--l",
+            page_heading=True,


Set page_heading=True as want the label to be <h1>. Required as pages must have a level-one heading and, unlike other pages, this page does not have a separate title.

swebberuk · 2026-02-11T15:17:36Z

manage_breast_screening/nhsuk_forms/fields/choice_fields.py

        visually_hidden_label_suffix=None,
        classes=None,
        choice_hints=None,
+        page_heading=False,


Added page_heading so can be used by label.jinja to determine if label should be wrapped in <h1>.

swebberuk · 2026-02-11T15:22:30Z

manage_breast_screening/participants/models/other_information/hormone_replacement_therapy.py

+        NO_BUT_STOPPED_RECENTLY = "NO_BUT_STOPPED_RECENTLY", "No, but stopped recently"
+        NO = "NO", "No"
+
+    appointment = models.OneToOneField(Appointment, on_delete=models.PROTECT)


Have defined relationship with appointment as one-to-one.

This is consistent with what we've done for Study.

This is different to what we've done for CystHistoryItem, even though we also restrict that to one per appointment.

appointment = models.ForeignKey( Appointment, on_delete=models.PROTECT, related_name="cyst_history_items", )

swebberuk · 2026-02-11T15:24:30Z

scripts/lint_model_usage_in_views.py

    "MastectomyOrLumpectomyHistoryItem",  # Temporarily allowed
    "OtherProcedureHistoryItem",  # Temporarily allowed
    "ParticipantReportedMammogram",  # Temporarily allowed
+    "HormoneReplacementTherapy",  # Temporarily allowed


Added this to avoid:

Disallowed references detected: - manage_breast_screening/mammograms/views/other_relevant_information/hormone_replacement_therapy_views.py:64 -> model.objects return HormoneReplacementTherapy.objects.get( make: *** [Makefile:110: test-lint] Error 1

Have followed same approach as used in other views, e.g. UpdateOtherProcedureHistoryView.

Don't know what the preferred solution for this is?

When we agree on a solution then should also fix for the other items in this list.

We shouldn't be adding to this list, the linter is here to avoid us unintentionally exposing data from other providers.

Instead of HormoneReplacmentTherapy.objects.get you can access it via the Appointment instance, and this will ensure that access is scoped to the user's allowed providers (as the appointment is already provider scoped).

You could add a filter to the .objects.get call to accomplish the same thing, but the linter is not smart enough to detect that.

swebberuk · 2026-02-11T15:30:07Z

manage_breast_screening/nhsuk_forms/jinja2/forms/label.jinja

 {% macro label_html(field) %}
  {% set unbound_field = field.field %}
+  {% if unbound_field.page_heading -%}
+  <h1 class="nhsuk-fieldset__heading">


The HRT page is different than other pages. It contains a single choice field without a title. For accessibility requirements, want the label of the choice field to be a level-one heading. Altered label.jinja to support that.

I'm a bit confused by this - that text is the legend, not a label.

I'd expect isPageHeading or similar to be set on a legend property. @MatMoore does our radio component support isPageHeading?

This macro name is a bit misleading as it can be used with both labels and legends. The naming follows the Django form field naming, and the form field abstraction doesn't care about the tags used in the html.

We are calling it like this in nhsuk_forms/jinja2/forms/radios.jinja:

"legend": { "html": label_html(field), "classes": unbound_field.label_classes }

The jinja component does support isPageHeading, but the above macro that converts between Django form field and component params doesn't pass it through.

It looks like this diff is producing the correct HTML, but we could equivalently add "isPageHeading": unbound_field.page_heading to the legend params above, and then we wouldn't need the extra conditional here (correct me if I'm wrong.)

If that's the case, then I think using that param would be preferable. The more we depend on nhsuk-frontend-jinja for our templating, the easier it will be to stay in sync with the design system.

edwardhorsford · 2026-02-13T15:25:34Z

Mentioned via slack, but we've slightly tweaked the hint text for these fields to be more specific.

MatMoore · 2026-02-17T11:50:25Z

manage_breast_screening/mammograms/forms/other_information/hormone_replacement_therapy_form.py

+        self.fields["status"] = ChoiceField(
+            choices=HormoneReplacementTherapy.Status,
+            label=f"Is {participant.full_name} currently taking HRT?",
+            label_classes="nhsuk-label--l",


As a sidenote, something I noticed recently is that at the component level, you can pass a size param (l/m/s) instead of specifying classes. So at some point it may be worth switching all the Field classes to that approach, to simplify the forms a bit further.

We only added the feature recently - but yes probably good to adopt.

MatMoore · 2026-02-17T11:56:30Z

manage_breast_screening/mammograms/jinja2/mammograms/record_medical_information.jinja

+        "value" : {
+            "html": hormone_replacement_therapy_details(presenter)
+        },
+        "actions": {


We could maybe make this whole actions object an attribute of the presenter, since there's no html involved here.

Have made this change.

MatMoore · 2026-02-17T12:03:08Z

manage_breast_screening/mammograms/presenters/medical_information_presenter.py

+            appointment.hormone_replacement_therapy
+            if hasattr(appointment, "hormone_replacement_therapy")
+            else None
+        )


can this be shortened to self.hormone_replacement_therapy = getattr(appointment, "hormone_replacement_therapy", None)?

MatMoore · 2026-02-17T12:07:09Z

manage_breast_screening/participants/models/other_information/hormone_replacement_therapy.py

+    )
+
+    status = models.CharField(choices=Status)
+    start_date = models.CharField(blank=True, null=False, default="")


I wonder if we should name this approx_start_date or something like that so it's clearer this is a free text value rather than an exact date? Maybe have a look at what we've done on the forms for previous mammograms and symptoms as they are similar I think.

Strong agree for explicit naming where these are approximate things

MatMoore · 2026-02-17T12:10:19Z

manage_breast_screening/participants/models/other_information/hormone_replacement_therapy.py

+    status = models.CharField(choices=Status)
+    start_date = models.CharField(blank=True, null=False, default="")
+    end_date = models.CharField(blank=True, null=False, default="")
+    previous_duration = models.CharField(blank=True, null=False, default="")


Same here, duration makes it sound more precise than it is.

MatMoore · 2026-02-17T12:17:42Z

scripts/lint_model_usage_in_views.py

    "MastectomyOrLumpectomyHistoryItem",  # Temporarily allowed
    "OtherProcedureHistoryItem",  # Temporarily allowed
    "ParticipantReportedMammogram",  # Temporarily allowed
+    "HormoneReplacementTherapy",  # Temporarily allowed


We shouldn't be adding to this list, the linter is here to avoid us unintentionally exposing data from other providers.

Instead of HormoneReplacmentTherapy.objects.get you can access it via the Appointment instance, and this will ensure that access is scoped to the user's allowed providers (as the appointment is already provider scoped).

You could add a filter to the .objects.get call to accomplish the same thing, but the linter is not smart enough to detect that.

github-actions · 2026-02-17T14:17:55Z

The review app at this URL has been deleted:
https://pr-1016.manage-breast-screening.non-live.screening.nhs.uk

swebberuk · 2026-02-17T16:09:48Z

Replaced HormoneReplacmentTherapy.objects.get with:

appointment = self.appointment
return appointment.hormone_replacement_therapy

Renamed start_date, end_date and previous_duration to approx_start_date, approx_end_date and approx_previous_duration.
Shortened:

appointment.hormone_replacement_therapy
if hasattr(appointment, "hormone_replacement_therapy")
  else None
 )

to getattr(appointment, "hormone_replacement_therapy", None)

Reverted change in labels.jinja and added "isPageHeading": unbound_field.page_heading to radios.jinja.

sonarqubecloud · 2026-02-18T10:34:46Z

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

swebberuk force-pushed the DTOSS-12223-hrt branch 3 times, most recently from 6b67fbd to e68c11b Compare February 11, 2026 15:09

swebberuk commented Feb 11, 2026

View reviewed changes

swebberuk force-pushed the DTOSS-12223-hrt branch from e68c11b to f5e6970 Compare February 11, 2026 15:15

swebberuk commented Feb 11, 2026

View reviewed changes

swebberuk changed the title ~~[wip] Add hormone replacement therapy page~~ Add hormone replacement therapy page Feb 11, 2026

swebberuk marked this pull request as ready for review February 11, 2026 15:36

swebberuk force-pushed the DTOSS-12223-hrt branch 2 times, most recently from c58ae3a to a526e0f Compare February 12, 2026 11:39

swebberuk mentioned this pull request Feb 12, 2026

[wip] Add pregnancy and breastfeeding page #1026

Closed

1 task

swebberuk requested a review from MatMoore February 17, 2026 08:44

MatMoore added the deploy label Feb 17, 2026

MatMoore requested changes Feb 17, 2026

View reviewed changes

swebberuk force-pushed the DTOSS-12223-hrt branch from 3194a9a to 8bf7c43 Compare February 17, 2026 13:09

swebberuk had a problem deploying to review February 17, 2026 13:13 — with GitHub Actions Failure

swebberuk had a problem deploying to review February 17, 2026 13:24 — with GitHub Actions Failure

swebberuk force-pushed the DTOSS-12223-hrt branch 2 times, most recently from b46e353 to 7eb6deb Compare February 17, 2026 13:37

swebberuk had a problem deploying to review February 17, 2026 13:38 — with GitHub Actions Failure

swebberuk added deploy and removed deploy labels Feb 17, 2026

swebberuk had a problem deploying to review February 17, 2026 13:56 — with GitHub Actions Failure

swebberuk force-pushed the DTOSS-12223-hrt branch from 86bfc87 to 16332eb Compare February 17, 2026 14:03

swebberuk had a problem deploying to review February 17, 2026 14:05 — with GitHub Actions Failure

swebberuk force-pushed the DTOSS-12223-hrt branch from 16332eb to e22578e Compare February 17, 2026 14:08

swebberuk temporarily deployed to review February 17, 2026 14:09 — with GitHub Actions Inactive

swebberuk force-pushed the DTOSS-12223-hrt branch from e22578e to 350f380 Compare February 17, 2026 14:13

swebberuk temporarily deployed to review February 17, 2026 14:15 — with GitHub Actions Inactive

swebberuk force-pushed the DTOSS-12223-hrt branch from 350f380 to 1ff8273 Compare February 17, 2026 14:59

swebberuk had a problem deploying to review February 17, 2026 15:00 — with GitHub Actions Failure

swebberuk force-pushed the DTOSS-12223-hrt branch 2 times, most recently from 2f76958 to 4353abe Compare February 17, 2026 15:41

swebberuk temporarily deployed to review February 17, 2026 15:42 — with GitHub Actions Inactive

swebberuk force-pushed the DTOSS-12223-hrt branch from 4353abe to cee1422 Compare February 17, 2026 15:54

swebberuk temporarily deployed to review February 17, 2026 15:55 — with GitHub Actions Inactive

swebberuk requested a review from MatMoore February 17, 2026 16:10

MatMoore approved these changes Feb 18, 2026

View reviewed changes

Add hormone replacement therapy page

c6b1b8f

swebberuk force-pushed the DTOSS-12223-hrt branch from cee1422 to c6b1b8f Compare February 18, 2026 10:33

swebberuk temporarily deployed to review February 18, 2026 10:35 — with GitHub Actions Inactive

swebberuk merged commit 9f5ccc0 into main Feb 18, 2026
15 checks passed

swebberuk deleted the DTOSS-12223-hrt branch February 18, 2026 10:42

swebberuk temporarily deployed to review February 18, 2026 10:42 — with GitHub Actions Inactive

This was referenced Feb 18, 2026

Add pregnancy and breastfeeding page #1041

Merged

Add other medical information page #1042

Open

[wip] Avoid using .objects.get #1046

Draft

Comments

Conversation

swebberuk commented Feb 11, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Jira link

Review notes

Review checklist

Uh oh!

swebberuk Feb 11, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

swebberuk Feb 11, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

swebberuk Feb 11, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

edwardhorsford commented Feb 13, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Feb 17, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

swebberuk commented Feb 17, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

sonarqubecloud bot commented Feb 18, 2026

Quality Gate passed

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

swebberuk commented Feb 11, 2026 •

edited

Loading

swebberuk Feb 11, 2026 •

edited

Loading

swebberuk Feb 11, 2026 •

edited

Loading

swebberuk Feb 11, 2026 •

edited

Loading

github-actions bot commented Feb 17, 2026 •

edited

Loading

swebberuk commented Feb 17, 2026 •

edited

Loading