Skip to content

LIMS-1714: Populate Dewar.dewarRegistryId#936

Merged
ndg63276 merged 1 commit intopre-release/2025-R3.2from
improvement/LIMS-1714/populate-dewarregistryid
Jun 10, 2025
Merged

LIMS-1714: Populate Dewar.dewarRegistryId#936
ndg63276 merged 1 commit intopre-release/2025-R3.2from
improvement/LIMS-1714/populate-dewarregistryid

Conversation

@ndg63276
Copy link
Collaborator

JIRA ticket: LIMS-1714

Summary:

When we make a shipment, we should populate the Dewar.dewarRegistryId as well as facilityCode. Then on the shipment page, we currently show the dewar facility code based on the Dewar.facilityCode field, we should also allow joining to DewarRegistry by dewarRegistryId and then getting the facilityCode from there.

Changes:

  • Add function to get dewarRegistryId from facility code
  • Use it to populate the dewarRegistryId in dewars in new shipments, edited dewars, and new dewars in existing shipments
  • Display facility code based on dewarRegistryId, falling back to Dewar.facilityCode if needed

To test:

  • Go to any proposal and create a shipment, choosing a dewar facility code from the dropdown. Check both Dewar.dewarRegistryId and Dewar.facilityCode are populated correctly.
  • Edit the facility code on the dewar, check the Dewar.dewarRegistryId is updated as well as Dewar.facilityCode
  • Use the "Add Dewar" button to add another dewar, use a facility code, check both Dewar.dewarRegistryId and Dewar.facilityCode are populated correctly.
  • Repeat the tests setting the facilty code to "-", check the dewarRegistryId is set to null.

@ndg63276 ndg63276 changed the base branch from master to pre-release/2025-R3.2 June 10, 2025 10:30
@ndg63276 ndg63276 merged commit e5a10b6 into pre-release/2025-R3.2 Jun 10, 2025
2 checks passed
@ndg63276 ndg63276 deleted the improvement/LIMS-1714/populate-dewarregistryid branch June 10, 2025 10:31
ndg63276 added a commit that referenced this pull request Jun 24, 2025
* LIMS-1758: Fix slowness with plates with lots of subsamples (#941)

* LIMS-1758: Fix slowness with plates with lots of samples

* LIMS-1758: Remove unnecessary change

* LIMS-1758: Remove unnecessary whitespace

* LIMS-1758: Do large updates in chunks

* LIMS-1758: Use native JS

---------

Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>

* LIMS-1715: Clear sessionId from containers if a dewar transfer is requested (#939)

* LIMS-1715: Clear sessionId from containers if a dewar transfer is requested

* LIMS-1715: Clear sessionId from containers if a dewar transfer is requested

---------

Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>

* LIMS-1714: Populate Dewar.dewarRegistryId (#936)

Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>

* LIMS-1701: Make Xray Centring results an openable table (#935)

Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>

* LIMS-1642: Fix search when clicking x on search bars (#909)

Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>

* LIMS-1639: List most common screens at the top of the list (#928)

Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>

* LIMS-1777: Fix download of autoprocessing attachments on sm beamlines (#947)

Co-authored-by: Mark Williams <mark.williams@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