Merge pull request DiamondLightSource#697 from DiamondLightSource/master

Merge Master into Prerelease

Merge pull request DiamondLightSource#690 from DiamondLightSource/pre…

…release

On Build: Satisfy Psalm Config (DiamondLightSource#689)

Merge pull request DiamondLightSource#680 from DiamondLightSource/master

Merge master into prerelease

Merge pull request DiamondLightSource#669 from DiamondLightSource/rev…

…ert-648-improvement/LIMS-759/show-multipin-sublocations

Revert "LIMS-759: Show multipin samples and their sublocations"

Merge pull request DiamondLightSource#659 from DiamondLightSource/master

Merge Prerelease into Master

LIMS-932: Send proposal when creating shipments in shipping service (D…

…iamondLightSource#646)

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

* Use proposal from db query rather than args

---------

Co-authored-by: John Holt <John.Holt@diamond.ac.uk>

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

* [LIMS-116] Fix: Summary page revamp, make css local  (DiamondLightSource#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 <guilherme.de-freitas@diamond.ac.uk>

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

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

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

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

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

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

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

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

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

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

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

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

* Update api/src/Database/DatabaseFactory.php

Co-authored-by: John Holt <7570055+John-Holt-Tessella@users.noreply.github.com>

* Update api/src/TemplateParser.php

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

* Code review changes: database conns, code tidy

* add get started button

* Change styling to be local rather than global

---------

Co-authored-by: Guilherme Francisco <guilherme.de-freitas@diamond.ac.uk>
Co-authored-by: John Holt <7570055+John-Holt-Tessella@users.noreply.github.com>

* [LIMS-116] Fix: Summary page revamp, delete css global (DiamondLightSource#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 <guilherme.de-freitas@diamond.ac.uk>

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

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

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

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

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

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

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

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

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

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

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

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

* Update api/src/Database/DatabaseFactory.php

Co-authored-by: John Holt <7570055+John-Holt-Tessella@users.noreply.github.com>

* Update api/src/TemplateParser.php

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

* 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 <guilherme.de-freitas@diamond.ac.uk>
Co-authored-by: John Holt <7570055+John-Holt-Tessella@users.noreply.github.com>

---------

Co-authored-by: Guilherme Francisco <guilherme.de-freitas@diamond.ac.uk>
Co-authored-by: John Holt <7570055+John-Holt-Tessella@users.noreply.github.com>

Merge pull request DiamondLightSource#625 from DiamondLightSource/fix…

…_routing_em_datacollection

Move EM router to give dc path more precedent

Merge pull request DiamondLightSource#620 from DiamondLightSource/fix…

…_sample_changer_path

Move regex data collections path even lower

Merge pull request DiamondLightSource#605 from DiamondLightSource/pre…

…release

Prerelease