Changeset 2636

Timestamp:

02/10/10 16:44:25 (2 years ago)

Author:

erikroos

Message:

• Made a proper layout for the Event apply form
• Added a rudimentary Event matrix

Location:

molgenis4animaldb

Files:

• WebContent/WEB-INF/web.xml (modified) (1 diff)
• WebContent/res/css/animaldb.css (added)
• WebContent/res/scripts/custom/viewevents.js (added)
• handwritten/java/plugin/addevent/AddEventPlugin.ftl (modified) (4 diffs)
• handwritten/java/plugin/addevent/AddEventPlugin.java (modified) (4 diffs)
• handwritten/java/plugin/eventviewer (added)
• handwritten/java/plugin/eventviewer/EventViewerPlugin.ftl (added)
• handwritten/java/plugin/eventviewer/EventViewerPlugin.java (added)
• handwritten/java/servlets/AddEventMenuServlet.java (modified) (1 diff)
• handwritten/java/servlets/ViewEventsServlet.java (added)
• molgenis4animal_ui.xml (modified) (1 diff)

molgenis4animaldb/WebContent/WEB-INF/web.xml

@@ -65 +65 @@
         </servlet-mapping>
         
+        <servlet>
+                <servlet-name>ViewEventsServlet</servlet-name>
+                <servlet-class>servlets.ViewEventsServlet</servlet-class>
+        </servlet>
+        <servlet-mapping>
+                <servlet-name>ViewEventsServlet</servlet-name>
+                <url-pattern>/ViewEventsServlet</url-pattern>
+        </servlet-mapping>
+        
 </web-app>

molgenis4animaldb/handwritten/java/plugin/addevent/AddEventPlugin.ftl

@@ -26 +26 @@
 <#--begin your plugin-->        
 
-<div id="screentitle">
-<strong>Add event...</strong>
-</div>
+<div id="addeventform">
 
-<div id="animalselect">
-Animal:
-<select name="animal">
+<div id="animalselect" class="row">
+<label for="animal">Animal:</label>
+<select name="animal" id="animal" class="selectbox">
         <option value="0">&nbsp;</option>
         <#list screen.animalList as al>
@@ -40 +38 @@
 </div>
 
-<div id="actorselect">
-Actor:
-<select name="actor">
+<div id="actorselect" class="row">
+<label for="actor">Actor:</label>
+<select name="actor" id="actor" class="selectbox">
         <option value="0">&nbsp;</option>
         <#list screen.actorList as actl>
@@ -50 +48 @@
 </div>
 
-<div id="eventtypeselect">
-Type:
-<select name="eventtype" onchange="getRestOfEventMenu(this);">
+<div id="eventtypeselect" class="row">
+<label for="eventtype">Type:</label>
+<select name="eventtype" id="eventtype" class="selectbox" onchange="getRestOfEventMenu(this);">
         <option value="0">&nbsp;</option>
         <#list screen.eventTypeList as et>
@@ -62 +60 @@
 <div id="featurevalues">
 <!-- This box is filled dynamically by the AddEventMenuServlet (Ajax-style) -->
+</div>
+
 </div>
 

molgenis4animaldb/handwritten/java/plugin/addevent/AddEventPlugin.java

@@ -12 +12 @@
 import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.Date;
 import java.util.List;
+import java.util.Locale;
 
 import org.molgenis.framework.db.Database;
@@ -51 +53 @@
     {
         return "<script src=\"res/scripts/custom/addingajax.js\" language=\"javascript\"></script>\n" +
-                   "<script src=\"res/scripts/custom/addevent.js\" language=\"javascript\"></script>";
+                   "<script src=\"res/scripts/custom/addevent.js\" language=\"javascript\"></script>\n" +
+                   "<link rel=\"stylesheet\" style=\"text/css\" href=\"res/css/animaldb.css\">";
     }
         
@@ -124 +127 @@
                                 // First, make the event
                                 Event tmpEvent = new Event();
+                                SimpleDateFormat sdf = new SimpleDateFormat("MMMM d, yyyy, HH:mm:ss", Locale.US);
                                 Calendar calendar = Calendar.getInstance();
-                                java.util.Date now = calendar.getTime();
+                                Date now = calendar.getTime();
                                 tmpEvent.setTimereported(now);
                                 tmpEvent.setEventtypeid(request.getInt("eventtype"));
                                 tmpEvent.setName("event"+now);
-                                tmpEvent.setActorid(2); // TO DO, get from Actor field
+                                tmpEvent.setActorid(request.getInt("actor"));
                                 if (db.add(tmpEvent) > 0) {
-                                        // Find our event back so we can link the values to it
+                                        // Find back our event so we can link the values to it
                                         Query q = db.query(Event.class);
                                         q.addRules(new QueryRule("name", Operator.EQUALS, "event"+now));
@@ -142 +146 @@
                                         while (request.getString("value"+valueNr) != null) {
                                                 Value tmpValue = new Value();
+                                                String tmpDatetime = request.getString("datetime"+valueNr);
+                                                Date tmpDate = sdf.parse(tmpDatetime);
+                                                tmpValue.setTime(tmpDate);
                                                 tmpValue.setEventid(currentEvent.getId());
                                                 tmpValue.setName("value"+valueNr+now);

molgenis4animaldb/handwritten/java/servlets/AddEventMenuServlet.java

@@ -48 +48 @@
                                     idList.add(ef.getFeatures());
                                 }
-                                List<Feature> correspondingFeatures = db.find(Feature.class, new QueryRule("id", Operator.IN, idList));
-                                
-                                Iterator<Feature> correspondingFeatureIterator = correspondingFeatures.iterator();
-                                int valueNr = 0;
-                                while (correspondingFeatureIterator.hasNext()) {
-                                        Feature currentFeature = correspondingFeatureIterator.next();
-                                        out.print("<div id='featurevalue_part'>");
-                                        out.print(currentFeature.getName());
-                                        out.print(" value: <input type='text' name='value"+valueNr+"' />");
-                                        out.print(" (unit: "+currentFeature.getUnitLabel()+")");
-                                        out.print("<input type='hidden' name='feature"+valueNr+"' value='"+currentFeature.getId()+"' />");
-                                        out.print("</div>");
-                                        valueNr++;
+                                if (!idList.isEmpty()) {
+                                        List<Feature> correspondingFeatures = db.find(Feature.class, new QueryRule("id", Operator.IN, idList));
+                                        
+                                        Iterator<Feature> correspondingFeatureIterator = correspondingFeatures.iterator();
+                                        int valueNr = 0;
+                                        while (correspondingFeatureIterator.hasNext()) {
+                                                Feature currentFeature = correspondingFeatureIterator.next();
+                                                out.print("<div id='featurevalue_part' class='row'>");
+                                                out.print("<label for='value"+valueNr+"'>"+currentFeature.getName()+" value: </label>");
+                                                out.print("<input type='text' class='textbox' name='value"+valueNr+"' id='value"+valueNr+"' />");
+                                                out.print("<em>(unit: "+currentFeature.getUnitLabel()+")</em>");
+                                                out.print("<input type='hidden' name='feature"+valueNr+"' value='"+currentFeature.getId()+"' />");
+                                                out.print("</div>");
+                                                out.print("<div id='datetimevalue_part' class='row'>");
+                                                out.print("<label for='datetime"+valueNr+"'>"+currentFeature.getName()+" date and time: </label>");
+                                                out.print("<input type='text' class='textbox' id='datetime"+valueNr+"' name='datetime"+valueNr+"' value='' onclick='showDateInput(this,true)' autocomplete='off' />");
+                                                out.print("</div>");
+                                                
+                                                valueNr++;
+                                        }
                                 }
-                                
-                                out.print("<div id='buttons_part'><input type='submit' value='Add' onclick=\"__action.value='addEvent'\" /></div>");
+                                out.print("<div id='buttons_part' class='row'><input type='submit' class='addbutton' value='Apply' onclick=\"__action.value='addEvent'\" /></div>");
                         }
                         

molgenis4animaldb/molgenis4animal_ui.xml

@@ -24 +24 @@
                         label="Apply event" />
                 
+                <plugin name="EventViewer" type="plugin.eventviewer.EventViewerPlugin"
+                        label="View events" />
+                
         </menu>