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

LIMS-1390: Fix searching of data collection groups #833

Conversation

ndg63276
Copy link
Collaborator

JIRA ticket: LIMS-1390

Summary:

Viewing a data collection group (or a group linked by a processing job) and then using the search box gives a server error.

Changes:

  • Remove unnecessary lower() and concat() calls as MariaDB is case-insensitive and you can pass many arguments to a single concat()
  • Add to $where2, $where3 and $where4 rather than replacing them, as the $args array has already been populated expecting them to have several extra values

To test:

  • Go to a data collection group, eg /dc/visit/mx34566-20/dcg/12631761 and search for just one of the data collections, eg 16_1, and check only one data collection is shown
  • Go to a data processing group eg /dc/pjid/24527370, and search for just one of the data collections, eg 12_1, and check only one data collection is shown
  • Go to a full visit eg /dc/visit/mx34566-20 and check the search box works as expected

@ndg63276 ndg63276 changed the base branch from master to pre-release/2024-R4.4 October 1, 2024 09:53
@ndg63276 ndg63276 merged commit 98b6d45 into pre-release/2024-R4.4 Oct 1, 2024
2 checks passed
ndg63276 added a commit that referenced this pull request Oct 22, 2024
* LIMS-1003: Fix searching of container inspections (#825)

Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>

* LIMS-380: Fix position of autoPROC images (#831)

* LIMS-380: Fix position of autoPROC images

* LIMS-380: Just use iframe size of 98%

* Set width/height to percentage value (#838)

---------

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

* LIMS-1430: Fix bugs on prepare for data collection page (#829)

* LIMS-1430: Allow queuing even if no visible samples

* LIMS-1430: Show number of samples to queue

* LIMS-1430: Watch all subsamples for changes

* LIMS-1430: Remove TODO list

* LIMS-1430: Display number is of data collections, not samples

* LIMS-1430: Dont allow queueing if hidden data collections are invalid

* Update client/src/js/modules/imaging/views/queuecontainer.js

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

---------

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

* LIMS-1390: Fix searching of data collection groups (#833)

Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>

* LIMS-1286: Show ERA status on calendar and visits list (#834)

Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>

* LIMS-1354: Migrate from ActiveMQ to RabbitMQ (#826)

* LIMS-1354: Migrate from ActiveMQ to RabbitMQ

* Unwrap try...catch

* Add routing_key and vhost

* Add polyfill for BCMath as php-bcmath extension is not installed but required by php-amqplib for AMQP

---------

Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>
Co-authored-by: Guilherme Francisco <guilherme.de-freitas@diamond.ac.uk>
Co-authored-by: James Hall <41731916+JPHall-DLS@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants