diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/XLSExperimentTypeExportHelper.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/XLSExperimentTypeExportHelper.java index a11dc8df48c5a9616a477e0ca613717cb41fa1ea..cc9c8b894a2c0b1a4b02aafcf00fd4be9682b6d7 100644 --- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/XLSExperimentTypeExportHelper.java +++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/XLSExperimentTypeExportHelper.java @@ -17,6 +17,7 @@ package ch.ethz.sis.openbis.generic.server.xls.export.helper; import static ch.ethz.sis.openbis.generic.server.xls.export.Attribute.CODE; import static ch.ethz.sis.openbis.generic.server.xls.export.Attribute.DESCRIPTION; +import static ch.ethz.sis.openbis.generic.server.xls.export.Attribute.MODIFICATION_DATE; import static ch.ethz.sis.openbis.generic.server.xls.export.Attribute.VALIDATION_SCRIPT; import static ch.ethz.sis.openbis.generic.server.xls.export.Attribute.VERSION; @@ -50,7 +51,7 @@ public class XLSExperimentTypeExportHelper extends AbstractXLSEntityTypeExportHe @Override protected Attribute[] getAttributes(final ExperimentType entityType) { - return new Attribute[] { VERSION, CODE, DESCRIPTION, VALIDATION_SCRIPT }; + return new Attribute[] { VERSION, CODE, DESCRIPTION, VALIDATION_SCRIPT, MODIFICATION_DATE }; } @Override @@ -77,6 +78,10 @@ public class XLSExperimentTypeExportHelper extends AbstractXLSEntityTypeExportHe { return String.valueOf(VersionUtils.getStoredVersion(allVersions, ImportTypes.EXPERIMENT_TYPE, null, experimentType.getCode())); } + case MODIFICATION_DATE: + { + return DATE_FORMAT.format(experimentType.getModificationDate()); + } default: { return null; diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/ExperimentTypeExpectations.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/ExperimentTypeExpectations.java index d64d23cda4148e95d53dad2849ff2abf30a55360..09f4a190b81460106bc58981e821337a7c4a83af 100644 --- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/ExperimentTypeExpectations.java +++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/ExperimentTypeExpectations.java @@ -59,7 +59,7 @@ class ExperimentTypeExpectations extends Expectations final PluginFetchOptions pluginFetchOptions = fetchOptions.withValidationPlugin(); final Calendar calendar = Calendar.getInstance(); - calendar.set(2023, Calendar.MARCH, 10, 17, 23, 44); + calendar.set(2023, Calendar.MARCH, 11, 17, 23, 44); final Date modificationDate = calendar.getTime(); final ExperimentType experimentType = new ExperimentType(); diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-experiment-type.xlsx b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-experiment-type.xlsx index 1d480dc78706e7970e899823e361a4ec5e3396e8..b44f7fa22612e3fdee9b7cdf50992d24f2c19d84 100644 Binary files a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-experiment-type.xlsx and b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-experiment-type.xlsx differ diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-type.xlsx b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-type.xlsx index 2c1e3e5719ea2f1b90a1ebbb4d049c426894f4cf..d1c0491590faea8d876f23a0e97256d5a068fccb 100644 Binary files a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-type.xlsx and b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-type.xlsx differ