Merge branch 'master' of dev.intra.insomnia.fi:/data/bortal

code/LanBortalDatabase/src/fi/insomnia/bortal/model/Poll.java

@@ -6,6 +6,7 @@ import java.io.Serializable;
 import java.util.Calendar;
 import java.util.Calendar;
 import java.util.List;
 import java.util.List;
 
 
+import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
 import javax.persistence.FetchType;
 import javax.persistence.Lob;
 import javax.persistence.Lob;
@@ -27,11 +28,18 @@ public class Poll extends GenericEventChild implements Serializable {
     private static final long serialVersionUID = -5655775315722028984L;
     private static final long serialVersionUID = -5655775315722028984L;
 
 
     @Temporal(TIMESTAMP)
     @Temporal(TIMESTAMP)
+    @Column(name = "opening_time", nullable = false)
     private Calendar begin = Calendar.getInstance();
     private Calendar begin = Calendar.getInstance();
+
     @Temporal(TIMESTAMP)
     @Temporal(TIMESTAMP)
+    @Column(name = "closing_time", nullable = false)
     private Calendar end = Calendar.getInstance();
     private Calendar end = Calendar.getInstance();
+
+    @Column(name = "name", nullable = false)
     private String name;
     private String name;
+
     @Lob
     @Lob
+    @Column(name = "description", nullable = true)
     private String description;
     private String description;
 
 
     @OneToMany(mappedBy = "poll", fetch = FetchType.EAGER)
     @OneToMany(mappedBy = "poll", fetch = FetchType.EAGER)

code/LanBortalWeb/src/fi/insomnia/bortal/view/PollView.java

@@ -83,6 +83,8 @@ public class PollView extends GenericView {
 
 
         boolean ret = true;
         boolean ret = true;
 
 
+        // TODO: VALIDOI POLLIVASTAUKSET!
+
         return ret;
         return ret;
 
 
     }
     }