diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/XLSDataSetExportHelper.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/XLSDataSetExportHelper.java index 95f8c1ee22fde3f0da76dd4d0a584302941ea4ca..9c84d374233b7f1fcbbe14207e8ba63701ad33d7 100644 --- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/XLSDataSetExportHelper.java +++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/XLSDataSetExportHelper.java @@ -133,7 +133,7 @@ public class XLSDataSetExportHelper extends AbstractXLSEntityExportHelper<DataSe } case ARCHIVING_STATUS: { - return dataSet.getPhysicalData().isArchivingRequested().toString().toUpperCase(); + return dataSet.getPhysicalData().getStatus().toString(); } case PRESENT_IN_ARCHIVE: { diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/XLSSampleExportHelper.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/XLSSampleExportHelper.java index a8f5703af83c566268a9ccd3b5ea4315962b5631..a43cf2457a348f29eb0118590f5300b4779225ec 100644 --- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/XLSSampleExportHelper.java +++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/XLSSampleExportHelper.java @@ -88,7 +88,7 @@ public class XLSSampleExportHelper extends AbstractXLSEntityExportHelper<Sample, @Override protected Attribute[] getAttributes(final Sample entity) { - return new Attribute[] { $, PERM_ID, IDENTIFIER, CODE, SPACE, PROJECT, EXPERIMENT, AUTO_GENERATE_CODE, PARENTS, CHILDREN, + return new Attribute[] { $, AUTO_GENERATE_CODE, PERM_ID, IDENTIFIER, CODE, SPACE, PROJECT, EXPERIMENT, PARENTS, CHILDREN, REGISTRATOR, REGISTRATION_DATE, MODIFIER, MODIFICATION_DATE }; }