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

Merge Pre-release/2023-R3.4 into Master #656

Merged
merged 21 commits into from
Aug 29, 2023
Merged

Merge Pre-release/2023-R3.4 into Master #656

merged 21 commits into from
Aug 29, 2023

Commits on Jul 5, 2023

  1. LIMS_817: Update shipping service requests

    @MattPrit
    MattPrit committed Jul 5, 2023
    Configuration menu
    Copy the full SHA
    56e9c6f View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2023

  1. Merge branch 'improvement/LIMS-817/update-shipping-service-requests' … 

    …into feature/lims-832/shipping-service-incoming-shipments
    @MattPrit
    MattPrit committed Jul 10, 2023
    Configuration menu
    Copy the full SHA
    5ad5719 View commit details
    Browse the repository at this point in the history

  2. LIMS-817: Add param to dispatch function

    @MattPrit
    MattPrit committed Jul 10, 2023
    Configuration menu
    Copy the full SHA
    7280f06 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'improvement/LIMS-817/update-shipping-service-requests' … 

    …into feature/lims-832/shipping-service-incoming-shipments
    @MattPrit
    MattPrit committed Jul 10, 2023
    Configuration menu
    Copy the full SHA
    db0ec94 View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2023

  1. LIMS-832: Book incoming shipments with the shipping service

    @MattPrit
    MattPrit committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    81529ad View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2023

  1. LIMS-832: Fix array string conversion error

    @MattPrit
    MattPrit committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    c6bc0f6 View commit details
    Browse the repository at this point in the history

  2. LIMS-832: Label address input with 'max 3 lines'

    @MattPrit
    MattPrit committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    c2bfd9d View commit details
    Browse the repository at this point in the history

  3. Format address & post code in dispatch form

    @MattPrit
    MattPrit committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    5d66310 View commit details
    Browse the repository at this point in the history

  4. LIMS-832: Trim post code & email for shipping service

    @MattPrit
    MattPrit committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    b99b6f2 View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2023

  1. [LIMS-116] Fix: Summary page revamp, make css local (#639) 

    * updating .gitignore

* adding frontend files and building backend

* adding front end files and router files

* create sidebar, filter options added, routes added

* add routing to page,search bar and column selector

* adding pagination continutation

* adding csv, all columns, rest of filters

* added descending and ascending

* sidebar dropdown&changed data structure&hide row

* cleaning up fixing jump bug

* refactored backend mapped data

* added expanding row

* refactored favourites

* refactored orderby filter

* cleaned up code, added comments

* added all params to watcher

* added summary db connection

* add routes to summary

* add backend changes summarypage

* changes to expandable sidebar, cleaning up fronte

* clean up, add functions to get data

* front end changes, group concat backend

* remove summarypage code

* fix pagination, timeout

* delete old summary file

* changed pagination in summary.php

* changed backend to not include tot

* fix refined cell c column

* added ifsets to avoid undefined offset error

* delete offset for output

* change order of operands

* change filters, fix operands

* fix csv button

* changed prop to propid

* format beamlinename

* change al,be,gamma

* add selected columns summary

* additional changes for selected columns

* add multiple selections change expandable sidebar

* redo  routing, keep alive summary

* fixes, change routing, results display, orderby

* fixes to selected columns

* format page to allow for customisation

* area for potential formatting and fix to querypara

* changes to regex, combobox multiple,  and fomat

* column select fix, resize pill fix, format inputs

* Update api/src/Database/DatabaseConnectionFactory.php

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

* Update client/src/js/modules/types/sp/menu.js

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

* Update client/src/js/modules/types/saxs/menu.js

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

* Update client/src/js/modules/types/pow/menu.js

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

* Update client/src/js/modules/types/mx/menu.js

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

* Update client/src/js/modules/types/em/menu.js

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

* Update client/src/js/app/components/combo-box.vue

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

* Update api/src/Database/DatabaseFactory.php

Co-authored-by: John Holt <[email protected]>

* Update api/src/TemplateParser.php

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

* Code review changes: database conns, code tidy

* add get started button

* Change styling to be local rather than global

---------

Co-authored-by: Guilherme Francisco <[email protected]>
Co-authored-by: John Holt <[email protected]>
    @NKatti2011 @gfrn @John-Holt-Tessella
    3 people authored Jul 27, 2023
    Configuration menu
    Copy the full SHA
    6d9a5f0 View commit details
    Browse the repository at this point in the history

  2. [LIMS-116] Fix: Summary page revamp, delete css global (#640) 

    * updating .gitignore

* adding frontend files and building backend

* adding front end files and router files

* create sidebar, filter options added, routes added

* add routing to page,search bar and column selector

* adding pagination continutation

* adding csv, all columns, rest of filters

* added descending and ascending

* sidebar dropdown&changed data structure&hide row

* cleaning up fixing jump bug

* refactored backend mapped data

* added expanding row

* refactored favourites

* refactored orderby filter

* cleaned up code, added comments

* added all params to watcher

* added summary db connection

* add routes to summary

* add backend changes summarypage

* changes to expandable sidebar, cleaning up fronte

* clean up, add functions to get data

* front end changes, group concat backend

* remove summarypage code

* fix pagination, timeout

* delete old summary file

* changed pagination in summary.php

* changed backend to not include tot

* fix refined cell c column

* added ifsets to avoid undefined offset error

* delete offset for output

* change order of operands

* change filters, fix operands

* fix csv button

* changed prop to propid

* format beamlinename

* change al,be,gamma

* add selected columns summary

* additional changes for selected columns

* add multiple selections change expandable sidebar

* redo  routing, keep alive summary

* fixes, change routing, results display, orderby

* fixes to selected columns

* format page to allow for customisation

* area for potential formatting and fix to querypara

* changes to regex, combobox multiple,  and fomat

* column select fix, resize pill fix, format inputs

* Update api/src/Database/DatabaseConnectionFactory.php

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

* Update client/src/js/modules/types/sp/menu.js

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

* Update client/src/js/modules/types/saxs/menu.js

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

* Update client/src/js/modules/types/pow/menu.js

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

* Update client/src/js/modules/types/mx/menu.js

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

* Update client/src/js/modules/types/em/menu.js

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

* Update client/src/js/app/components/combo-box.vue

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

* Update api/src/Database/DatabaseFactory.php

Co-authored-by: John Holt <[email protected]>

* Update api/src/TemplateParser.php

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

* Code review changes: database conns, code tidy

* add get started button

* Change styling to be local rather than global

* delete summary css globals

---------

Co-authored-by: Guilherme Francisco <[email protected]>
Co-authored-by: John Holt <[email protected]>
    @NKatti2011 @gfrn @John-Holt-Tessella
    3 people authored Jul 27, 2023
    Configuration menu
    Copy the full SHA
    f3e5403 View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2023

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

    @John-Holt-Tessella
    John-Holt-Tessella authored Aug 9, 2023
    Configuration menu
    Copy the full SHA
    f316177 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #618 from DiamondLightSource/improvement/LIMS-817/… 

    …update-shipping-service-requests

LIMS_817: Update shipping service requests
    @John-Holt-Tessella
    John-Holt-Tessella authored Aug 9, 2023
    Configuration menu
    Copy the full SHA
    4addcbe View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/prerelease' into feature/lims-83… 

    …2/shipping-service-incoming-shipments
    John Holt authored and John Holt committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    f1a0f17 View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2023

  1. Update to use fns in 7.3 and improve errors

    John Holt authored and John Holt committed Aug 10, 2023
    Configuration menu
    Copy the full SHA
    c660603 View commit details
    Browse the repository at this point in the history

  2. Use constants

    John Holt authored and John Holt committed Aug 10, 2023
    Configuration menu
    Copy the full SHA
    3222016 View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2023

  1. Fix failing tests

    John Holt authored and John Holt committed Aug 11, 2023
    Configuration menu
    Copy the full SHA
    508addd View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2023

  1. LIMS-892: Dont allow UDC samples with no screening method and no reqd… 

    … resolution (#629)

Co-authored-by: Mark Williams <[email protected]>
    @ndg63276
    ndg63276 and Mark Williams authored Aug 14, 2023
    Configuration menu
    Copy the full SHA
    b0c9ad1 View commit details
    Browse the repository at this point in the history

  2. User shipping service if using facility account number

    John Holt authored and John Holt committed Aug 14, 2023
    Configuration menu
    Copy the full SHA
    3133f7e View commit details
    Browse the repository at this point in the history

  3. Merge pull request #630 from DiamondLightSource/feature/lims-832/ship… 

    …ping-service-incoming-shipments

[LIMS-832]Feature: Use shipping service for incoming shipments

My Commits checked by @MattPrit
    @John-Holt-Tessella
    John-Holt-Tessella authored Aug 14, 2023
    Configuration menu
    Copy the full SHA
    2da5639 View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2023

  1. LIMS-932: Send proposal when creating shipments in shipping service (#… 

    …646)

* LIMS-932: Send proposal when creating shipments in shipping service

* Use proposal from db query rather than args

---------

Co-authored-by: John Holt <[email protected]>
    @MattPrit
    MattPrit and John Holt authored Aug 21, 2023
    Configuration menu
    Copy the full SHA
    e01bf45 View commit details
    Browse the repository at this point in the history