diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample_browser/CommonColumns.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample_browser/CommonColumns.java index 181cc69b54e50b8797aa9131fce71d1747ca8f68..00fe612d7ceec3f621aa4427914ebc0e28cbcf2c 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample_browser/CommonColumns.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample_browser/CommonColumns.java @@ -47,12 +47,21 @@ class CommonColumns columns.add(createIsSharedColumn()); columns.add(createRegistratorColumn()); columns.add(createRegistionDateColumn()); + columns.add(createIsInvalidColumn()); + disableColumnMenu(); + } + + private void disableColumnMenu() + { + for (ColumnConfig columnConfig : columns) + { + columnConfig.setMenuDisabled(true); + } } private final ColumnConfig createCodeColumn() { final ColumnConfig columnConfig = new ColumnConfig(); - columnConfig.setMenuDisabled(true); columnConfig.setId(SampleModel.SAMPLE_CODE); columnConfig.setHeader("Code"); columnConfig.setWidth(100); @@ -62,7 +71,6 @@ class CommonColumns private final ColumnConfig createIdentifierColumn() { final ColumnConfig columnConfig = new ColumnConfig(); - columnConfig.setMenuDisabled(true); columnConfig.setId(SampleModel.SAMPLE_IDENTIFIER); columnConfig.setHeader("Identifier"); columnConfig.setHidden(true); @@ -73,7 +81,6 @@ class CommonColumns private final ColumnConfig createIsSharedColumn() { final ColumnConfig columnConfig = new ColumnConfig(); - columnConfig.setMenuDisabled(true); columnConfig.setId(SampleModel.IS_INSTANCE_SAMPLE_COLUMN); columnConfig.setHeader("Is shared?"); columnConfig.setHidden(true); @@ -84,7 +91,6 @@ class CommonColumns private final ColumnConfig createRegistratorColumn() { final ColumnConfig columnConfig = new ColumnConfig(); - columnConfig.setMenuDisabled(true); columnConfig.setId(SampleModel.REGISTRATOR); columnConfig.setHeader("Registrator"); columnConfig.setWidth(100); @@ -96,7 +102,6 @@ class CommonColumns private final ColumnConfig createRegistionDateColumn() { final ColumnConfig columnConfig = new ColumnConfig(); - columnConfig.setMenuDisabled(true); columnConfig.setId(SampleModel.REGISTRATION_DATE); columnConfig.setHeader("Registration Date"); columnConfig.setWidth(100); @@ -105,4 +110,14 @@ class CommonColumns return columnConfig; } + private final ColumnConfig createIsInvalidColumn() + { + final ColumnConfig columnConfig = new ColumnConfig(); + columnConfig.setId(SampleModel.IS_INVALID); + columnConfig.setHeader("Is invalid?"); + columnConfig.setWidth(100); + columnConfig.setHidden(true); + return columnConfig; + } + } \ No newline at end of file diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample_browser/SampleModel.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample_browser/SampleModel.java index e8600af0b0bfa86dd8dd88b17e8b2b5264c96b04..7cd29a5dea9de6d704f86071072db90a17a904fb 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample_browser/SampleModel.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample_browser/SampleModel.java @@ -52,6 +52,8 @@ public class SampleModel extends BaseModelData public static final String GENERATED_FROM_PARENT_PREFIX = "generatedFromParent"; + public static final String IS_INVALID = "isInvalid"; + public SampleModel(Sample s) { set(SAMPLE_CODE, printShortIdentifier(s)); @@ -62,6 +64,7 @@ public class SampleModel extends BaseModelData set(REGISTRATOR, s.getRegistrator()); set(REGISTRATION_DATE, s.getRegistrationDate()); set(IS_GROUP_SAMPLE, s.getGroup() != null); + set(IS_INVALID, s.isInvalid()); setGeneratedFromParents(s, 1, s.getSampleType().getGeneratedFromHierarchyDepth()); setContainerParents(s, 1, s.getSampleType().getPartOfHierarchyDepth()); setProperties(s); diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/Sample.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/Sample.java index 2f2ffddb841d2f1c8db4490c9f5d23d2e76a52ed..4898c9f7ac2ae27fafd656f1ea4c93f8ed40afc9 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/Sample.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/Sample.java @@ -47,6 +47,8 @@ public class Sample implements IsSerializable private List<SampleProperty> properties; + private boolean isInvalid; + public String getCode() { return code; @@ -148,4 +150,13 @@ public class Sample implements IsSerializable this.properties = properties; } + public boolean isInvalid() + { + return isInvalid; + } + + public void setInvalid(boolean isInvalid) + { + this.isInvalid = isInvalid; + } } diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/util/SampleTranslator.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/util/SampleTranslator.java index dafe5670ffa0fec4f637a9ecaa8b6ba52add6449..c2629906348642ebf83d67554eca4250e1805b14 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/util/SampleTranslator.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/util/SampleTranslator.java @@ -79,6 +79,7 @@ public class SampleTranslator result.setGeneratedFrom(SampleTranslator.translate(samplePE.getGeneratedFrom(), 0, generatedFromDep - 1, null, false, null)); } + result.setInvalid(samplePE.getInvalidation() != null); return result; }