diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/Dict.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/Dict.java index 317428d1ade7e25d99cdb58d4582afd9549f07a4..7150c15582979cb374c4093e160c9d1e63521f04 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/Dict.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/Dict.java @@ -294,6 +294,8 @@ public abstract class Dict public static final String PRODUCTION_DATE = "production_date"; + public static final String DATA_PRODUCER_CODE = "data_producer_code"; + // // Sample Registration // diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/CommonExternalDataColDefKind.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/CommonExternalDataColDefKind.java index 4f79f845a7873153911737e3c3387cf0d76ed4f9..5cdb29d5e05e4b81548d7aa7bf5c6a163248ea55 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/CommonExternalDataColDefKind.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/CommonExternalDataColDefKind.java @@ -44,7 +44,7 @@ public enum CommonExternalDataColDefKind implements IColumnDefinitionKind<Extern return entity.getCode(); } }), - + PRODECUDRE_TYPE(new AbstractColumnDefinitionKind<ExternalData>(Dict.PROCEDURE_TYPE) { @Override @@ -136,8 +136,17 @@ public enum CommonExternalDataColDefKind implements IColumnDefinitionKind<Extern { return SimpleDateRenderer.renderDate(entity.getProductionDate()); } + }), + + DATA_PRODUCER_CODE(new AbstractColumnDefinitionKind<ExternalData>(Dict.DATA_PRODUCER_CODE, true) + { + @Override + public String tryGetValue(ExternalData entity) + { + return entity.getDataProducerCode(); + } }); - + /** * Creates column model from all definitions. */ @@ -157,7 +166,6 @@ public enum CommonExternalDataColDefKind implements IColumnDefinitionKind<Extern return new ColumnModel(configs); } - private final AbstractColumnDefinitionKind<ExternalData> columnDefinitionKind; private CommonExternalDataColDefKind( diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/public/generic-dictionary.js b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/public/generic-dictionary.js index e668d37b7d2ad03dd1c1720260e04897706408d0..7ba0707460eafa8568cce90bd415682f57ddddde 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/public/generic-dictionary.js +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/public/generic-dictionary.js @@ -33,6 +33,7 @@ var generic = { is_derived: "Derived?", is_complete: "Complete?", production_date: "Production Date", + data_producer_code: "Data Producer", //