Skip to content
Snippets Groups Projects
Commit c96c1d14 authored by vkovtun's avatar vkovtun
Browse files

SSDM-13256: Added missing columns for experiment types.

parent 3f715eb7
No related branches found
No related tags found
1 merge request!40SSDM-13578 : 2PT : Database and V3 Implementation - include the new AFS "free"...
...@@ -17,6 +17,7 @@ package ch.ethz.sis.openbis.generic.server.xls.export.helper; ...@@ -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.CODE;
import static ch.ethz.sis.openbis.generic.server.xls.export.Attribute.DESCRIPTION; 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.VALIDATION_SCRIPT;
import static ch.ethz.sis.openbis.generic.server.xls.export.Attribute.VERSION; import static ch.ethz.sis.openbis.generic.server.xls.export.Attribute.VERSION;
...@@ -50,7 +51,7 @@ public class XLSExperimentTypeExportHelper extends AbstractXLSEntityTypeExportHe ...@@ -50,7 +51,7 @@ public class XLSExperimentTypeExportHelper extends AbstractXLSEntityTypeExportHe
@Override @Override
protected Attribute[] getAttributes(final ExperimentType entityType) 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 @Override
...@@ -77,6 +78,10 @@ public class XLSExperimentTypeExportHelper extends AbstractXLSEntityTypeExportHe ...@@ -77,6 +78,10 @@ public class XLSExperimentTypeExportHelper extends AbstractXLSEntityTypeExportHe
{ {
return String.valueOf(VersionUtils.getStoredVersion(allVersions, ImportTypes.EXPERIMENT_TYPE, null, experimentType.getCode())); return String.valueOf(VersionUtils.getStoredVersion(allVersions, ImportTypes.EXPERIMENT_TYPE, null, experimentType.getCode()));
} }
case MODIFICATION_DATE:
{
return DATE_FORMAT.format(experimentType.getModificationDate());
}
default: default:
{ {
return null; return null;
......
...@@ -59,7 +59,7 @@ class ExperimentTypeExpectations extends Expectations ...@@ -59,7 +59,7 @@ class ExperimentTypeExpectations extends Expectations
final PluginFetchOptions pluginFetchOptions = fetchOptions.withValidationPlugin(); final PluginFetchOptions pluginFetchOptions = fetchOptions.withValidationPlugin();
final Calendar calendar = Calendar.getInstance(); 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 Date modificationDate = calendar.getTime();
final ExperimentType experimentType = new ExperimentType(); final ExperimentType experimentType = new ExperimentType();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment