From 92a620a8e0e345bf17f2086c6f51e3a4b0b292bb Mon Sep 17 00:00:00 2001
From: vkovtun <viktor.kovtun@id.ethz.ch>
Date: Fri, 31 Mar 2023 12:59:09 +0200
Subject: [PATCH] SSDM-13256: Added missing column for experiment.

---
 .../helper/XLSExperimentExportHelper.java     |   7 ++++++-
 .../export/resources/export-experiment.xlsx   | Bin 6162 -> 6226 bytes
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/XLSExperimentExportHelper.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/XLSExperimentExportHelper.java
index 774791c712e..abeca82887b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/XLSExperimentExportHelper.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/XLSExperimentExportHelper.java
@@ -19,6 +19,7 @@ import static ch.ethz.sis.openbis.generic.server.xls.export.Attribute.CODE;
 import static ch.ethz.sis.openbis.generic.server.xls.export.Attribute.IDENTIFIER;
 import static ch.ethz.sis.openbis.generic.server.xls.export.Attribute.MODIFICATION_DATE;
 import static ch.ethz.sis.openbis.generic.server.xls.export.Attribute.MODIFIER;
+import static ch.ethz.sis.openbis.generic.server.xls.export.Attribute.PERM_ID;
 import static ch.ethz.sis.openbis.generic.server.xls.export.Attribute.PROJECT;
 import static ch.ethz.sis.openbis.generic.server.xls.export.Attribute.REGISTRATION_DATE;
 import static ch.ethz.sis.openbis.generic.server.xls.export.Attribute.REGISTRATOR;
@@ -49,7 +50,7 @@ public class XLSExperimentExportHelper extends AbstractXLSEntityExportHelper<Exp
     @Override
     protected Attribute[] getAttributes(final Experiment entity)
     {
-        return new Attribute[] { IDENTIFIER, CODE, PROJECT, REGISTRATOR, REGISTRATION_DATE, MODIFIER, MODIFICATION_DATE };
+        return new Attribute[] { PERM_ID, IDENTIFIER, CODE, PROJECT, REGISTRATOR, REGISTRATION_DATE, MODIFIER, MODIFICATION_DATE };
     }
 
     @Override
@@ -87,6 +88,10 @@ public class XLSExperimentExportHelper extends AbstractXLSEntityExportHelper<Exp
     {
         switch (attribute)
         {
+            case PERM_ID:
+            {
+                return experiment.getPermId().getPermId();
+            }
             case IDENTIFIER:
             {
                 return experiment.getIdentifier().getIdentifier();
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-experiment.xlsx b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-experiment.xlsx
index 89c81ef6f336e67303c287e8bad8b1e87ecc3c35..308f289917d40d591660e46a9fe1d25f01ad91e4 100644
GIT binary patch
delta 2998
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
Q1hZn7!2*;7wu><T2f{pX-v9sr

delta 2934
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
I&a*K81}M`;@c;k-

-- 
GitLab