Add additional image details #938

swebberuk · 2026-01-26T07:54:40Z

Add "Add additional image details" page. This is the page that is shown when a user selects "No, add additional image details..." from the "Record images taken" page.

Also included changes to have an incrementing total count of images, and to show "Repeat or extra image details captured on the next screen" message if any count > 1.

Note: This PR does not include the stepper input component. In this PR the form uses IntegerField for the image count fields. Will add stepper input component in a later PR.

Page is not linked to from any other pages yet. Can be accessed directly at http://127.0.0.1:8000/mammograms/1cbea52c-e47d-45e6-a12d-360b37056131/add-additional-image-details/

Description

Jira link

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

Review notes

Review checklist

Check database queries are correctly scoped to current_provider

swebberuk · 2026-01-26T08:28:10Z

manage_breast_screening/nhsuk_forms/jinja2/django_form_helpers.jinja

      {% endfor %}
-      {% for error_list in form.non_field_errors() %}
-        {% set ns.errors = ns.errors + [{"text": ",".join(error_list)}] %}
+      {% for error in form.non_field_errors() %}


Made this change to avoid error message being displayed as "E,n,t,e,r, ,a,t, ,l,e,a,s,t, ,o,n,e, ,i,m,a,g,e, ,c,o,u,n,t"

The error message is being set by doing self.add_error(None, "Enter at least one image count") in add_additional_image_details_form.py.

swebberuk · 2026-01-26T11:29:37Z

manage_breast_screening/mammograms/jinja2/mammograms/add_image_details.jinja

+{% block bodyEnd %}
+  {{ super() }}
+
+  <script>


Based on version from prototype: https://github.com/NHSDigital/manage-breast-screening-prototype/blob/d23122a1d11f565ed57275c4a4e1a73fd7a1eb9b/app/views/events/images-manual-details.html#L195

MatMoore

The backend looks good, but it looks like there's some missing CSS for progressive enhancement.

I'm not sure if need any more validation on the javascript side for invalid inputs. I just noticed that we are coercing bad values to 0 which seemed a bit suspicious.

MatMoore · 2026-01-27T08:46:52Z

manage_breast_screening/mammograms/forms/add_image_details_form.py

+            additional_details=self.cleaned_data.get("additional_details", ""),
+        )
+
+        self._add_series_if_provided(study, "MLO", "R", "rmlo_count")


[Suggestion; not blocking] We could potentially optimise this by using bulk_create instead of create https://docs.djangoproject.com/en/6.0/ref/models/querysets/#bulk-create

manage_breast_screening/mammograms/jinja2/mammograms/add_additional_image_details.jinja

MatMoore · 2026-01-27T09:08:08Z

manage_breast_screening/mammograms/jinja2/mammograms/add_additional_image_details.jinja

+      // Function to get all currently visible count inputs
+      const getCountInputs = () => {
+        return [
+          document.getElementById('id_rmlo_count'),


I'm wondering if it would be simpler to use a data attribute rather than looking these up individually by ID. Something like document.querySelectorAll('[data-count-input]')?

@colinrotherham are there any conventions we should follow for this kind of thing?

manage_breast_screening/mammograms/jinja2/mammograms/add_additional_image_details.jinja

malcolmbaig · 2026-01-27T12:24:32Z

manage_breast_screening/mammograms/forms/add_image_details_form.py

+                view_position=view_position,
+                laterality=laterality,
+                count=count,
+            )


We'll need to decide how we handle a scenario where the user presses the back button and re-submits the form (with or without changes to the field values). Currently this flow creates an additional set of Series records with each re-submission.

Potential options:

Delete all Series under the given Study and re-create

Detect existing Series records in the view and redirect somewhere (Check information?) with an info message

I've gone with a recreate in #943 (for the case where the default number of images were taken)

You might be able to reuse the StudyService from there.

Altered to use StudyService.

malcolmbaig · 2026-01-27T12:47:44Z

manage_breast_screening/mammograms/urls.py

+        "<uuid:pk>/add-additional-image-details/",
+        add_additional_image_details_view.AddAdditionalImageDetailsView.as_view(),
+        name="add_additional_image_details",
+    ),


Thinking about naming here, and opting for nouns to describe resources where possible — would /image-details suffice here?

I suspect we've been a bit consistent with URLs, and could adopt a common convention.

e.g. we could do something like this, throughout the service:

Method URL Description

GET /NOUN display a collection

GET /NOUN/<id> display a specific item

GET/POST /NOUN/new form for adding an item

GET/POST /NOUN/<id>/edit form for editing an item

GET/DELETE /NOUN/<id>/delete delete an item

My comments are addressed now

If any counts > 1 then show message about repeat images

Added app-js-only to hide elements when javascript not enabled

Renamed add_additional_image_details to add_image_details Replaced /add-additional-image-details/ with /image-details/new

sonarqubecloud · 2026-01-30T08:59:35Z

Quality Gate passed

Issues
0 New issues
0 Accepted issues

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

See analysis details on SonarQube Cloud

swebberuk force-pushed the DTOSS-11826-add-additional-image-details branch from df7cb95 to 60085ba Compare January 26, 2026 08:19

swebberuk commented Jan 26, 2026

View reviewed changes

swebberuk marked this pull request as ready for review January 26, 2026 08:28

swebberuk mentioned this pull request Jan 26, 2026

Dtoss 11828 image count script #939

Closed

1 task

swebberuk commented Jan 26, 2026

View reviewed changes

swebberuk requested review from MatMoore and malcolmbaig January 26, 2026 11:29

MatMoore previously requested changes Jan 27, 2026

View reviewed changes

malcolmbaig reviewed Jan 27, 2026

View reviewed changes

swebberuk force-pushed the DTOSS-11826-add-additional-image-details branch from 41b49e2 to 5d51dd6 Compare January 27, 2026 14:58

MatMoore mentioned this pull request Jan 27, 2026

Record images taken (are the images standard or not) #943

Merged

1 task

swebberuk force-pushed the DTOSS-11826-add-additional-image-details branch from a9c2eb4 to 8dfc5a9 Compare January 27, 2026 19:17

swebberuk added 6 commits January 29, 2026 16:36

Add additional image details

ce1446e

Update image count on Add additional details page

199aab5

If any counts > 1 then show message about repeat images

correct tests after rebase

bbbc39a

Changes from code review

02c774c

Added app-js-only to hide elements when javascript not enabled

Changes from code review

da12f9e

Renamed add_additional_image_details to add_image_details Replaced /add-additional-image-details/ with /image-details/new

Replaced additional_image_details with add_image_details

041022f

swebberuk force-pushed the DTOSS-11826-add-additional-image-details branch 2 times, most recently from 0cea346 to a537064 Compare January 29, 2026 17:50

Use StudyService

6f3eee7

swebberuk force-pushed the DTOSS-11826-add-additional-image-details branch from a537064 to 6f3eee7 Compare January 30, 2026 08:58

Method	URL	Description
GET	`/NOUN`	display a collection
GET	`/NOUN/<id>`	display a specific item
GET/POST	`/NOUN/new`	form for adding an item
GET/POST	`/NOUN/<id>/edit`	form for editing an item
GET/DELETE	`/NOUN/<id>/delete`	delete an item

Add additional image details #938

Are you sure you want to change the base?

Add additional image details #938

Conversation

swebberuk commented Jan 26, 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 Jan 26, 2026

Choose a reason for hiding this comment

Uh oh!

swebberuk Jan 26, 2026

Choose a reason for hiding this comment

Uh oh!

MatMoore left a comment

Choose a reason for hiding this comment

Uh oh!

MatMoore Jan 27, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

MatMoore Jan 27, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

malcolmbaig Jan 27, 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!

MatMoore Jan 28, 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!

swebberuk Jan 30, 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!

malcolmbaig Jan 27, 2026

Choose a reason for hiding this comment

Uh oh!

MatMoore Jan 27, 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!

malcolmbaig Jan 27, 2026

Choose a reason for hiding this comment

Uh oh!

sonarqubecloud bot commented Jan 30, 2026

Quality Gate passed

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

swebberuk commented Jan 26, 2026 •

edited

Loading

malcolmbaig Jan 27, 2026 •

edited

Loading

MatMoore Jan 28, 2026 •

edited

Loading

swebberuk Jan 30, 2026 •

edited

Loading

MatMoore Jan 27, 2026 •

edited

Loading