[LMS-650] experiment browser - mark invalid

SVN: 9174

openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/ExperimentModel.java

@@ -58,6 +58,7 @@ public final class ExperimentModel extends BaseModelData
                 .getRegistrator()));
         set(ModelDataPropertyNames.REGISTRATION_DATE, DateRenderer.renderDate(experiment
                 .getRegistrationDate()));
+        set(ModelDataPropertyNames.IS_INVALID, experiment.getInvalidation() != null);
     }
 
     public final static List<ExperimentModel> asExperimentModels(final List<Experiment> experiments)

openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/SampleRenderer.java → openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/InvalidableWithCodeRenderer.java

@@ -26,21 +26,21 @@ import com.google.gwt.user.client.Element;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.model.ModelDataPropertyNames;
 
 /**
- * Renders sample code and marks if the sample is invalid
+ * Renders code and marks if invalid
  * 
  * @author Tomasz Pylak
  */
-public class SampleRenderer implements GridCellRenderer<ModelData>
+public class InvalidableWithCodeRenderer implements GridCellRenderer<ModelData>
 {
 
-    public String render(ModelData model, String property, ColumnData config, int rowIndex,
-            int colIndex, ListStore<ModelData> store)
+    public String render(final ModelData model, final String property, final ColumnData config,
+            final int rowIndex, final int colIndex, final ListStore<ModelData> store)
     {
-        String code = (String) model.get(ModelDataPropertyNames.CODE);
-        boolean isInvalid = (Boolean) model.get(ModelDataPropertyNames.IS_INVALID);
+        final String code = (String) model.get(ModelDataPropertyNames.CODE);
+        final boolean isInvalid = (Boolean) model.get(ModelDataPropertyNames.IS_INVALID);
         if (isInvalid)
         {
-            Element div = DOM.createDiv();
+            final Element div = DOM.createDiv();
             div.setAttribute("class", "invalid");
             div.setInnerText(code);
             return DOM.toString(div);

openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment_browser/ExperimentBrowserGrid.java

@@ -49,7 +49,9 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.application.framework.
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.framework.ITabItem;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.model.ExperimentModel;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.model.ModelDataPropertyNames;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.renderer.YesNoRenderer;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.ColumnConfigFactory;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.InvalidableWithCodeRenderer;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.sample_browser.PagingToolBarWithoutRefresh;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.GxtTranslator;
 import ch.systemsx.cisd.openbis.generic.client.web.client.dto.Experiment;
@@ -189,7 +191,10 @@ public final class ExperimentBrowserGrid extends LayoutContainer
     private final ColumnModel createColumnModel()
     {
         final List<ColumnConfig> configs = new ArrayList<ColumnConfig>();
-        configs.add(ColumnConfigFactory.createCodeColumnConfig(viewContext.getMessageProvider()));
+        final ColumnConfig codeColumn =
+                ColumnConfigFactory.createCodeColumnConfig(viewContext.getMessageProvider());
+        codeColumn.setRenderer(new InvalidableWithCodeRenderer());
+        configs.add(codeColumn);
 
         configs.add(ColumnConfigFactory.createDefaultConfig(viewContext.getMessageProvider(),
                 ModelDataPropertyNames.EXPERIMENT_TYPE_CODE_FOR_EXPERIMENT, "experiment_type"));
@@ -202,6 +207,11 @@ public final class ExperimentBrowserGrid extends LayoutContainer
                 .getMessageProvider()));
         configs.add(ColumnConfigFactory.createRegistrationDateColumnConfig(viewContext
                 .getMessageProvider()));
+        final ColumnConfig isInvalidColumn =
+                ColumnConfigFactory.createDefaultConfig(viewContext.getMessageProvider(),
+                        ModelDataPropertyNames.IS_INVALID, "is_invalid");
+        isInvalidColumn.setRenderer(new YesNoRenderer());
+        configs.add(isInvalidColumn);
         return new ColumnModel(configs);
     }
 

openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample_browser/CommonColumns.java

@@ -24,7 +24,7 @@ import com.extjs.gxt.ui.client.widget.grid.ColumnConfig;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.model.ModelDataPropertyNames;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.renderer.YesNoRenderer;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.ColumnConfigFactory;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.SampleRenderer;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.InvalidableWithCodeRenderer;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.IMessageProvider;
 
 /**
@@ -82,7 +82,7 @@ public final class CommonColumns
     private final ColumnConfig createSampleCodeColumnConfig()
     {
         final ColumnConfig codeColumn = ColumnConfigFactory.createCodeColumnConfig(messageProvider);
-        codeColumn.setRenderer(new SampleRenderer());
+        codeColumn.setRenderer(new InvalidableWithCodeRenderer());
         return codeColumn;
     }