Skip to content

LIMS-1202: Fix UAS filter and table sorting on Phases/Proteins page#724

Merged
ndg63276 merged 1 commit intoprereleasefrom
fix/LIMS-1202/fix-UAS-filter-and-sorting-on-phases-page
Feb 26, 2024
Merged

LIMS-1202: Fix UAS filter and table sorting on Phases/Proteins page#724
ndg63276 merged 1 commit intoprereleasefrom
fix/LIMS-1202/fix-UAS-filter-and-sorting-on-phases-page

Conversation

@ndg63276
Copy link
Collaborator

@ndg63276 ndg63276 commented Feb 8, 2024

JIRA ticket: LIMS-1202

Summary:

On an xpdf proposal, on the Phases page, there is a tickbox to "Show Only UAS Samples". This has the effect of grouping phases by their external id, so only one entry appears for each UAS sample, but as they are ordered by most recent, the recent non-UAS phases are shown instead of older UAS phases.
Sorting on the same table only worked for a couple of columns as well.

Changes:

  • When the "Show only UAS Samples" tickbox is ticked, only show Phases (Proteins) with the "proteinType" of "ORIGIN:UAS"
  • Add more possible columns to sort by in the database query
  • Get the number of samples and number of data collections in the original query so they can be used for sorting as well
  • Remove redundant queries to get dcount and scount, and convoluted way to get sequence, this already comes from the original query.

To test:

  • Go to an xpdf proposal eg cm37261 and go to the Phases page from the main menu. Tick and untick the 'Show only UAS Samples' box, check all UAS samples have a risk rating.
  • Click on a Phase, then click Create New Simple Sample, put in a new acronym. Go back to the phases page and check the new acronym is only shown when 'Show only UAS samples' is unticked.
  • Check sorting by clicking on the table headers works.
  • Go to an mx proposal eg mx23694, go to the Proteins page. Check sorting by clicking on the table headers works, including sample count and data collection count.

@ndg63276 ndg63276 merged commit e80730c into prerelease Feb 26, 2024
@ndg63276 ndg63276 deleted the fix/LIMS-1202/fix-UAS-filter-and-sorting-on-phases-page branch February 26, 2024 11:11
gfrn pushed a commit that referenced this pull request Mar 5, 2024
…724)

Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants