Changeset 6691 for trunk/www/views/experiments/bioassays/list_bioassays.jsp

Timestamp:

Jan 21, 2015, 1:30:52 PM (8 years ago)

Author:

Nicklas Nordborg

Message:

References #1906: Display inherited annotations in list views

Implemented for bioassays in experiment.

File:

• trunk/www/views/experiments/bioassays/list_bioassays.jsp (modified) (4 diffs)

trunk/www/views/experiments/bioassays/list_bioassays.jsp

@@ -103 +103 @@
 try
 {
-  final ItemQuery<AnnotationType> annotationTypeQuery = Base.getAnnotationTypesQuery(itemType);
+  ItemQuery<AnnotationType> annotationTypeQuery = Base.getAnnotationTypesQuery(itemType);
   SnapshotManager manager = new SnapshotManager();
   for (AnnotationType at : annotationTypeQuery.list(dc))
   {
     annotationLoaders.add(new AnnotationLoaderUtil(dc, manager, at));
+  }
+  annotationTypeQuery = Base.getInheritedAnnotationColumns(cc.getSetting("columns"));
+  for (AnnotationType at : annotationTypeQuery.list(dc))
+  {
+    annotationLoaders.add(new AnnotationLoaderUtil(dc, manager, at, false, true));
   }
   final BioAssaySet bioAssaySet = BioAssaySet.getById(dc, bioAssaySetId);
@@ -192 +197 @@
       item="<%=itemType%>"
       subclass="fulltable"
+      data-inherited-annotations="true"
       >
       <tbl:hidden 
@@ -280 +286 @@
         %>
         <tbl:columndef 
-          id="<%="at"+at.getId()%>"
-          title="<%=HTML.encodeTags(at.getName())+" [A]"%>" 
-          property="<%="#"+at.getId()%>"
+          id="<%=(loader.isSearchingInheritedAnnotations() ? "ia" : "at")+at.getId()%>"
+          title="<%=HTML.encodeTags(at.getName())+(loader.isSearchingInheritedAnnotations() ? " [I]" : " [A]")%>" 
+          property="<%=(loader.isSearchingInheritedAnnotations() ? "##" : "#")+at.getId()%>"
           annotation="true"
           datatype="<%=at.getValueType().getStringValue()%>"
           enumeration="<%=annotationEnum%>"
           smartenum="<%=at.getDisplayAsList() %>"
-          sortable="<%=at.getMultiplicity() == 1%>" 
+          sortable="<%=at.getMultiplicity() == 1 && !loader.isSearchingInheritedAnnotations()%>" 
           filterable="true" 
           exportable="true"
@@ -528 +534 @@
                       %>
                       <tbl:cell 
-                        column="<%="at"+loader.getId()%>"
+                        column="<%=(loader.isSearchingInheritedAnnotations() ? "ia" : "at")+loader.getId()%>"
                         ><tbl:cellvalue 
                           list="<%=loader.getValues()%>"