diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/logic/ScreeningApiImpl.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/logic/ScreeningApiImpl.java index e512050f5d83883841d201d443c6230e24aed2c9..c170eb24cb93c2a7676634c109b7f2d1c07252de 100644 --- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/logic/ScreeningApiImpl.java +++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/logic/ScreeningApiImpl.java @@ -926,7 +926,8 @@ public class ScreeningApiImpl Map<String, String> properties = EntityHelper.convertToStringMap(well.getProperties()); Map<String, Material> materialProperties = convertMaterialProperties(well.getProperties(), materialsCache); - return new WellMetadata(plateIdentifier, well.getCode(), well.getPermId(), wellPosition, + return new WellMetadata(plateIdentifier, well.getCode(), well.getPermId(), well + .getSampleType().getCode(), wellPosition, properties, materialProperties); } diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/WellMetadata.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/WellMetadata.java index d25923affbe64caa2f74376678e91cc0c1ded8a0..dfea45ff1d8f9be95cfa079b099622ba67a659d7 100644 --- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/WellMetadata.java +++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/WellMetadata.java @@ -32,16 +32,19 @@ public class WellMetadata extends WellIdentifier private final String code; + private final String type; + private final Map<String, String> properties; private final Map<String, Material> materialProperties; - public WellMetadata(PlateIdentifier plateIdentifier, String code, String permId, + public WellMetadata(PlateIdentifier plateIdentifier, String code, String permId, String type, WellPosition wellPosition, Map<String, String> properties, Map<String, Material> materialProperties) { super(plateIdentifier, wellPosition, permId); this.code = code; + this.type = type; this.properties = new HashMap<String, String>(properties); this.materialProperties = new HashMap<String, Material>(materialProperties); } @@ -106,4 +109,9 @@ public class WellMetadata extends WellIdentifier return true; } + public String getType() + { + return type; + } + }