From db062a205bccf9a91970cdaff41dfe0b7579ff8b Mon Sep 17 00:00:00 2001
From: vkovtun <victor.kovtun@gmail.com>
Date: Thu, 3 Nov 2022 16:06:11 +0100
Subject: [PATCH] SSDM-12286 Fixed empty property values in export.
---
.../server/xls/export/helper/XLSSampleExportHelper.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/XLSSampleExportHelper.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/XLSSampleExportHelper.java
index 950c48aaba1..d562ba2e7d2 100644
--- a/openbis/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/XLSSampleExportHelper.java
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/XLSSampleExportHelper.java
@@ -41,6 +41,8 @@ public class XLSSampleExportHelper extends AbstractXLSExportHelper
"Experiment", "Auto generate code", "Parents", "Children"));
final List<String> propertyNames = entry.getKey().getPropertyAssignments().stream().map(
assignment -> assignment.getPropertyType().getLabel()).collect(Collectors.toList());
+ final List<String> propertyCodes = entry.getKey().getPropertyAssignments().stream().map(
+ assignment -> assignment.getPropertyType().getCode()).collect(Collectors.toList());
headers.addAll(propertyNames);
addRow(wb, rowNumber++, true, headers.toArray(String[]::new));
@@ -60,7 +62,7 @@ public class XLSSampleExportHelper extends AbstractXLSExportHelper
sample.getExperiment().getIdentifier().getIdentifier(),
"FALSE", parents, children));
- sampleValues.addAll(propertyNames.stream().map(sample.getProperties()::get)
+ sampleValues.addAll(propertyCodes.stream().map(sample.getProperties()::get)
.collect(Collectors.toList()));
addRow(wb, rowNumber++, false, sampleValues.toArray(String[]::new));
--
GitLab