Changeset 2653 for molgenis4animaldb

Timestamp:

02/22/10 13:37:27 (2 years ago)

Author:

erikroos

Message:

Modified way events are shown in the event viewer plugin

File:

• molgenis4animaldb/handwritten/java/servlets/ViewEventsServlet.java (modified) (3 diffs)

molgenis4animaldb/handwritten/java/servlets/ViewEventsServlet.java

@@ -19 +19 @@
 import org.molgenis.util.Tuple;
 
+import animaldb.Event;
 import animaldb.EventType;
 import animaldb.EventType_features;
 import animaldb.Feature;
+import animaldb.Ontology;
+import animaldb.Target;
 import animaldb.Value;
 
@@ -49 +52 @@
                                 if (!valList.isEmpty()) {
                                         Iterator<Value> valIterator = valList.iterator();
-                                        int valueNr = 0;
                                         out.print("<table class='listtable'>");
-                                        out.print("<tr>");
+                                        out.print("<tr class='form_listrow1'>");
+                                        // Print headers
+                                        while (valIterator.hasNext()) {
+                                                // Get the corresponding event (type):
+                                                Value currentValue = valIterator.next();
+                                                int eventId = currentValue.getEventid();
+                                                List<Event> eventList = db.find(Event.class, new QueryRule("id", Operator.EQUALS, eventId));
+                                                Event currentEvent = eventList.get(0);
+                                                
+                                                out.print("<td>" + currentEvent.getEventtypeidLabel() + " on " +
+                                                                currentValue.getTime().toString() + "</td>");
+                                        }
+                                        out.print("</tr>");
+                                        
+                                        out.print("<tr class='form_listrow0'>");
+                                        valIterator = valList.iterator();
                                         while (valIterator.hasNext()) {
                                                 Value currentValue = valIterator.next();
-                                                out.print("<th><label class='tableheader'>" + currentValue.getFeatureidLabel() + "</label></th>");
+                                                out.print("<td>" + currentValue.getFeatureidLabel() + ":</td>");
                                         }
                                         out.print("</tr>");
@@ -60 +77 @@
                                         out.print("<tr class='form_listrow1'>");
                                         valIterator = valList.iterator();
+                                        // Print contents
                                         while (valIterator.hasNext()) {
                                                 Value currentValue = valIterator.next();
-                                                out.print("<td>" + currentValue.getValuestring() + "</td>");
+                                                
+                                                // Get the real value:
+                                                String currentValueContents = currentValue.getValuestring();
+                                                // Find out what the unit is:
+                                                int featureId = currentValue.getFeatureid();
+                                                List<Feature> featList = db.find(Feature.class, new QueryRule("id", Operator.EQUALS, featureId));
+                                                Feature currentFeature = featList.get(0);
+                                                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(currentValueContents);
+                                                        List<Target> targetList = db.find(Target.class, new QueryRule("id", Operator.EQUALS, targetId));
+                                                        Target currentTarget = targetList.get(0);
+                                                        currentValueContents = currentTarget.getName();
+                                                }
+                                                
+                                                out.print("<td>" + currentValueContents + "</td>");
                                         }
                                         out.print("</tr>");