Changeset 6568

Timestamp:

Oct 21, 2014, 1:07:45 PM (9 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #1840: Filter annotations on the Annotations tab based on subtype of item

Location:

trunk/www/common/annotations

Files:

• list.js (modified) (2 diffs)
• list_annotations.jsp (modified) (7 diffs)

trunk/www/common/annotations/list.js

@@ -33 +33 @@
     Events.addEventHandler(element, 'click', list.editAnnotation);
   }
+  
+  list.initListPage = function()
+  {
+    if (Doc.element('annotations'))
+    {
+      var allWithValues = Data.int('annotations-stat', 'all-with-values');
+      var allOfCategory = Data.int('annotations-stat', 'all-of-category');
+      Events.addEventHandler('view_all', 'click', list.setViewFilter);
+      Events.addEventHandler('view_values', 'click', list.setViewFilter);
+      Events.addEventHandler('view_category', 'click', list.setViewFilter);
+      Doc.element('allWithValues').innerHTML = allWithValues;
+      if (Doc.element('allOfCategory'))
+      {
+        Doc.element('allOfCategory').innerHTML = allOfCategory;
+      }
+      if (allWithValues == 0 && allOfCategory == 0)
+      {
+        Doc.element('view_all').checked = true;
+      }
+      list.setViewFilter();
+    }
+  }
+  
   if (Doc.getPageId() == 'list-annotations')
   {
     Doc.addElementInitializer(list.initEditLink);
+    Doc.onLoad(list.initListPage);
   }
 
@@ -66 +90 @@
   }
   
+  list.setViewFilter = function()
+  {
+    var frm = document.forms['annotations'];
+    var filter = Forms.getCheckedRadio(frm.view).value;
+    Doc.element('annotations-data').className = 'data ' + filter;
+  }
+  
   return list;
 }();

trunk/www/common/annotations/list_annotations.jsp

@@ -38 +38 @@
   import="net.sf.basedb.core.Subtypable"
   import="net.sf.basedb.core.ItemSubtype"
+  import="net.sf.basedb.core.BioPlate"
+  import="net.sf.basedb.core.BioPlateType"
   import="net.sf.basedb.core.ItemQuery"
   import="net.sf.basedb.core.ItemResultList"
@@ -43 +45 @@
   import="net.sf.basedb.core.query.Orders"
   import="net.sf.basedb.core.query.Hql"
+  import="net.sf.basedb.core.query.Restrictions"
+  import="net.sf.basedb.core.query.Expressions"
   import="net.sf.basedb.core.snapshot.AnnotationSetSnapshot"
   import="net.sf.basedb.core.snapshot.AnnotationSnapshot"
@@ -140 +144 @@
     annotationTypes.removeAll(protocolParameters);
   }
+  // Load the current subtype
+  // NOTE! User may have selected a different subtype in the form than what is
+  // currently saved so if a subtype_id is sent in the request we use that
+  String selectedCategoryName = null;
+  try
+  {
+    ItemSubtype subtype = null;
+    if (item instanceof Subtypable)
+    {
+      subtype = ((Subtypable)item).getItemSubtype();
+    }
+    else if (item instanceof BioPlate)
+    {
+      BioPlateType bpt = ((BioPlate)item).getBioPlateType();
+      subtype = bpt.getItemSubtype();
+      if (subtype == null) selectedCategoryName = bpt.getName();
+    }
+    if (subtype != null) selectedCategoryName = subtype.getName();
+  }
+  catch (PermissionDeniedException ex)
+  {}
+  Set<AnnotationType> annotationTypesInCategory = new HashSet<AnnotationType>();
+  if (selectedCategoryName != null)
+  {
+    ItemQuery<AnnotationType> query = AnnotationType.getQuery(item.getType());
+    query.join(Hql.innerJoin("categories", "ct"));
+    query.restrict(Restrictions.eq(Hql.property("ct", "name"), Expressions.string(selectedCategoryName)));
+    annotationTypesInCategory.addAll(query.list(dc));
+  }
   %>
   <base:page type="iframe" id="list-annotations">
-  <base:head scripts="~list.js" styles="table.css" />
+  <base:head scripts="~list.js" styles="table.css">
+  <style>
+    #annotations-data.all
+    {}
+    
+    #annotations-data.values .novalues
+    {
+      display: none;
+    }
+    
+    #annotations-data.category .nocategory
+    {
+      display: none;
+    }
+  </style>
+  </base:head>
   <base:body>
     <%
@@ -157 +205 @@
       >
       <%
+      int allWithValues = 0;
+      int allOfCategory = 0;
       if (annotationTypes.size() == 0)
       {
@@ -185 +235 @@
             title="Description"
           />
-          <tbl:data>
+          <div class="panelgroup topborder leftborder rightborder">
+            <tbl:panel style="height: auto; padding: 2px;">
+              <b>View:</b> 
+              <%
+              if (selectedCategoryName != null)
+              {
+                %>
+                <label><input type="radio" name="view" id="view_category" value="category" checked>All of <i><%=HTML.encodeTags(selectedCategoryName)%></i> category</label> (<span id="allOfCategory">?</span>)
+                <%
+              }
+              %>
+              <label><input type="radio" name="view" id="view_values" value="values" <%=selectedCategoryName == null ? "checked" : ""%>>All with values</label> (<span id="allWithValues">?</span>)
+              <label><input type="radio" name="view" id="view_all" value="all">All annotations</label> (<%=annotationTypes.size()%>)
+            </tbl:panel>
+          </div>
+          <tbl:data id="annotations-data">
             <tbl:headers>
               <tbl:headerrow>
@@ -206 +271 @@
               if (values != null || !at.isRemoved())
               {
-              %>
-                <tbl:row>
+                String rowClass = "";
+                if (values == null || values.size() == 0) 
+                {
+                  rowClass += " novalues";
+                }
+                else
+                {
+                  allWithValues++;
+                }
+                if (!annotationTypesInCategory.contains(at)) 
+                {
+                  rowClass += " nocategory";
+                }
+                else
+                {
+                  allOfCategory++;
+                }
+                %>
+                <tbl:row subclass="<%=rowClass%>">
                   <tbl:cell column="annotation"><base:icon 
                     image="deleted.png" 
@@ -237 +319 @@
       }
       %>
+      <div id="annotations-stat" class="datacontainer"
+        data-all-with-values="<%=allWithValues %>"
+        data-all-of-category="<%=allOfCategory%>"
+      ></div>
+      
     </base:section>