SP-362 / BIS-246: Show metaproject tags in Web GUI and allow editing them when...

SP-362 / BIS-246: Show metaproject tags in Web GUI and allow editing them when editing an entity - show metaprojects in entity properties panel

SVN: 27483

openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/PropertiesPanelUtils.java

@@ -16,14 +16,18 @@
 
 package ch.systemsx.cisd.openbis.plugin.generic.client.web.client.application;
 
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
+import ch.systemsx.cisd.common.shared.basic.string.StringUtils;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.Dict;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.renderer.PropertyTypeRenderer;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.EntityPropertyUtils;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.IEntityProperty;
+import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Metaproject;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.PropertyType;
 
 /**
@@ -49,4 +53,22 @@ public class PropertiesPanelUtils
             }
         }
     }
+
+    public static void addMetaprojects(final IViewContext<?> viewContext,
+            final Map<String, Object> properties, final Collection<Metaproject> metaprojects)
+    {
+        if (metaprojects != null && metaprojects.size() > 0)
+        {
+            String[] names = new String[metaprojects.size()];
+            int index = 0;
+
+            for (Metaproject metaproject : metaprojects)
+            {
+                names[index++] = metaproject.getName();
+            }
+            properties
+                    .put(viewContext.getMessage(Dict.METAPROJECTS), StringUtils.join(names, ", "));
+        }
+
+    }
 }

openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/DataSetPropertiesPanel.java

@@ -147,7 +147,10 @@ public class DataSetPropertiesPanel extends ContentPanel
         {
             properties.put(messageProvider.getMessage(Dict.DELETION), deletion);
         }
+
+        PropertiesPanelUtils.addMetaprojects(viewContext, properties, dataset.getMetaprojects());
         PropertiesPanelUtils.addEntityProperties(viewContext, properties, dataset.getProperties());
+
         return properties;
     }
 }

openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/ExperimentPropertiesPanel.java

@@ -122,6 +122,7 @@ public class ExperimentPropertiesPanel extends ContentPanel
         }
         properties.put(viewContext.getMessage(Dict.PROJECT), experiment.getProject());
 
+        PropertiesPanelUtils.addMetaprojects(viewContext, properties, experiment.getMetaprojects());
         PropertiesPanelUtils.addEntityProperties(viewContext, properties,
                 experiment.getProperties());
 

openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/material/GenericMaterialViewer.java

@@ -194,6 +194,7 @@ abstract public class GenericMaterialViewer extends AbstractViewerWithVerticalSp
         properties.put(viewContext.getMessage(Dict.REGISTRATION_DATE),
                 material.getRegistrationDate());
 
+        PropertiesPanelUtils.addMetaprojects(viewContext, properties, material.getMetaprojects());
         PropertiesPanelUtils.addEntityProperties(viewContext, properties, material.getProperties());
 
         return properties;

openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleViewer.java

@@ -312,6 +312,8 @@ abstract public class GenericSampleViewer extends AbstractViewerWithVerticalSpli
         {
             properties.put(viewContext.getMessage(Dict.PART_OF), partOf);
         }
+
+        PropertiesPanelUtils.addMetaprojects(viewContext, properties, sample.getMetaprojects());
         PropertiesPanelUtils.addEntityProperties(viewContext, properties, sample.getProperties());
 
         return properties;