Changeset 2421

Timestamp:

11/06/09 14:48:47 (2 years ago)

Author:

erikroos

Message:

Added plugin for adding events

Location:

molgenis4animaldb

Files:

• handwritten/java/plugin/eventman (added)
• handwritten/java/plugin/eventman/ManageEventsPlugin.ftl (added)
• handwritten/java/plugin/eventman/ManageEventsPlugin.java (added)
• handwritten/java/plugin/reports/MakeReportPlugin.ftl (modified) (1 diff)
• handwritten/java/plugin/reports/MakeReportPlugin.java (modified) (4 diffs)
• molgenis4animal_ui.xml (modified) (1 diff)

molgenis4animaldb/handwritten/java/plugin/reports/MakeReportPlugin.ftl

@@ -59 +59 @@
 <input type="text" size=10 name="fromdate" value="<#if screen.fromdate?exists>${screen.getFromdateAsString()}</#if>" />
 </tr><tr>
+<td>Ending on:</td>
+<td>
+<input type="text" size=10 name="todate" value="<#if screen.todate?exists>${screen.getTodateAsString()}</#if>" />
+</tr><tr>
 <td colspan=2>
 <input type="submit" value="Generate report" onclick="__action.value='generateReport'" />

molgenis4animaldb/handwritten/java/plugin/reports/MakeReportPlugin.java

@@ -38 +38 @@
         private int selectedEventType;
         private Date fromdate;
+        private Date todate;
+        private SimpleDateFormat mySimpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
 
         public List<Location> getLocationList() {
@@ -80 +82 @@
         
         public String getFromdateAsString() {
-                SimpleDateFormat tmpSimpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
-                return tmpSimpleDateFormat.format(fromdate);
+                return mySimpleDateFormat.format(fromdate);
+        }
+        
+        public void setTodate(Date fromdate) {
+                this.todate = fromdate;
+        }
+
+        public Date getTodate() {
+                return todate;
+        }
+        
+        public String getTodateAsString() {
+                
+                return mySimpleDateFormat.format(todate);
         }
 
@@ -123 +137 @@
                                 String typename = "";
                                 String fromdatename = "";
+                                String todatename = "";
 
                                 this.setSelectedLocation(request.getInt("location"));
                                 this.setSelectedEventType(request.getInt("eventtype"));
                                 this.setFromdate(request.getDate("fromdate"));
+                                this.setTodate(request.getDate("todate"));
 
                                 // manier 1
@@ -177 +193 @@
                                                         + this.getFromdate().toString();
                                 }
+                                
+                                if (this.getTodate() != null) {
+                                        q.addRules(new QueryRule("date", Operator.LESS_EQUAL,
+                                                        this.getTodate()));
+                                        todatename = ", ending "
+                                                        + this.getTodate().toString();
+                                }
 
                                 this.setEventList(q.find());
                                 this.report = "Reporting events" + locname + typename
-                                                + fromdatename;
+                                                + fromdatename + todatename;
 
                         }

molgenis4animaldb/molgenis4animal_ui.xml

@@ -20 +20 @@
                 </menu>
                 
-                <form name="Event" entity="Event" view="list" label="Manage events" />
+                <plugin name="ManageEvents" type="plugin.eventman.ManageEventsPlugin"
+                        label="Manage events" />
                 
                 <plugin name="MakeReport" type="plugin.reports.MakeReportPlugin"