Changeset 2689

Timestamp:

03/09/10 11:46:50 (2 years ago)

Author:

erikroos

Message:

Improved list plugin:

• Remove button per column now only removes filter(s) on that column
• It is now possible to filter on empty values
• Added filter option to Animal column
• Added support for <=, <, >, >= operators (still int's only at this point)

Location:

molgenis4animaldb/handwritten/java/plugin/listplugin

Files:

• ListPlugin.ftl (modified) (4 diffs)
• ListPlugin.java (modified) (5 diffs)

molgenis4animaldb/handwritten/java/plugin/listplugin/ListPlugin.ftl

@@ -41 +41 @@
         
         <tr>
-                <td></td>
+                <td><div align="center">
+                        <button type="submit" onclick="ColumnInQuestion.value='-1'; __action.value='noFilterColumn';"><img src="res/img/nofunnel.jpg" alt="disable filter" /></button>
+                </div></td>
                 <#assign i = 0>
                 <#list screen.featureList as fl>
@@ -48 +50 @@
                                         <input type="submit" value="-" class="minusbutton" onclick="ColumnInQuestion.value='${i}'; __action.value='remColumn';" />
                                         &nbsp;
-                                        <button type="submit" onclick="ColumnInQuestion.value='${i}'; __action.value='noFilterColumn';"><img src="res/img/nofunnel.jpg" alt="no funnel" /></button>
+                                        <button type="submit" onclick="ColumnInQuestion.value='${i}'; __action.value='noFilterColumn';"><img src="res/img/nofunnel.jpg" alt="disable filter" /></button>
                                 </div></td>
                         </#if>
@@ -77 +79 @@
         
         <tr>
-                <td></td>
+                <td><div align="center">
+                        <select name="operator-1">
+                                <option value="=">=</option>
+                                <option value="<">&lt;</option>
+                                <option value="<=">&lt;=</option>
+                                <option value=">">&gt;</option>
+                                <option value=">=">&gt;=</option>
+                        </select>
+                        &nbsp;
+                        <input type="text" name="filtertext-1" />
+                        &nbsp;
+                        <button type="submit" onclick="ColumnInQuestion.value='-1'; __action.value='filterColumn';"><img src="res/img/funnel.jpg" alt="enable filter" /></button>
+                </div></td>
                 <#assign i = 0>
                 <#list screen.featureList as fl>
                         <#if screen.featureVisibilityList[i] == 1>
                                 <td><div align="center">
-                                        <select name="operator">
+                                        <select name="operator${i}">
                                                 <option value="=">=</option>
+                                                <option value="<">&lt;</option>
+                                                <option value="<=">&lt;=</option>
+                                                <option value=">">&gt;</option>
+                                                <option value=">=">&gt;=</option>
                                         </select>
                                         &nbsp;
                                         <input type="text" name="filtertext${i}" />
                                         &nbsp;
-                                        <button type="submit" onclick="ColumnInQuestion.value='${i}'; __action.value='filterColumn';"><img src="res/img/funnel.jpg" alt="funnel" /></button>
+                                        <button type="submit" onclick="ColumnInQuestion.value='${i}'; __action.value='filterColumn';"><img src="res/img/funnel.jpg" alt="enable filter" /></button>
                                 </div></td>
                         </#if>
@@ -97 +115 @@
         </table>
 </div>
+
 <div>
         <select name="feature" id="feature" class="selectbox">

molgenis4animaldb/handwritten/java/plugin/listplugin/ListPlugin.java

@@ -33 +33 @@
         private List<Integer> animalVisibilityList = new ArrayList<Integer>();;
         private ArrayList<ArrayList<String>> valueMatrix = new ArrayList<ArrayList<String>>();
+        private ArrayList<ArrayList<Integer>> valueVisibilityMatrix = new ArrayList<ArrayList<Integer>>();
         private boolean firstTime = true;
 
@@ -141 +142 @@
                 }
         }
+        
+        private void recalculateAnimalVisibilityList() {
+                for (int i = 0; i < animalList.size(); i++) {
+                        int vis = 1;
+                        ArrayList<Integer> tmpList = valueVisibilityMatrix.get(i);
+                        for (int j = 0; j < featureList.size() + 1; j++) {
+                                if (tmpList.get(j) == 0) {
+                                        vis = 0;
+                                }
+                        }
+                        animalVisibilityList.set(i, vis);
+                }
+        }
 
         public void handleRequest(Database db, Tuple request) {
@@ -158 +172 @@
                         if (action.equals("filterColumn")) {
                                 int selectedFeatureId = request.getInt("ColumnInQuestion");
-                                //String operator = request.getString("operator");
+                                String operatorsymbol = request.getString("operator" + selectedFeatureId);
                                 String filtertext = request.getString("filtertext" + selectedFeatureId);
+                                if (filtertext == null) {
+                                        filtertext = "";
+                                }
                                 for (int i = 0; i < animalList.size(); i++) {
-                                        String currentValue = valueMatrix.get(i).get(selectedFeatureId);
-                                        if (!currentValue.equals(filtertext)) { // TO DO: allow other operators!
-                                                animalVisibilityList.set(i, 0);
+                                        String currentValue;
+                                        if (selectedFeatureId == -1) {
+                                                currentValue = animalList.get(i).getName();
+                                        } else {
+                                                currentValue = valueMatrix.get(i).get(selectedFeatureId);
                                         }
-                                }
+                                        if (operatorsymbol.equals("=")) {
+                                                if (!currentValue.equals(filtertext)) {
+                                                        valueVisibilityMatrix.get(i).set(selectedFeatureId + 1, 0);
+                                                }
+                                        } else {
+                                                int currVal = Integer.parseInt(currentValue);
+                                                int filterVal = Integer.parseInt(filtertext);
+                                                if ((operatorsymbol.equals("<") && currVal >= filterVal) ||
+                                                        (operatorsymbol.equals("<=") && currVal > filterVal) ||
+                                                        (operatorsymbol.equals(">") && currVal <= filterVal) ||
+                                                        (operatorsymbol.equals(">=") && currVal < filterVal)
+                                                ) {
+                                                        valueVisibilityMatrix.get(i).set(selectedFeatureId + 1, 0);
+                                                }
+                                        }
+                                }
+                                recalculateAnimalVisibilityList();
                         }
                         
                         if (action.equals("noFilterColumn")) {
-                                //int selectedFeatureId = request.getInt("ColumnInQuestion");
-                                // TO DO: remove only rows filtered out by filter on this column
+                                int selectedFeatureId = request.getInt("ColumnInQuestion");
                                 for (int i = 0; i < animalList.size(); i++) {
-                                        animalVisibilityList.set(i, 1);
-                                }
+                                        valueVisibilityMatrix.get(i).set(selectedFeatureId + 1, 1);
+                                }
+                                recalculateAnimalVisibilityList();
                         }
                         
@@ -214 +249 @@
                                 e.printStackTrace();
                         }
-                        
-                        // Initialize animal visibility list
-                        animalVisibilityList.clear();
-                        for (int i = 0; i < animalList.size(); i++) {
-                                animalVisibilityList.add(1);
-                        }
         
                         // Populate feature list
@@ -229 +258 @@
                         }
                         
+                        // Initialize animal visibility list
+                        animalVisibilityList.clear();
+                        for (int i = 0; i < animalList.size(); i++) {
+                                animalVisibilityList.add(1);
+                        }
+                        
+                        // Clean value visibility matrix
+                        valueVisibilityMatrix.clear();
+                        for (int i = 0; i < animalList.size(); i++) {
+                                ArrayList<Integer> lineToAdd = new ArrayList<Integer>();
+                                for (int j = 0; j < featureList.size() + 1; j++) {
+                                        lineToAdd.add(1);
+                                }
+                                valueVisibilityMatrix.add(lineToAdd);
+                        }
+                        
                         // Clean feature visibility list
                         featureVisibilityList.clear();