Changeset 7315

Timestamp:

Mar 30, 2017, 9:03:19 AM (6 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #2069: Display raw data type as subtitle of raw bioassays in item overview

Location:

trunk/www/common/overview

Files:

• ajax.jsp (modified) (2 diffs)
• tree.jsp (modified) (2 diffs)

trunk/www/common/overview/ajax.jsp

@@ -30 +30 @@
   import="net.sf.basedb.core.BioPlate"
   import="net.sf.basedb.core.BioPlateType"
+  import="net.sf.basedb.core.RawDataType"
+  import="net.sf.basedb.core.RawBioAssay"
   import="net.sf.basedb.core.Item"
   import="net.sf.basedb.util.overview.GenericOverview"
@@ -119 +121 @@
           {}
         }
+        else if (n.getItem() instanceof RawBioAssay)
+        {
+          RawDataType rawDataType = ((RawBioAssay)n.getItem(dc)).getRawDataType();
+          subtitle = rawDataType.getName();
+        }
         
         int numChildren = n.numChildren();

trunk/www/common/overview/tree.jsp

@@ -33 +33 @@
   import="net.sf.basedb.core.BioPlateType"
   import="net.sf.basedb.core.BioPlate"
+  import="net.sf.basedb.core.RawDataType"
+  import="net.sf.basedb.core.RawBioAssay"
   import="net.sf.basedb.core.ItemContext"
   import="net.sf.basedb.core.Permission"
@@ -164 +166 @@
       {}
     }
+    else if (child.getItem() instanceof RawBioAssay)
+    {
+      RawDataType rawDataType = ((RawBioAssay)child.getItem(dc)).getRawDataType();
+      subtitle = rawDataType.getName();
+    }
     
     String text = HTML.encodeTags(child.getTitle()) + (subtitle != null ? " <span class=\"subtitle\">(" + subtitle + ")</span>" : "");