Skip to content

LIMS-656: Show auto subsamples if they have data#817

Merged
ndg63276 merged 4 commits into
pre-release/2024-R4.2from
improvement/LIMS-656/show-auto-subsamples-if-they-have-data
Sep 3, 2024
Merged

LIMS-656: Show auto subsamples if they have data#817
ndg63276 merged 4 commits into
pre-release/2024-R4.2from
improvement/LIMS-656/show-auto-subsamples-if-they-have-data

Conversation

@ndg63276
Copy link
Copy Markdown
Collaborator

JIRA ticket: LIMS-656

Summary:

If a subsample on a plate has an associated data collection, then it should always be shown, even if it is from an old inspection.

Changes:

  • Add an optional extra UNION to the subsample query showing "auto" samples with data collections

To test:

  • Go to /containers/cid/249257 and click on the bottom left most well (well 169). There should be (at time of writing) 4 extra subsamples in the list under "Marked Subsamples", the first has X=2286, Y=716 and corresponds to /dc/visit/nt30330-87/id/10216910
    image

  • Check well 1 on the same plate, there should be no difference in the number of subsamples shown as none have any data

@gfrn
Copy link
Copy Markdown
Collaborator

gfrn commented Aug 27, 2024

Well 1 seems to have one extra subsample (10 items are shown in the list), is that because new data was inserted since this ticket was created?

As an aside, clicking the "view collected data" button on a subsample, then clicking the permalink button, leads to an oddly placed modal being present, although this has no effect on the changes presented in this ticket.

@ndg63276
Copy link
Copy Markdown
Collaborator Author

Well 1 seems to have one extra subsample (10 items are shown in the list), is that because new data was inserted since this ticket was created?

Sorry, I didn't word it very well. Well 1 should have 10 items before and after this change. Well 169 should have 5 items before, and 9 items after this change.

@ndg63276 ndg63276 changed the base branch from master to pre-release/2024-R4.2 September 3, 2024 08:16
@ndg63276 ndg63276 merged commit 486e661 into pre-release/2024-R4.2 Sep 3, 2024
@ndg63276 ndg63276 deleted the improvement/LIMS-656/show-auto-subsamples-if-they-have-data branch September 3, 2024 08:22
@ndg63276 ndg63276 restored the improvement/LIMS-656/show-auto-subsamples-if-they-have-data branch September 3, 2024 10:57
@ndg63276 ndg63276 deleted the improvement/LIMS-656/show-auto-subsamples-if-they-have-data branch September 10, 2024 10:52
ndg63276 added a commit that referenced this pull request Sep 17, 2024
* LIMS-1432: Add shelxt downstream view (#818)

* LIMS-1436: Use auth provider provided logout URL when SSO is enabled (#822)

* LIMS-1108: Improve message re international shipping (#721)

* LIMS-1396: Use shipping service callback URL to only send emails once shipment is booked (#814)

* LIMS-1435: Put CCP4 location into config variable (#821)

* LIMS-656: Show auto subsamples if they have data (#817)

---------

Co-authored-by: Dean Keeble <dean.keeble@diamond.ac.uk>
Co-authored-by: Guilherme Francisco <guilherme.de-freitas@diamond.ac.uk>
Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants