LMS-607 add 'is invalid' column

SVN: 8672

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

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);

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;
+    }
 }

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;
     }