Changeset 7780

Timestamp:

Feb 28, 2020, 1:31:08 PM (3 years ago)

Author:

Nicklas Nordborg

Message:

References #2202: Include information from parent items in list pages

Improved column titles for parent items.

Location:

trunk

Files:

• src/clients/web/net/sf/basedb/clients/web/extensions/list/ParentItemColumn.java (modified) (3 diffs)
• www/common/columns/add_parent_column.js (modified) (3 diffs)

trunk/src/clients/web/net/sf/basedb/clients/web/extensions/list/ParentItemColumn.java

@@ -1 +1 @@
 package net.sf.basedb.clients.web.extensions.list;
 
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Set;
 
@@ -68 +70 @@
           property = m.getPropertyPath(path, false);
           col = new ParentItemPropertyColumn(index, expr, parentFilter, helper, property);
-          col.setTitle(subtype.getName()+"."+path);
+          col.setTitle(subtype.getName()+"."+pathToTitle(path));
           col.setTooltip(subtype.getName() + " › "+path);
         }
@@ -110 +112 @@
   }
 
+  private static Map<String, String> pathTitles = new HashMap<>();
+  
+  static
+  {
+    // See also add_parent_columns.js
+    pathTitles.put("externalId", "External ID");
+    pathTitles.put("bioWell.bioPlate", "Bioplate");
+    pathTitles.put("entryDate", "Registered");
+    pathTitles.put("remainingQuantity", "Remaining quantity");
+    pathTitles.put("creationEvent.entryDate", "Registered");
+    pathTitles.put("creationEvent.protocol", "Protocol");
+    pathTitles.put("creationEvent.hardware", "Hardware");
+    pathTitles.put("remainingQuantity", "Remaining quantity");
+  }
+  
+  /**
+    Convert some paths to a more user-friendly title instead.
+  */
+  private static String pathToTitle(String path)
+  {
+    String title = pathTitles.get(path);
+    return title == null ? path.substring(0, 1).toUpperCase() + path.substring(1) : title;
+  }
+  
   private final int index;
   private final Filter<Annotatable> filter;

trunk/www/common/columns/add_parent_column.js

@@ -32 +32 @@
   var currentAnnotationTypesCategory;
   
+  // See also net.sf.basedb.clients.web.extensions.list.ParentItemColumn.pathTitles
+
   var nameCol = {'id': '.', 'text': 'Name'};
   var externalIdCol = {'id': 'externalId', 'text': 'External ID'};
@@ -181 +183 @@
       return;
     }
+    data.subtypeName = frm.subtype[frm.subtype.selectedIndex].text;
 
     var numSelected = 0;
@@ -190 +193 @@
         data.column = col.value;
         data.property = '/'+data.parentType+'/'+data.subtype+'/'+data.column;
-        data.title = col.value == '.' ? frm.subtype[frm.subtype.selectedIndex].text : col.text;
+        data.title = data.subtypeName + (col.value == '.' ? '' : '.'+col.text);
         Events.sendCustomEvent(window.opener.Doc.element('selectParentItemColumn'), 'base-selected', data);
         numSelected++;