Skip to content
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.

Sign up for GitHub

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

Jump to bottom

ULIMS-50: Shipping service incoming shipment redirect #731

Merged
merged 25 commits into from
May 31, 2024
Merged

ULIMS-50: Shipping service incoming shipment redirect #731

merged 25 commits into from
May 31, 2024

Commits on Nov 16, 2023

  1. LIMS-1113: Redirect to shipping-service on dispatch

    @MattPrit
    MattPrit committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    c55652d View commit details
    Browse the repository at this point in the history

Commits on Nov 17, 2023

  1. LIMS-1113: Fix typos in shipping service URLs

    @MattPrit
    MattPrit committed Nov 17, 2023
    Configuration menu
    Copy the full SHA
    d73eaad View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2023

  1. LIMS-1113: Change text on submit button if redirecting

    @MattPrit
    MattPrit committed Nov 20, 2023
    Configuration menu
    Copy the full SHA
    1a0061f View commit details
    Browse the repository at this point in the history

  2. LIMS-1113: Fix shipment request requests for Dewars with no pucks/sam… 

    …ples
    @MattPrit
    MattPrit committed Nov 20, 2023
    Configuration menu
    Copy the full SHA
    13b2cb8 View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2023

  1. LIMS-1113: Don't redirect for international shipments

    @MattPrit
    MattPrit committed Nov 21, 2023
    Configuration menu
    Copy the full SHA
    2ba736c View commit details
    Browse the repository at this point in the history

  2. LIMS-1113: Tweak logic for international shipments

    @MattPrit
    MattPrit committed Nov 21, 2023
    Configuration menu
    Copy the full SHA
    f1ed639 View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2023

  1. LIMS-1113: Propagate shipping service error codes to client

    @MattPrit
    MattPrit committed Nov 22, 2023
    Configuration menu
    Copy the full SHA
    3b7d8c0 View commit details
    Browse the repository at this point in the history

  2. LIMS-1113: Link to shipping service from shipping page

    @MattPrit
    MattPrit committed Nov 22, 2023
    Configuration menu
    Copy the full SHA
    2fbc0ce View commit details
    Browse the repository at this point in the history

Commits on Nov 23, 2023

  1. LIMS-1113: Restore commented code

    @MattPrit
    MattPrit committed Nov 23, 2023
    Configuration menu
    Copy the full SHA
    d1e756b View commit details
    Browse the repository at this point in the history

Commits on Nov 28, 2023

  1. LIMS-1113: Include Dewar data in dispatch error log

    @MattPrit
    MattPrit committed Nov 28, 2023
    Configuration menu
    Copy the full SHA
    b7e0713 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'prerelease' into feature/lims-1113/shipping-service-dis… 

    …patch-redirect
    @MattPrit
    MattPrit committed Nov 28, 2023
    Configuration menu
    Copy the full SHA
    e11330c View commit details
    Browse the repository at this point in the history

Commits on Dec 4, 2023

  1. LIMS-1113: Apply GdF suggestions

    @MattPrit
    MattPrit committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    f02855d View commit details
    Browse the repository at this point in the history

Commits on Dec 7, 2023

  1. LIMS-1113: Update config_sample.php

    @MattPrit
    MattPrit committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    88e293f View commit details
    Browse the repository at this point in the history

Commits on Dec 11, 2023

  1. LIMS-1113: Limit redirects to supported countries

    @MattPrit
    MattPrit committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    e1fd023 View commit details
    Browse the repository at this point in the history

Commits on Jan 26, 2024

  1. LIMS-1113: Add supported country dropdown to dispatch from

    @MattPrit
    MattPrit committed Jan 26, 2024
    Configuration menu
    Copy the full SHA
    40f737b View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2024

  1. ULIMS-50: Redirect to shipping service to book incoming shipments

    @MattPrit
    MattPrit committed Feb 19, 2024
    Configuration menu
    Copy the full SHA
    1c7cdfa View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2024

  1. Update client/src/js/modules/shipment/views/createawb.js 

    Co-authored-by: Guilherme Francisco <[email protected]>
    @MattPrit @gfrn
    MattPrit and gfrn authored Apr 23, 2024
    Configuration menu
    Copy the full SHA
    521504e View commit details
    Browse the repository at this point in the history

  2. Update client/src/js/modules/shipment/views/createawb.js 

    Co-authored-by: Guilherme Francisco <[email protected]>
    @MattPrit @gfrn
    MattPrit and gfrn authored Apr 23, 2024
    Configuration menu
    Copy the full SHA
    a61bff8 View commit details
    Browse the repository at this point in the history

  3. Update api/src/Page/Shipment.php 

    Co-authored-by: Guilherme Francisco <[email protected]>
    @MattPrit @gfrn
    MattPrit and gfrn authored Apr 23, 2024
    Configuration menu
    Copy the full SHA
    bc6ae56 View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2024

  1. Update api/src/Page/Shipment.php 

    Co-authored-by: Guilherme Francisco <[email protected]>
    @MattPrit @gfrn
    MattPrit and gfrn authored Apr 24, 2024
    Configuration menu
    Copy the full SHA
    637f10f View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2024

  1. ULIMS-50: Add better error messages, make hidden fields not required

    @MattPrit
    MattPrit committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    f91ecef View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2024

  1. ULIMS-50: Update description and date validation in dispatch model

    @MattPrit
    MattPrit committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    9d45d95 View commit details
    Browse the repository at this point in the history

Commits on May 1, 2024

  1. Restore EM menu in dropdown (#766) (#767)

    @gfrn
    gfrn authored May 1, 2024
    Configuration menu
    Copy the full SHA
    b715f36 View commit details
    Browse the repository at this point in the history

Commits on May 15, 2024

  1. 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 <[email protected]>

* LIMS-1256: Remove validation from Local Contact field (#756)

Co-authored-by: Mark Williams <[email protected]>

* LIMS-667: Make the Requested Imager a required field if a plate is being created (#733)

Co-authored-by: Mark Williams <[email protected]>

* LIMS-1261: Fix the grid scan heat maps on the VMXi container view (#744)

Co-authored-by: Mark Williams <[email protected]>

* LIMS-1289: Fix sample and pdb count on protens page (#753)

Co-authored-by: Mark Williams <[email protected]>

---------

Co-authored-by: Mark Williams <[email protected]>

* 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 <[email protected]>

* LIMS-1256: Remove validation from Local Contact field (#756)

Co-authored-by: Mark Williams <[email protected]>

* LIMS-667: Make the Requested Imager a required field if a plate is being created (#733)

Co-authored-by: Mark Williams <[email protected]>

* LIMS-1261: Fix the grid scan heat maps on the VMXi container view (#744)

Co-authored-by: Mark Williams <[email protected]>

* LIMS-1289: Fix sample and pdb count on protens page (#753)

Co-authored-by: Mark Williams <[email protected]>

* LIMS-1304: Correct the order of before and after snapshots

* LIMS-1304: Update to fix typo

Co-authored-by: Mark W <[email protected]>

* LIMS-1235: Queries for implicit samples and DCs in project time out (#758)

Co-authored-by: Mark Williams <[email protected]>

* 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 <[email protected]>

* LIMS-1174: Handle blank proposal on visits page (#740)

Co-authored-by: Mark Williams <[email protected]>

* LIMS-44: Speed up visit query (#759)

Co-authored-by: Mark Williams <[email protected]>

* LIMS-1059: Add visit column to shipments list (#742)

Co-authored-by: Mark Williams <[email protected]>

* 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 <[email protected]>

* LIMS-1256: Remove validation from Local Contact field (#756)

Co-authored-by: Mark Williams <[email protected]>

* LIMS-667: Make the Requested Imager a required field if a plate is being created (#733)

Co-authored-by: Mark Williams <[email protected]>

* LIMS-1261: Fix the grid scan heat maps on the VMXi container view (#744)

Co-authored-by: Mark Williams <[email protected]>

* LIMS-1289: Fix sample and pdb count on protens page (#753)

Co-authored-by: Mark Williams <[email protected]>

---------

Co-authored-by: Mark Williams <[email protected]>

---------

Co-authored-by: Guilherme Francisco <[email protected]>
Co-authored-by: Mark Williams <[email protected]>

---------

Co-authored-by: Mark Williams <[email protected]>
Co-authored-by: Dominic Oram <[email protected]>
Co-authored-by: Guilherme Francisco <[email protected]>

---------

Co-authored-by: Guilherme Francisco <[email protected]>
Co-authored-by: Mark Williams <[email protected]>
Co-authored-by: Dominic Oram <[email protected]>
    @ndg63276 @gfrn @DominicOram
    4 people authored May 15, 2024
    Configuration menu
    Copy the full SHA
    9fed462 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'prerelease' into feature/ulims-50/shipping-service-inco… 

    …ming-redirect
    @ndg63276
    ndg63276 authored May 15, 2024
    Configuration menu
    Copy the full SHA
    746735b View commit details
    Browse the repository at this point in the history