Skip to content

LIMS-1739: Add button to say shipment is ready for scheduling#945

Merged
ndg63276 merged 6 commits intopre-release/2025-R3.4from
improvement/LIMS-1739/shipment-ready-for-scheduling
Jul 8, 2025
Merged

LIMS-1739: Add button to say shipment is ready for scheduling#945
ndg63276 merged 6 commits intopre-release/2025-R3.4from
improvement/LIMS-1739/shipment-ready-for-scheduling

Conversation

@ndg63276
Copy link
Collaborator

@ndg63276 ndg63276 commented Jun 6, 2025

JIRA ticket: LIMS-1739

Summary:

If a user has selected "I would like a session to be scheduled" when creating a shipment, it is hard to know when they have created all the dewars and pucks within the shipment. We should have a button to say "My shipment is ready for scheduling". When the user has pressed this button, we should disable creating new dewars and pucks.

Changes:

  • Scheduling status is stored as JSON in the Shipping.extra column, under the 'DYNAMIC' key
  • Get scheduling status when getting dewars, so can hide the 'Add Container' button
  • Add new button for users to click when a shipment has all the dewars and pucks created
    • Only show the new button if the scheduling status is 'I would like a session to be scheduled'
    • Dont show the new button for industrial proposals
    • Show a confirmation dialog when clicked
    • Once confirmed, remove the scheduling status dropdown, the Add Dewar button, and the Add Container button
  • Add a remove function to editable for possible re-use
  • Move definition of industrial proposal codes to the config

To test:

  • Add this to the config
$industrial_prop_codes = array('sw', 'in', 'ic');
  • Log in as a non-staff member, eg eyg28471
  • Go to an mx proposal and create a shipment, choosing 'I would like a session to be scheduled', and click 'Add Shipment'
  • When you are taken to the shipment page, check the 'Scheduling' field says 'I would like a session to be scheduled', and there is a new button alongside it that says 'Shipment is ready for scheduling'
  • Check the Scheduling field is an editable dropdown, and the button disappears if another value is chosen from the list. Change it back to 'I would like a session to be scheduled'
  • Add a container to the dewar, then go back to the shipment page
  • Click the 'Shipment is ready for scheduling' button, check a confirmation dialog appears. Check Cancel just closes the dialog.
  • Click the button again and click 'Ok'. Check the Scheduling field now says 'I would like a session to be scheduled - my shipment is ready for scheduling'. Check it is now non-editable, and the button has disappeared.
  • Check the 'Add Dewar' and 'Add Container' buttons have disappeared.
  • Log in as a staff member and view the shipment. Check you can edit the dropdown to set the shipment back to 'I would like a session to be scheduled'.
  • Go to an industrial proposal, eg ic39117. Make a shipment, choosing 'I would like a session to be scheduled', and click 'Add Shipment'
  • When you are taken to the shipment page, check the 'Scheduling' field says 'I would like a session to be scheduled', but the new button is not displayed

@ndg63276 ndg63276 marked this pull request as ready for review June 18, 2025 14:56
Co-authored-by: Guilherme Francisco <guilherme.de-freitas@diamond.ac.uk>
@ndg63276 ndg63276 changed the base branch from master to pre-release/2025-R3.4 July 8, 2025 11:04
@ndg63276 ndg63276 merged commit c8ebf2d into pre-release/2025-R3.4 Jul 8, 2025
2 checks passed
ndg63276 added a commit that referenced this pull request Jul 22, 2025
* LIMS-1501: Allow re-running downstream processing (#948)

* LIMS-1501: Early work on re-running downstream processing

* LIMS-1501: Flesh out re-running downtream processing

* LIMS-1501: Remove unnecessary ProcessingJobParameters

* LIMS-1501: Enable fast_ep and some fast_dp

* LIMS-1501: Trigger zocalo directly

* LIMS-1501: Rename recipes for consistency

* LIMS-1501: Rename file more appropriately

---------

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

* LIMS-1771: Dont display zero dose on grouped collections (#951)

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

* LIMS-1688: Downstream processing wont display if filesystem not mounted (#953)

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

* LIMS-1739: Add button to say shipment is ready for scheduling (#945)

* LIMS-1739: Add button to say shipment is ready for scheduling

* LIMS-1739: Add button to say shipment is ready for scheduling

* LIMS-1739: Add contact instruction

* LIMS-1739: Dont show 'ready' button for industrial proposals

* Apply suggestions from code review

Co-authored-by: Guilherme Francisco <guilherme.de-freitas@diamond.ac.uk>

---------

Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>
Co-authored-by: Guilherme Francisco <guilherme.de-freitas@diamond.ac.uk>

---------

Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>
Co-authored-by: Guilherme Francisco <guilherme.de-freitas@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