From 153e6667f0dae5fad6522f7c32bbb772d4dfad57 Mon Sep 17 00:00:00 2001
From: brinn <brinn>
Date: Sat, 7 Feb 2009 22:28:18 +0000
Subject: [PATCH] add: column data_producer_code for external data
SVN: 9729
---
.../client/web/client/application/Dict.java | 2 ++
.../ui/data/CommonExternalDataColDefKind.java | 14 +++++++++++---
.../client/web/public/generic-dictionary.js | 1 +
3 files changed, 14 insertions(+), 3 deletions(-)
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 317428d1ade..7150c155829 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 4f79f845a78..5cdb29d5e05 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 e668d37b7d2..7ba0707460e 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",
//
--
GitLab