-
Notifications
You must be signed in to change notification settings - Fork 30
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
ULIMS-50: Shipping service incoming shipment redirect #731
ULIMS-50: Shipping service incoming shipment redirect #731
Conversation
Just so we have it in writing, what is the purpose of |
The required database change has now been made, see DiamondLightSource/ispyb-database#228 |
Co-authored-by: Guilherme Francisco <guilherme.de-freitas@diamond.ac.uk>
Co-authored-by: Guilherme Francisco <guilherme.de-freitas@diamond.ac.uk>
Co-authored-by: Guilherme Francisco <guilherme.de-freitas@diamond.ac.uk>
Co-authored-by: Guilherme Francisco <guilherme.de-freitas@diamond.ac.uk>
New things to test:
|
There is a possible non-issue, where if you manually delete the package description/shipping date, they cause validation to fail as they are still required, unlike all the other fields. Not sure if this is an issue, since this would require users to deliberately "break" their own shipment, and I don't see a way this could happen during the "automated" process |
* Restore EM menu in dropdown (#766) * Pre release/2024 r2.2 (#770) * LIMS-1201: Amend name of XPDF capillary crystal to use user acronym (#738) Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> * LIMS-1256: Remove validation from Local Contact field (#756) Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> * LIMS-667: Make the Requested Imager a required field if a plate is being created (#733) Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> * LIMS-1261: Fix the grid scan heat maps on the VMXi container view (#744) Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> * LIMS-1289: Fix sample and pdb count on protens page (#753) Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> --------- Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> * Pre release/2024 r2.3 (#772) * LIMS-1207: Move Calendar link to top left * LIMS-1207: Move Migrate link to Lab Contacts page * LIMS-1207: Re-order menu, remove Assign Containers * LIMS-1201: Amend name of XPDF capillary crystal to use user acronym (#738) Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> * LIMS-1256: Remove validation from Local Contact field (#756) Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> * LIMS-667: Make the Requested Imager a required field if a plate is being created (#733) Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> * LIMS-1261: Fix the grid scan heat maps on the VMXi container view (#744) Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> * LIMS-1289: Fix sample and pdb count on protens page (#753) Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> * LIMS-1304: Correct the order of before and after snapshots * LIMS-1304: Update to fix typo Co-authored-by: Mark W <24956497+ndg63276@users.noreply.github.com> * LIMS-1235: Queries for implicit samples and DCs in project time out (#758) Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> * LIMS-1200: CSV file upload ignores first sample (#737) * LIMS-1200: CSV file upload ignores first sample * LIMS-1200: Fix bug uploading csv with one sample --------- Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> * LIMS-1174: Handle blank proposal on visits page (#740) Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> * LIMS-44: Speed up visit query (#759) Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> * LIMS-1059: Add visit column to shipments list (#742) Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> * Restore EM menu in dropdown (#766) (#768) * Add 2.2a changes to 2.3 (#771) * Restore EM menu in dropdown (#766) * Pre release/2024 r2.2 (#770) * LIMS-1201: Amend name of XPDF capillary crystal to use user acronym (#738) Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> * LIMS-1256: Remove validation from Local Contact field (#756) Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> * LIMS-667: Make the Requested Imager a required field if a plate is being created (#733) Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> * LIMS-1261: Fix the grid scan heat maps on the VMXi container view (#744) Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> * LIMS-1289: Fix sample and pdb count on protens page (#753) Co-authored-by: Mark Williams <mark.williams@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: Mark Williams <mark.williams@diamond.ac.uk> Co-authored-by: Dominic Oram <dominic.oram@diamond.ac.uk> Co-authored-by: Guilherme Francisco <guilherme.de-freitas@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: Dominic Oram <dominic.oram@diamond.ac.uk>
* LIMS-1204: Remove log area from top of active visits (#735) * LIMS-1204: Remove log area from the top of active visits * LIMS-1204: Remove dclog.js --------- Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> * ULIMS-50: Shipping service incoming shipment redirect (#731) * LIMS-1113: Redirect to shipping-service on dispatch * LIMS-1113: Fix typos in shipping service URLs * LIMS-1113: Change text on submit button if redirecting * LIMS-1113: Fix shipment request requests for Dewars with no pucks/samples * LIMS-1113: Don't redirect for international shipments * LIMS-1113: Tweak logic for international shipments * LIMS-1113: Propagate shipping service error codes to client * LIMS-1113: Link to shipping service from shipping page * LIMS-1113: Restore commented code * LIMS-1113: Include Dewar data in dispatch error log * LIMS-1113: Apply GdF suggestions * LIMS-1113: Update config_sample.php * LIMS-1113: Limit redirects to supported countries * LIMS-1113: Add supported country dropdown to dispatch from * ULIMS-50: Redirect to shipping service to book incoming shipments * Update client/src/js/modules/shipment/views/createawb.js Co-authored-by: Guilherme Francisco <guilherme.de-freitas@diamond.ac.uk> * Update client/src/js/modules/shipment/views/createawb.js Co-authored-by: Guilherme Francisco <guilherme.de-freitas@diamond.ac.uk> * Update api/src/Page/Shipment.php Co-authored-by: Guilherme Francisco <guilherme.de-freitas@diamond.ac.uk> * Update api/src/Page/Shipment.php Co-authored-by: Guilherme Francisco <guilherme.de-freitas@diamond.ac.uk> * ULIMS-50: Add better error messages, make hidden fields not required * ULIMS-50: Update description and date validation in dispatch model * Restore EM menu in dropdown (#766) (#767) * Merge master into prerelease (#773) * Restore EM menu in dropdown (#766) * Pre release/2024 r2.2 (#770) * LIMS-1201: Amend name of XPDF capillary crystal to use user acronym (#738) Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> * LIMS-1256: Remove validation from Local Contact field (#756) Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> * LIMS-667: Make the Requested Imager a required field if a plate is being created (#733) Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> * LIMS-1261: Fix the grid scan heat maps on the VMXi container view (#744) Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> * LIMS-1289: Fix sample and pdb count on protens page (#753) Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> --------- Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> * Pre release/2024 r2.3 (#772) * LIMS-1207: Move Calendar link to top left * LIMS-1207: Move Migrate link to Lab Contacts page * LIMS-1207: Re-order menu, remove Assign Containers * LIMS-1201: Amend name of XPDF capillary crystal to use user acronym (#738) Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> * LIMS-1256: Remove validation from Local Contact field (#756) Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> * LIMS-667: Make the Requested Imager a required field if a plate is being created (#733) Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> * LIMS-1261: Fix the grid scan heat maps on the VMXi container view (#744) Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> * LIMS-1289: Fix sample and pdb count on protens page (#753) Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> * LIMS-1304: Correct the order of before and after snapshots * LIMS-1304: Update to fix typo Co-authored-by: Mark W <24956497+ndg63276@users.noreply.github.com> * LIMS-1235: Queries for implicit samples and DCs in project time out (#758) Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> * LIMS-1200: CSV file upload ignores first sample (#737) * LIMS-1200: CSV file upload ignores first sample * LIMS-1200: Fix bug uploading csv with one sample --------- Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> * LIMS-1174: Handle blank proposal on visits page (#740) Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> * LIMS-44: Speed up visit query (#759) Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> * LIMS-1059: Add visit column to shipments list (#742) Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> * Restore EM menu in dropdown (#766) (#768) * Add 2.2a changes to 2.3 (#771) * Restore EM menu in dropdown (#766) * Pre release/2024 r2.2 (#770) * LIMS-1201: Amend name of XPDF capillary crystal to use user acronym (#738) Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> * LIMS-1256: Remove validation from Local Contact field (#756) Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> * LIMS-667: Make the Requested Imager a required field if a plate is being created (#733) Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> * LIMS-1261: Fix the grid scan heat maps on the VMXi container view (#744) Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> * LIMS-1289: Fix sample and pdb count on protens page (#753) Co-authored-by: Mark Williams <mark.williams@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: Mark Williams <mark.williams@diamond.ac.uk> Co-authored-by: Dominic Oram <dominic.oram@diamond.ac.uk> Co-authored-by: Guilherme Francisco <guilherme.de-freitas@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: Dominic Oram <dominic.oram@diamond.ac.uk> --------- Co-authored-by: Guilherme Francisco <guilherme.de-freitas@diamond.ac.uk> Co-authored-by: Mark W <24956497+ndg63276@users.noreply.github.com> Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> Co-authored-by: Dominic Oram <dominic.oram@diamond.ac.uk> * LIMS-1331: Send all dispatch requests to Goods Handling unless international via DHL for BI/MX (#779) Co-authored-by: Mark W <24956497+ndg63276@users.noreply.github.com> * LIMS-1206: Remove stacked usage bar chart from visit page (#743) * LIMS-1206: Remove stacked usage bar chart from visit page * Remove no longer used modules/stats/views/stack.js --------- Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> * LIMS-1203: Remove hidden temporary button to 'Use facility account' (#741) Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> * LIMS-1342: Show regular create AWB form if shipping redirect not enabled (#780) * LIMS-1342: Show regular create AWB form if shipping redirect not enabled * LIMS-1342: hide extra country dropdown if shipping service redirect not enabled * LIMS-1342: Json encode any error responses * LIMS-1342: define shipping service url even any redirect in use * LIMS-1342: Dont assume https * LIMS-1342: Only show 1 country select dropdown * LIMS-1342: Simplify logic a little * LIMS-1342: Same fixes for dewar dispatch * LIMS-1342: Show correct button if country changes --------- Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> --------- Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> Co-authored-by: Matthew Pritchard <46708056+MattPrit@users.noreply.github.com> Co-authored-by: Guilherme Francisco <guilherme.de-freitas@diamond.ac.uk> Co-authored-by: Dominic Oram <dominic.oram@diamond.ac.uk> Co-authored-by: James Hall <41731916+JPHall-DLS@users.noreply.github.com>
* LIMS-1204: Remove log area from top of active visits (#735) * LIMS-1204: Remove log area from the top of active visits * LIMS-1204: Remove dclog.js --------- Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> * ULIMS-50: Shipping service incoming shipment redirect (#731) * LIMS-1113: Redirect to shipping-service on dispatch * LIMS-1113: Fix typos in shipping service URLs * LIMS-1113: Change text on submit button if redirecting * LIMS-1113: Fix shipment request requests for Dewars with no pucks/samples * LIMS-1113: Don't redirect for international shipments * LIMS-1113: Tweak logic for international shipments * LIMS-1113: Propagate shipping service error codes to client * LIMS-1113: Link to shipping service from shipping page * LIMS-1113: Restore commented code * LIMS-1113: Include Dewar data in dispatch error log * LIMS-1113: Apply GdF suggestions * LIMS-1113: Update config_sample.php * LIMS-1113: Limit redirects to supported countries * LIMS-1113: Add supported country dropdown to dispatch from * ULIMS-50: Redirect to shipping service to book incoming shipments * Update client/src/js/modules/shipment/views/createawb.js Co-authored-by: Guilherme Francisco <guilherme.de-freitas@diamond.ac.uk> * Update client/src/js/modules/shipment/views/createawb.js Co-authored-by: Guilherme Francisco <guilherme.de-freitas@diamond.ac.uk> * Update api/src/Page/Shipment.php Co-authored-by: Guilherme Francisco <guilherme.de-freitas@diamond.ac.uk> * Update api/src/Page/Shipment.php Co-authored-by: Guilherme Francisco <guilherme.de-freitas@diamond.ac.uk> * ULIMS-50: Add better error messages, make hidden fields not required * ULIMS-50: Update description and date validation in dispatch model * Restore EM menu in dropdown (#766) (#767) * Merge master into prerelease (#773) * Restore EM menu in dropdown (#766) * Pre release/2024 r2.2 (#770) * LIMS-1201: Amend name of XPDF capillary crystal to use user acronym (#738) Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> * LIMS-1256: Remove validation from Local Contact field (#756) Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> * LIMS-667: Make the Requested Imager a required field if a plate is being created (#733) Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> * LIMS-1261: Fix the grid scan heat maps on the VMXi container view (#744) Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> * LIMS-1289: Fix sample and pdb count on protens page (#753) Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> --------- Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> * Pre release/2024 r2.3 (#772) * LIMS-1207: Move Calendar link to top left * LIMS-1207: Move Migrate link to Lab Contacts page * LIMS-1207: Re-order menu, remove Assign Containers * LIMS-1201: Amend name of XPDF capillary crystal to use user acronym (#738) Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> * LIMS-1256: Remove validation from Local Contact field (#756) Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> * LIMS-667: Make the Requested Imager a required field if a plate is being created (#733) Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> * LIMS-1261: Fix the grid scan heat maps on the VMXi container view (#744) Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> * LIMS-1289: Fix sample and pdb count on protens page (#753) Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> * LIMS-1304: Correct the order of before and after snapshots * LIMS-1304: Update to fix typo Co-authored-by: Mark W <24956497+ndg63276@users.noreply.github.com> * LIMS-1235: Queries for implicit samples and DCs in project time out (#758) Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> * LIMS-1200: CSV file upload ignores first sample (#737) * LIMS-1200: CSV file upload ignores first sample * LIMS-1200: Fix bug uploading csv with one sample --------- Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> * LIMS-1174: Handle blank proposal on visits page (#740) Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> * LIMS-44: Speed up visit query (#759) Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> * LIMS-1059: Add visit column to shipments list (#742) Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> * Restore EM menu in dropdown (#766) (#768) * Add 2.2a changes to 2.3 (#771) * Restore EM menu in dropdown (#766) * Pre release/2024 r2.2 (#770) * LIMS-1201: Amend name of XPDF capillary crystal to use user acronym (#738) Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> * LIMS-1256: Remove validation from Local Contact field (#756) Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> * LIMS-667: Make the Requested Imager a required field if a plate is being created (#733) Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> * LIMS-1261: Fix the grid scan heat maps on the VMXi container view (#744) Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> * LIMS-1289: Fix sample and pdb count on protens page (#753) Co-authored-by: Mark Williams <mark.williams@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: Mark Williams <mark.williams@diamond.ac.uk> Co-authored-by: Dominic Oram <dominic.oram@diamond.ac.uk> Co-authored-by: Guilherme Francisco <guilherme.de-freitas@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: Dominic Oram <dominic.oram@diamond.ac.uk> --------- Co-authored-by: Guilherme Francisco <guilherme.de-freitas@diamond.ac.uk> Co-authored-by: Mark W <24956497+ndg63276@users.noreply.github.com> Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> Co-authored-by: Dominic Oram <dominic.oram@diamond.ac.uk> * LIMS-1331: Send all dispatch requests to Goods Handling unless international via DHL for BI/MX (#779) Co-authored-by: Mark W <24956497+ndg63276@users.noreply.github.com> * LIMS-1206: Remove stacked usage bar chart from visit page (#743) * LIMS-1206: Remove stacked usage bar chart from visit page * Remove no longer used modules/stats/views/stack.js --------- Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> * LIMS-1203: Remove hidden temporary button to 'Use facility account' (#741) Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> * LIMS-1342: Show regular create AWB form if shipping redirect not enabled (#780) * LIMS-1342: Show regular create AWB form if shipping redirect not enabled * LIMS-1342: hide extra country dropdown if shipping service redirect not enabled * LIMS-1342: Json encode any error responses * LIMS-1342: define shipping service url even any redirect in use * LIMS-1342: Dont assume https * LIMS-1342: Only show 1 country select dropdown * LIMS-1342: Simplify logic a little * LIMS-1342: Same fixes for dewar dispatch * LIMS-1342: Show correct button if country changes --------- Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> * LIMS-1353: Cannot book multiple dewars in one shipment * LIMS-1353: Remove outdated comment --------- Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> Co-authored-by: Matthew Pritchard <46708056+MattPrit@users.noreply.github.com> Co-authored-by: Guilherme Francisco <guilherme.de-freitas@diamond.ac.uk> Co-authored-by: Dominic Oram <dominic.oram@diamond.ac.uk> Co-authored-by: James Hall <41731916+JPHall-DLS@users.noreply.github.com>
JIRA ticket: ULIMS-50
Depends on #698
Summary:
Adds the option to redirect to the shipping service to book shipments when booking an incoming shipment.
Changes:
$use_shipping_service_redirect_incoming_shipments
which enables/disables this featureTo test:
Note:
externalShippingIdToSynchrotron
column to theShipping
table in ispyb. Since the_get_shipments
endpoint now attempts to return this column, a 500 will result whenever this endpoint is called without the new column having been added