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

Timestamp:

Jan 30, 2015, 1:31:02 PM (9 years ago)

Author:

Nicklas Nordborg

Message:

References #1912: Add more filter rows in list pages

Added support for dynamic queries and implemented filter rows on bioassay sets and other list pages inside an experiment (including experiment explorer).

File:

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

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

@@ -196 +196 @@
       sc="<%=sc%>"
       item="<%=itemType%>"
+      filterrows="<%=cc.getFilterRows()%>"
       subclass="fulltable"
       data-inherited-annotations="true"
@@ -410 +411 @@
             <tbl:columnheaders />
           </tbl:headerrow>
-          <tbl:headerrow>
-            <tbl:header subclass="index" />
-            <tbl:header 
-              subclass="check" 
-              visible="<%=mode.hasCheck()%>"
-              ><base:icon 
-                id="check.uncheck"
-                image="check_uncheck.png" 
-                tooltip="Check/uncheck all" 
-                 
-              /></tbl:header>
-            <tbl:header 
-              subclass="check" 
-              visible="<%=mode.hasRadio()%>"
-              />
-            <tbl:header 
-              subclass="icons" 
-              visible="<%=mode.hasIcons()%>"
-              />
-            <tbl:propertyfilter />
-          </tbl:headerrow>
+          <%
+          int numFilters = cc.getNumPropertyFilters();
+          int numRows = cc.getFilterRows();
+          for (int filterNo = 0; filterNo < numRows; filterNo++)
+          {
+            boolean lastRow = filterNo == numRows-1;
+            %>
+            <tbl:headerrow>
+              <tbl:header subclass="index" />
+              <tbl:header 
+                subclass="check" 
+                visible="<%=mode.hasCheck()%>"
+                ><base:icon 
+                  id="check.uncheck"
+                  image="check_uncheck.png" 
+                  tooltip="Check/uncheck all" 
+                  visible="<%=lastRow%>"
+                /></tbl:header>
+              <tbl:header 
+                subclass="check" 
+                visible="<%=mode.hasRadio()%>"
+                />
+              <tbl:header 
+                subclass="icons" 
+                visible="<%=mode.hasIcons()%>"
+                >
+                <base:icon
+                  subclass="link table-filter-row-action"
+                  image="add.png"
+                  tooltip="Add extra filter row"
+                  visible="<%=lastRow%>"
+                /><base:icon
+                  subclass="link table-filter-row-action"
+                  image="remove.png"
+                  tooltip="Remove this filter row"
+                  visible="<%=numRows > 1 || numFilters > 0 %>"
+                  data-remove-row="<%=filterNo%>"
+                />
+              </tbl:header>
+              <tbl:propertyfilter row="<%=filterNo%>" />
+            </tbl:headerrow>
+            <%
+          }
+          %>
         </tbl:headers>
         <tbl:rows>