LMS-712 better GUI labels, show registrator and registration date for samples by default

SVN: 9671

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

@@ -337,7 +337,7 @@ public abstract class Dict
     //
     // Role View
     //
-    static final String ROLE = "role";
+    public static final String ROLE = "role";
 
     public static final String CONFIRM_ROLE_REMOVAL_MSG = "confirm_role_removal_msg";
 

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

@@ -45,6 +45,7 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.application.renderer.D
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.ColumnConfigFactory;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.ColumnFilter;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.amc.AddGroupDialog;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.grid.AbstractColumnDefinitionKind;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.GWTUtils;
 import ch.systemsx.cisd.openbis.generic.client.web.client.dto.Group;
 
@@ -125,7 +126,7 @@ public class GroupsView extends ContentPanel
         final ColumnConfig registrationDateColumnConfig = new ColumnConfig();
         registrationDateColumnConfig.setId(ModelDataPropertyNames.REGISTRATION_DATE);
         registrationDateColumnConfig.setHeader(viewContext.getMessage(Dict.REGISTRATION_DATE));
-        registrationDateColumnConfig.setWidth(ColumnConfigFactory.DEFAULT_COLUMN_WIDTH);
+        registrationDateColumnConfig.setWidth(AbstractColumnDefinitionKind.DATE_COLUMN_WIDTH);
         registrationDateColumnConfig.setAlignment(HorizontalAlignment.RIGHT);
         registrationDateColumnConfig.setDateTimeFormat(DateRenderer.DEFAULT_DATE_TIME_FORMAT);
         configs.add(registrationDateColumnConfig);
@@ -139,7 +140,7 @@ public class GroupsView extends ContentPanel
 
         final ContentPanel cp = new ContentPanel();
         cp.setBodyBorder(false);
-        cp.setHeading(viewContext.getMessage(Dict.LIST_GROUPS));
+        cp.setHeaderVisible(false);
         cp.setButtonAlign(HorizontalAlignment.CENTER);
 
         cp.setLayout(new FitLayout());

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

@@ -44,6 +44,7 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.application.renderer.D
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.ColumnConfigFactory;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.ColumnFilter;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.amc.AddPersonDialog;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.grid.AbstractColumnDefinitionKind;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.GWTUtils;
 
 /**
@@ -54,12 +55,10 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.GWTUt
 public class PersonsView extends ContentPanel
 {
 
-    private static final String LIST_PERSONS = "List Persons";
+    private static final String LIST_PERSONS = "Persons Browser";
 
     private static final String BUTTON_ADD_PERSON = "Add Person";
 
-    private static final String PERSON_LIST = "Person List";
-
     private static final String EMAIL = "Email";
 
     private static final String LAST_NAME = "Last Name";
@@ -119,7 +118,7 @@ public class PersonsView extends ContentPanel
         final ColumnConfig emailNameColumnConfig = new ColumnConfig();
         emailNameColumnConfig.setId(ModelDataPropertyNames.EMAIL);
         emailNameColumnConfig.setHeader(EMAIL);
-        emailNameColumnConfig.setWidth(ColumnConfigFactory.DEFAULT_COLUMN_WIDTH);
+        emailNameColumnConfig.setWidth(200);
         configs.add(emailNameColumnConfig);
 
         final ColumnConfig registratorColumnConfig = new ColumnConfig();
@@ -131,7 +130,7 @@ public class PersonsView extends ContentPanel
         final ColumnConfig registrationDateColumnConfig = new ColumnConfig();
         registrationDateColumnConfig.setId(ModelDataPropertyNames.REGISTRATION_DATE);
         registrationDateColumnConfig.setHeader(viewContext.getMessage(Dict.REGISTRATION_DATE));
-        registrationDateColumnConfig.setWidth(ColumnConfigFactory.DEFAULT_COLUMN_WIDTH);
+        registrationDateColumnConfig.setWidth(AbstractColumnDefinitionKind.DATE_COLUMN_WIDTH);
         registrationDateColumnConfig.setAlignment(HorizontalAlignment.RIGHT);
         registrationDateColumnConfig.setDateTimeFormat(DateRenderer.DEFAULT_DATE_TIME_FORMAT);
         configs.add(registrationDateColumnConfig);
@@ -143,7 +142,7 @@ public class PersonsView extends ContentPanel
 
         final ContentPanel cp = new ContentPanel();
         cp.setBodyBorder(false);
-        cp.setHeading(PERSON_LIST);
+        cp.setHeaderVisible(false);
         cp.setButtonAlign(HorizontalAlignment.CENTER);
         final PersonsView personList = this;
 

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

@@ -55,9 +55,7 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.dto.RoleAssignment;
 public class RolesView extends ContentPanel
 {
 
-    private static final String LIST_ROLES = "List Roles";
-
-    private static final String ROLE_LIST = "Role List";
+    private static final String LIST_ROLES = "Roles Browser";
 
     private static final String BUTTON_ADD_ROLE = "Add Role";
 
@@ -116,8 +114,8 @@ public class RolesView extends ContentPanel
 
         final ColumnConfig roleColumnConfig = new ColumnConfig();
         roleColumnConfig.setId(ModelDataPropertyNames.ROLE);
-        roleColumnConfig.setHeader(Dict.ROLE);
-        roleColumnConfig.setWidth(ColumnConfigFactory.DEFAULT_COLUMN_WIDTH);
+        roleColumnConfig.setHeader(viewContext.getMessage(Dict.ROLE));
+        roleColumnConfig.setWidth(150);
         configs.add(roleColumnConfig);
 
         final ColumnModel cm = new ColumnModel(configs);
@@ -127,7 +125,7 @@ public class RolesView extends ContentPanel
 
         final ContentPanel cp = new ContentPanel();
         cp.setBodyBorder(false);
-        cp.setHeading(ROLE_LIST);
+        cp.setHeaderVisible(false);
         cp.setButtonAlign(HorizontalAlignment.CENTER);
         final RolesView roleList = this;
 

openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/columns/CommonSampleColDefKind.java

@@ -79,62 +79,62 @@ public enum CommonSampleColDefKind implements IColumnDefinitionKind<Sample>
             }
         }),
 
-    REGISTRATOR(new AbstractColumnDefinitionKind<Sample>(Dict.REGISTRATOR, true)
+    IS_INVALID(new AbstractColumnDefinitionKind<Sample>(Dict.IS_INVALID, true)
         {
             @Override
             public String tryGetValue(Sample entity)
             {
-                return renderRegistrator(entity);
+                return renderInvalidationFlag(entity);
             }
         }),
 
-    REGISTRATION_DATE(new AbstractColumnDefinitionKind<Sample>(Dict.REGISTRATION_DATE,
-            AbstractColumnDefinitionKind.DATE_COLUMN_WIDTH, true)
+    EXPERIMENT(new AbstractColumnDefinitionKind<Sample>(Dict.EXPERIMENT)
         {
             @Override
             public String tryGetValue(Sample entity)
             {
-                return renderRegistrationDate(entity);
+                final Experiment exp = tryToGetExperiment(entity);
+                return exp == null ? null : exp.getCode();
             }
         }),
 
-    IS_INVALID(new AbstractColumnDefinitionKind<Sample>(Dict.IS_INVALID, true)
+    EXPERIMENT_IDENTIFIER(new AbstractColumnDefinitionKind<Sample>(Dict.EXPERIMENT_IDENTIFIER, 200,
+            true)
         {
             @Override
             public String tryGetValue(Sample entity)
             {
-                return renderInvalidationFlag(entity);
+                final Experiment exp = tryToGetExperiment(entity);
+                return exp == null ? null : exp.getIdentifier();
             }
         }),
 
-    EXPERIMENT(new AbstractColumnDefinitionKind<Sample>(Dict.EXPERIMENT)
+    PROJECT(new AbstractColumnDefinitionKind<Sample>(Dict.PROJECT)
         {
             @Override
             public String tryGetValue(Sample entity)
             {
                 final Experiment exp = tryToGetExperiment(entity);
-                return exp == null ? null : exp.getCode();
+                return exp == null ? null : exp.getProject().getCode();
             }
         }),
 
-    EXPERIMENT_IDENTIFIER(new AbstractColumnDefinitionKind<Sample>(Dict.EXPERIMENT_IDENTIFIER, 200,
-            true)
+    REGISTRATOR(new AbstractColumnDefinitionKind<Sample>(Dict.REGISTRATOR)
         {
             @Override
             public String tryGetValue(Sample entity)
             {
-                final Experiment exp = tryToGetExperiment(entity);
-                return exp == null ? null : exp.getIdentifier();
+                return renderRegistrator(entity);
             }
         }),
 
-    PROJECT(new AbstractColumnDefinitionKind<Sample>(Dict.PROJECT)
+    REGISTRATION_DATE(new AbstractColumnDefinitionKind<Sample>(Dict.REGISTRATION_DATE,
+            AbstractColumnDefinitionKind.DATE_COLUMN_WIDTH)
         {
             @Override
             public String tryGetValue(Sample entity)
             {
-                final Experiment exp = tryToGetExperiment(entity);
-                return exp == null ? null : exp.getProject().getCode();
+                return renderRegistrationDate(entity);
             }
         });
 

openbis/source/java/ch/systemsx/cisd/openbis/public/common-dictionary.js

@@ -161,7 +161,7 @@ var common = {
   sample_batch_registration: "Sample Batch Registration",
   sample_registration: "Sample Registration",
   sample_broser: "Sample Browser",
-  list_groups: "List Groups",
+  list_groups: "Groups Browser",
   confirm_title: "Confirmation",
   confirm_close_msg: "All unsaved changes will be lost. Are you sure?",