From 06a31f5ff772550531b5c7b46e2da8af55288060 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jordi=20Puiggen=C3=A9?= Date: Sun, 4 Sep 2022 22:37:25 +0200 Subject: [PATCH 1/2] Compatibility with core-2120 --- src/senaite/impress/analysisrequest/reportview.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/senaite/impress/analysisrequest/reportview.py b/src/senaite/impress/analysisrequest/reportview.py index abc61238..58565a2b 100644 --- a/src/senaite/impress/analysisrequest/reportview.py +++ b/src/senaite/impress/analysisrequest/reportview.py @@ -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, From f0d6b94a813633a1dfb7714f2212ab74047a42bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jordi=20Puiggen=C3=A9?= Date: Sun, 4 Sep 2022 22:40:34 +0200 Subject: [PATCH 2/2] Changelog --- docs/Changelog.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/Changelog.rst b/docs/Changelog.rst index b239baaa..8816ec76 100644 --- a/docs/Changelog.rst +++ b/docs/Changelog.rst @@ -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