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

Do not display multi-component analysis in report but analytes #125

Open
wants to merge 2 commits into
base: 2.x
Choose a base branch
from
Open

Do not display multi-component analysis in report but analytes #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
06a31f5
Compatibility with core-2120
xispa Sep 4, 2022
f0d6b94
Changelog
xispa Sep 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docs/Changelog.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
2.3.0 (unreleased)
------------------

- #125 Do not display multi-component analysis in report but analytes
- #124 Fix mixed sorted PoC groups depending on the sample analyses


Expand Down
2 changes: 2 additions & 0 deletions src/senaite/impress/analysisrequest/reportview.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,8 @@ def get_analyses(self, model_or_collection):
# Boil out analyses meant to be used for internal use only
analyses = filter(lambda an: not IInternalUse.providedBy(an.instance),
analyses)
# Do not display multi-component analyses, but their analytes
analyses = filter(lambda an: not an.isMultiComponent(), analyses)
return self.sort_items(analyses)

def get_analyses_by(self, model_or_collection,
Expand Down