Changeset 7779

Timestamp:

Feb 28, 2020, 12:36:48 PM (3 years ago)

Author:

Nicklas Nordborg

Message:

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

Added support for other static properties than "Name".

Location:

trunk

Files:

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

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

@@ -78 +78 @@
           col.setFilterProperty("/"+tmp[1]+"/"+tmp[2]+"/name");
         }
-        col.setValueType(Type.STRING);
         col.setClazz("parentitemcol");
         if (property == null || property.getHibernateType().isEntityType())
         {
           col.setExportFormatter(new NameableFormatter());
+          col.setFilterProperty(col.getProperty()+".name");
+          col.setValueType(Type.STRING);
           if (!helper.lazy) col.setFormatter(new CollectionFormatter(new LinkedItemFormatter()));
         }
         else
         {
-          col.setExportFormatter(new ToStringFormatter<>());
+          Type colType = Type.fromHibernateType(property.getHibernateType());
+          if (colType != null)
+          {
+            col.setValueType(colType);
+            col.setExportFormatter(FormatterFactory.getTypeFormatter(dc.getSessionControl(), colType));
+          }
+          else
+          {
+            // Last fallback -- if we get here the Type.fromHibernateType() should be update with special cases
+            col.setValueType(Type.STRING);
+            col.setExportFormatter(new ToStringFormatter<>());
+          }
           if (!helper.lazy) col.setFormatter(new CollectionFormatter(col.getExportFormatter()));
         }

trunk/www/common/columns/add_parent_column.js

@@ -31 +31 @@
   var currentAnnotationTypesAll;
   var currentAnnotationTypesCategory;
+  
+  var nameCol = {'id': '.', 'text': 'Name'};
+  var externalIdCol = {'id': 'externalId', 'text': 'External ID'};
+  var bioPlateCol = {'id': 'bioWell.bioPlate', 'text': 'Bioplate'};
+  var entryDateCol = {'id': 'entryDate', 'text': 'Registered'};
+  var remainingQCol = {'id': 'remainingQuantity', 'text': 'Remaining quantity'};
+  
+  var creationRegistredCol = {'id': 'creationEvent.entryDate', 'text': 'Registered'};
+  var creationProtocolCol = {'id': 'creationEvent.protocol', 'text': 'Protocol'};
+  var creationHardwareCol = {'id': 'creationEvent.hardware', 'text': 'Hardware'};
+
+  var protocolCol = {'id': 'protocol', 'text': 'Protocol'};
+  var hardwareCol = {'id': 'hardware', 'text': 'Hardware'};
+  var softwareCol = {'id': 'software', 'text': 'Software'};
+
+  var staticColumns = {
+    'BIOSOURCE': [nameCol, externalIdCol, entryDateCol],
+    'SAMPLE': [nameCol, externalIdCol, bioPlateCol, creationRegistredCol, creationProtocolCol, remainingQCol],
+    'EXTRACT': [nameCol, externalIdCol, bioPlateCol, creationRegistredCol, creationProtocolCol, remainingQCol],
+    'PHYSICALBIOASSAY': [nameCol, creationRegistredCol, creationProtocolCol, creationHardwareCol],
+    'DERIVEDBIOASSAY': [nameCol, entryDateCol, protocolCol, softwareCol, hardwareCol]
+  }
   
   /**
@@ -82 +104 @@
   configure.typeInfoLoaded = function(request)
   {
-    App.debug(request.responseText);
     var response = JSON.parse(request.responseText);
     if (response.status != 'ok')
@@ -122 +143 @@
     var annotationTypes = frm.showAllAnnotationTypes.checked ? currentAnnotationTypesAll : currentAnnotationTypesCategory;
     frm.column.length = 0;
-    frm.column[frm.column.length] = new Option('Name', '.');
+    
+    // Add static property columns depending on itemtype
+    var cols = staticColumns[parentType] || [];
+    for (var i = 0; i < cols.length; i++)
+    {
+      var c = cols[i];
+      frm.column[frm.column.length] = new Option(c.text, c.id);
+    }
+    
+    // Add annotation columns
     for (var i = 0; i < annotationTypes.length; i++)
     {