From 4c7ceb1883f5787af3c022f2c1f35458e03552c0 Mon Sep 17 00:00:00 2001 From: Ramon Bartl Date: Wed, 18 Oct 2023 21:15:16 +0200 Subject: [PATCH 1/2] Fix missing interims in transposed multi-results --- .../core/browser/samples/multi_results_transposed.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/senaite/core/browser/samples/multi_results_transposed.py b/src/senaite/core/browser/samples/multi_results_transposed.py index 65bed521ab..659a57ada0 100644 --- a/src/senaite/core/browser/samples/multi_results_transposed.py +++ b/src/senaite/core/browser/samples/multi_results_transposed.py @@ -199,7 +199,15 @@ def get_sample_folderitems(self, sample): # the updated Analyses. view.contentFilter = dict(self.contentFilter) view.contentFilter["getAncestorsUIDs"] = [api.get_uid(sample)] - return view.folderitems() + items = view.folderitems() + # Interim columns are required for rendering in senaite.app.listing and + # are added in the Analyses View in the `folderitems` methdod. + # Therefore, we add the missing columns here! + # https://github.com/senaite/senaite.core/issues/2405 + for col_id, col in view.columns.items(): + if col_id not in self.columns: + self.columns[col_id] = col + return items def get_analyses(self, full_objects=False): """Returns sample analyses from lab poc From 62d645c20a600afb6d989f5eb51250a21641b0be Mon Sep 17 00:00:00 2001 From: Ramon Bartl Date: Wed, 18 Oct 2023 21:18:15 +0200 Subject: [PATCH 2/2] Changelog updated --- CHANGES.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.rst b/CHANGES.rst index b43800218a..75614c55bb 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -4,6 +4,7 @@ Changelog 2.5.0 (unreleased) ------------------ +- #2406 Fix missing interim fields in Transposed Multi Results Form - #2400 Add Transposed Multi Results Form - #2402 Fix user cannot enter future date for DateSampled when sampling enabled - #2401 Fix OverflowError when calculating datetime.min date for left-hand TZs