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.

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

Merge Master into Prerelease #658

Merged
merged 7 commits into from
Aug 29, 2023
Merged

Merge Master into Prerelease #658

merged 7 commits into from
Aug 29, 2023

Commits on Jul 11, 2023

  1. Merge pull request #625 from DiamondLightSource/fix_routing_em_dataco…

    …llection
    
    Move EM router to give dc path more precedent
    John-Holt-Tessella authored Jul 11, 2023
    Configuration menu
    Copy the full SHA
    3c0e1c0 View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2023

  1. Merge pull request #635 from DiamondLightSource/prerelease

    LIMS-116: Summary page revamp (#606)
    John-Holt-Tessella authored Jul 25, 2023
    Configuration menu
    Copy the full SHA
    15a7fcb View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2023

  1. Configuration menu
    Copy the full SHA
    20eba26 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    5f7083b View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2023

  1. FIX: Prerelease merge for summary css fix (#641)

    * [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]>
    
    * [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]>
    
    ---------
    
    Co-authored-by: Guilherme Francisco <[email protected]>
    Co-authored-by: John Holt <[email protected]>
    3 people authored Jul 28, 2023
    Configuration menu
    Copy the full SHA
    8415438 View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2023

  1. Merge pull request #642 from DiamondLightSource/pre-release/2023-R3.3

    Pre release/2023 r3.3
    MattPrit authored Aug 15, 2023
    Configuration menu
    Copy the full SHA
    d0df7be View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2023

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

    * LIMS_817: Update shipping service requests
    
    * LIMS-817: Add  param to dispatch function
    
    * LIMS-832: Book incoming shipments with the shipping service
    
    * LIMS-832: Fix array string conversion error
    
    * LIMS-832: Label address input with 'max 3 lines'
    
    * Format address & post code in dispatch form
    
    * LIMS-832: Trim post code & email for shipping service
    
    * [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]>
    
    * [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]>
    
    * Update api/src/Page/Shipment.php
    
    * Update to use fns in 7.3 and improve errors
    
    * Use constants
    
    * Fix failing tests
    
    * LIMS-892: Dont allow UDC samples with no screening method and no reqd resolution (#629)
    
    Co-authored-by: Mark Williams <[email protected]>
    
    * User shipping service if using facility account number
    
    * 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]>
    
    ---------
    
    Co-authored-by: Matthew Pritchard <[email protected]>
    Co-authored-by: Guilherme Francisco <[email protected]>
    Co-authored-by: John Holt <[email protected]>
    Co-authored-by: John Holt <[email protected]>
    Co-authored-by: Mark W <[email protected]>
    Co-authored-by: Mark Williams <[email protected]>
    Co-authored-by: Matthew Pritchard <[email protected]>
    8 people authored Aug 29, 2023
    Configuration menu
    Copy the full SHA
    89d82b6 View commit details
    Browse the repository at this point in the history