Changeset 2657

Timestamp:

02/25/10 14:05:07 (2 years ago)

Author:

erikroos

Message:

In Apply Event and View Lists plugins, now showing the corresponding targets' names for values that are in fact links to the target table.

Location:

molgenis4animaldb/handwritten/java

Files:

• plugin/listplugin/ListPlugin.ftl (modified) (2 diffs)
• plugin/listplugin/ListPlugin.java (modified) (2 diffs)
• servlets/AddEventMenuServlet.java (modified) (2 diffs)

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

@@ -27 +27 @@
 
 <div style="float:left">
+        <input type="hidden" name="ColumnToRemove" />
         <table class='listtable'>
         <tr>
@@ -56 +57 @@
                 <#assign i = i + 1>
         </#list>
+        <tr>
+                <td></td>
+                <#assign i = 0>
+                <#list screen.featureList as fl>
+                        <#if screen.featureVisibilityList[i] == 1>
+                                <td><div align="center">
+                                        <input type="submit" value="-" class="minusbutton" onclick="ColumnToRemove.value='${i}'; __action.value='remColumn';" />
+                                </div></td>
+                        </#if>
+                        <#assign i = i + 1>
+                </#list>
+        </tr>
         </table>
 </div>

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

@@ -104 +104 @@
                                 valueToAdd = "";
                                 try {
-                                        Value tmpValue = (Value) q.find().get(0);
-                                        valueToAdd = tmpValue.getValuestring();
+                                        Value currentValue = (Value) q.find().get(0);
+                                        // Get the real value:
+                                        valueToAdd = currentValue.getValuestring();
+                                        // Find out what the unit is:
+                                        int unitId = currentFeature.getUnit();
+                                        // Check in Ontology if it is a DatabaseLink:
+                                        List<Ontology> ontList = db
+                                                        .find(Ontology.class, new QueryRule("id",
+                                                                        Operator.EQUALS, unitId));
+                                        Ontology currentOntTerm = ontList.get(0);
+                                        String termType = currentOntTerm.getTermtype();
+                                        // If so, find the corresponding target:
+                                        if (termType.equals("DatabaseLink")) {
+                                                int targetId = Integer
+                                                                .parseInt(valueToAdd);
+                                                List<Target> targetList = db.find(Target.class,
+                                                                new QueryRule("id", Operator.EQUALS,
+                                                                                targetId));
+                                                Target currentTarget = targetList.get(0);
+                                                valueToAdd = currentTarget.getName();
+                                        }
                                 } catch (Exception e) {
                                         e.printStackTrace();
@@ -122 +141 @@
                                 int selectedFeatureId = request.getInt("feature");
                                 featureVisibilityList.set(selectedFeatureId, 1);
+                        }
+                        
+                        if (action.equals("remColumn")) {
+                                int selectedFeatureId = request.getInt("ColumnToRemove");
+                                featureVisibilityList.set(selectedFeatureId, 0);
                         }
                         

molgenis4animaldb/handwritten/java/servlets/AddEventMenuServlet.java

@@ -22 +22 @@
 import animaldb.EventType_features;
 import animaldb.Feature;
+import animaldb.Ontology;
+import animaldb.Target;
 
 public class AddEventMenuServlet extends app.servlet.MolgenisServlet
@@ -61 +63 @@
                                                         dummyValue = " value='Dummy'";
                                                 }
+                                                boolean DbLink = false;
+                                                List<Target> targetList = new ArrayList<Target>();
+                                                // Find out what the unit is:
+                                                int unitId = currentFeature.getUnit();
+                                                // Check in Ontology if it is a DatabaseLink:
+                                                List<Ontology> ontList = db.find(Ontology.class, new QueryRule("id", Operator.EQUALS, unitId));
+                                                Ontology currentOntTerm = ontList.get(0);
+                                                String termType = currentOntTerm.getTermtype();
+                                                // If so, find the corresponding target:
+                                                if (termType.equals("DatabaseLink")) {
+                                                        DbLink = true;
+                                                        String tmpString = currentOntTerm.getName();
+                                                        String metaType = tmpString.substring(0, tmpString.length() - 4); // Remove Link-part; TO DO: solve in a nicer way!
+                                                        List<Ontology> ontList2 = db.find(Ontology.class, new QueryRule("name", Operator.EQUALS, metaType));
+                                                        Ontology metaOntTerm = ontList2.get(0);
+                                                        targetList = db.find(Target.class, new QueryRule("targettype", Operator.EQUALS, metaOntTerm.getId()));
+                                                }
+                                                
                                                 out.print("<div id='featurevalue_part' class='row'" + hideDiv + ">");
                                                 out.print("<label for='value"+valueNr+"'>"+currentFeature.getName()+" value: </label>");
-                                                out.print("<input type='text' class='textbox' name='value" + valueNr + "' id='value" + valueNr + "' " + dummyValue + "/>");
+                                                if (DbLink) {
+                                                        out.print("<select name='value" + valueNr + "' id='value" + valueNr + "'>");
+                                                        for (Target t : targetList) {
+                                                                out.print("<option value='" + t.getId() + "'>" + t.getName() + "</option>");
+                                                        }
+                                                        out.print("</select>");
+                                                } else {
+                                                        out.print("<input type='text' class='textbox' name='value" + valueNr + "' id='value" + valueNr + "' " + dummyValue + "/>");
+                                                }
                                                 out.print("<em>(unit: "+currentFeature.getUnitLabel()+")</em>");
                                                 out.print("<input type='hidden' name='feature"+valueNr+"' value='"+currentFeature.getId()+"' />");