Changeset 7773

Timestamp:

Feb 17, 2020, 11:10:58 AM (3 years ago)

Author:

Nicklas Nordborg

Message:

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

Implemented a simple dialog for selecting parent item columns. It currently allows selecting to display the name of a parent item or any annotation that is attached to it. It can probably be improved a bit more.

Location:

trunk

Files:

• src/clients/web/net/sf/basedb/clients/web/extensions/list/ParentItemColumn.java (modified) (2 diffs)
• src/clients/web/web-extensions.xml (modified) (1 diff)
• www/biomaterials/extracts/list_extracts.jsp (modified) (1 diff)
• www/biomaterials/samples/list_samples.jsp (modified) (1 diff)
• www/common/columns/add_parent_column.js (added)
• www/common/columns/add_parent_column.jsp (added)
• www/common/columns/ajax.jsp (modified) (2 diffs)
• www/common/columns/configure.js (modified) (2 diffs)
• www/common/columns/configure.jsp (modified) (3 diffs)
• www/include/scripts/table.js (modified) (2 diffs)
• www/views/derivedbioassays/list_bioassays.jsp (modified) (1 diff)
• www/views/physicalbioassays/list_bioassays.jsp (modified) (1 diff)
• www/views/rawbioassays/list_rawbioassays.jsp (modified) (1 diff)

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

@@ -55 +55 @@
         col.setTooltip(subtype.getName() + " › "+at.getName());
         col.setValueType(at.getValueType());
+        col.setClazz("parentitemcol");
         col.setExportFormatter(FormatterFactory.getTypeFormatter(dc.getSessionControl(), at.getValueType()));
         if (!helper.lazy) col.setFormatter(new CollectionFormatter(col.getExportFormatter()));
@@ -78 +79 @@
         }
         col.setValueType(Type.STRING);
+        col.setClazz("parentitemcol");
         if (property == null || property.getHibernateType().isEntityType())
         {

trunk/src/clients/web/web-extensions.xml

@@ -296 +296 @@
   
   <extension
-    id="parent-item-columns"
-    extends="net.sf.basedb.clients.web.listcolumn.rawbioassay">
-    <index>2</index>
+    id="parent-item-columns">
+    <extends>
+      <ref index="2">net.sf.basedb.clients.web.listcolumn.rawbioassay</ref>
+      <ref index="2">net.sf.basedb.clients.web.listcolumn.derivedbioassay</ref>
+      <ref index="2">net.sf.basedb.clients.web.listcolumn.physicalbioassay</ref>
+      <ref index="2">net.sf.basedb.clients.web.listcolumn.extract</ref>
+      <ref index="2">net.sf.basedb.clients.web.listcolumn.sample</ref>
+    </extends>
     <about>
       <name>Parent item data</name>

trunk/www/biomaterials/extracts/list_extracts.jsp

@@ -233 +233 @@
       subclass="fulltable"
       data-inherited-annotations="true"
+      data-parent-columns="true"
       >
       <tbl:hidden 

trunk/www/biomaterials/samples/list_samples.jsp

@@ -208 +208 @@
       subclass="fulltable"
       data-inherited-annotations="true"
+      data-parent-columns="true"
       >
       <tbl:hidden 

trunk/www/common/columns/ajax.jsp

@@ -34 +34 @@
   import="net.sf.basedb.util.error.ThrowableUtil"
   import="net.sf.basedb.util.extensions.ExtensionsInvoker"
+  import="net.sf.basedb.core.query.Restrictions"
+  import="net.sf.basedb.core.query.Expressions"
+  import="net.sf.basedb.core.query.Hql"
   import="net.sf.basedb.clients.web.AnnotationUtil"
   import="net.sf.basedb.clients.web.Base"
@@ -87 +90 @@
     
   }
+  else if ("GetAnnotationTypesForCategory".equals(cmd))
+  {
+    dc = sc.newDbControl();
+    String category = Values.getStringOrNull(request.getParameter("category"));
+    JSONArray jsonAnnotationTypes = new JSONArray();
+    if (category != null)
+    {
+      ItemQuery<AnnotationType> annotationTypeQuery = Base.getAnnotationTypesQuery(itemType);
+      annotationTypeQuery.join(Hql.innerJoin("categories", "c"));
+      annotationTypeQuery.restrict(Restrictions.eq(Hql.property("c", "name"), Expressions.string(category)));
+      for (AnnotationType at : annotationTypeQuery.list(dc))
+      {
+        JSONObject jsonAt = new JSONObject();
+        jsonAt.put("id", at.getId());
+        jsonAt.put("name", at.getName());
+        jsonAnnotationTypes.add(jsonAt);
+      }
+    }
+    json.put("annotationTypesCategory", jsonAnnotationTypes);
+  }
   else if ("GetLazyParentColumns".equals(cmd))
   {

trunk/www/common/columns/configure.js

@@ -54 +54 @@
       Buttons.addClickHandler('selectAnnotationTypes', configure.selectAnnotationTypes);
       Events.addEventHandler('selectAnnotationTypes', 'base-selected', configure.annotationTypeSelected);
+    }
+    if (Doc.element('selectParentItemColumn'))
+    {
+      Buttons.addClickHandler('selectParentItemColumn', configure.selectParentItemColumn);
+      Events.addEventHandler('selectParentItemColumn', 'base-selected', configure.parentItemColumnSelected);
     }
     
@@ -212 +217 @@
   }
   
+  
+  configure.selectParentItemColumn = function(event)
+  {
+    var frm = document.forms['columns'];
+    var url = 'add_parent_column.jsp?ID='+App.getSessionId();
+    url += '&item_type='+Data.get('page-data', 'item-type');
+    Dialogs.openPopup(url, 'SelectParentItemColumn', 600, 400);
+  }
+
+  configure.parentItemColumnSelected = function(event)
+  {
+    var frm = document.forms['columns'];
+    var data = event.detail;
+    // Do not add duplicates
+    for (var i = 0; i < frm.visible.length; i++)
+    {
+      if (frm.visible[i].value == data.property) return;
+    }
+
+    frm.visible[frm.visible.length] = new Option(data.title, data.property);
+  }
+  
   /**
     Save the current selection and close the dialog.

trunk/www/common/columns/configure.jsp

@@ -54 +54 @@
 final String tableId = request.getParameter("table_id");
 final boolean enableInheritedAnnotations = Values.getBoolean(request.getParameter("enableInheritedAnnotations"));
+final boolean enableParentColumns = Values.getBoolean(request.getParameter("enableParentColumns"));
 final ItemContext cc = sc.getCurrentContext(itemType, subContext);
 
@@ -76 +77 @@
     <table style="width: 100%; height: 100%;">
     <%
-    if (enableInheritedAnnotations)
+    if (enableInheritedAnnotations || enableParentColumns)
     {
       %>
@@ -87 +88 @@
             title="Add inherited annotations&hellip;" 
             tooltip="Add columns for inherited annotations" 
+            visible="<%=enableInheritedAnnotations %>"
+           />
+          <tbl:button 
+            id="selectParentItemColumn" 
+            image="add.png"
+            title="Add parent item columns&hellip;" 
+            tooltip="Add columns from parent items" 
+            visible="<%=enableParentColumns %>"
            />
         </tbl:toolbar>

trunk/www/include/scripts/table.js

@@ -884 +884 @@
     var subContext = Data.get(tableDiv, 'subcontext', '');
     var enableInheritedAnnotations = Data.get(tableDiv, 'inherited-annotations');
+    var enableParentColumns = Data.get(tableDiv, 'parent-columns');
     
     var url = App.getRoot()+'common/columns/configure.jsp?ID='+App.getSessionId();
@@ -890 +891 @@
     {
       url += '&enableInheritedAnnotations='+encodeURIComponent(enableInheritedAnnotations);
+    }
+    if (enableParentColumns)
+    {
+      url += '&enableParentColumns='+encodeURIComponent(enableParentColumns);
     }
     if (settingName) url += '&settingName='+settingName;

trunk/www/views/derivedbioassays/list_bioassays.jsp

@@ -185 +185 @@
       subclass="fulltable"
       data-inherited-annotations="true"
+      data-parent-columns="true"
       >
       <tbl:hidden 

trunk/www/views/physicalbioassays/list_bioassays.jsp

@@ -175 +175 @@
       subclass="fulltable"
       data-inherited-annotations="true"
+      data-parent-columns="true"
       >
       <tbl:hidden 

trunk/www/views/rawbioassays/list_rawbioassays.jsp

@@ -188 +188 @@
       filterrows="<%=cc.getFilterRows()%>"
       data-inherited-annotations="true"
+      data-parent-columns="true"
       >
       <tbl:hidden