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

code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/VotingBeanLocal.java

@@ -2,7 +2,9 @@ package fi.insomnia.bortal.beans;
 
 
 import javax.ejb.Local;
 import javax.ejb.Local;
 
 
+import fi.insomnia.bortal.model.Compo;
+
 @Local
 @Local
 public interface VotingBeanLocal {
 public interface VotingBeanLocal {
-
+	public void createCompo(Compo c);
 }
 }

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

@@ -51,7 +51,7 @@ public class Compo extends GenericEntity {
     @Temporal(TemporalType.TIMESTAMP)
     @Temporal(TemporalType.TIMESTAMP)
     private Calendar startTime;
     private Calendar startTime;
     
     
-    @Column(name = "compo_start")
+    @Column(name = "compo_end")
     @Temporal(TemporalType.TIMESTAMP)
     @Temporal(TemporalType.TIMESTAMP)
     private Calendar endTime;
     private Calendar endTime;
 
 

code/LanBortalWeb/WebContent/voting/create.xhtml

@@ -55,7 +55,7 @@
 				<p:calendar validator="#{votingDateValidator.validateSubmit}" value="#{votingCreateView.submitEnd}" pattern="dd/MM/yyyy HH:mm" id="sEnd" />
 				<p:calendar validator="#{votingDateValidator.validateSubmit}" value="#{votingCreateView.submitEnd}" pattern="dd/MM/yyyy HH:mm" id="sEnd" />
 				<h:message for="sEnd" />
 				<h:message for="sEnd" />
 				
 				
-				<h:commandButton value="#{i18n['voting.create.createButton']}" />
+				<h:commandButton action="#{votingCreateView.send}" value="#{i18n['voting.create.createButton']}" />
 			</h:panelGrid>
 			</h:panelGrid>
 			</h:form>
 			</h:form>
 			
 			

code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/voting/VotingCreateView.java

 package fi.insomnia.bortal.web.cdiview.voting;
 package fi.insomnia.bortal.web.cdiview.voting;
 
 
+import java.util.Calendar;
 import java.util.Date;
 import java.util.Date;
 
 
 import javax.ejb.EJB;
 import javax.ejb.EJB;
+import javax.enterprise.context.ConversationScoped;
+import javax.enterprise.context.RequestScoped;
 import javax.faces.bean.ManagedBean;
 import javax.faces.bean.ManagedBean;
-import javax.faces.bean.RequestScoped;
 import javax.inject.Named;
 import javax.inject.Named;
 import javax.validation.constraints.Min;
 import javax.validation.constraints.Min;
 import javax.validation.constraints.Size;
 import javax.validation.constraints.Size;
@@ -12,6 +14,7 @@ import javax.validation.constraints.Size;
 import org.hibernate.validator.constraints.Length;
 import org.hibernate.validator.constraints.Length;
 
 
 import fi.insomnia.bortal.beans.VotingBeanLocal;
 import fi.insomnia.bortal.beans.VotingBeanLocal;
+import fi.insomnia.bortal.model.Compo;
 import fi.insomnia.bortal.web.cdiview.GenericCDIView;
 import fi.insomnia.bortal.web.cdiview.GenericCDIView;
 
 
 @ManagedBean
 @ManagedBean
@@ -32,8 +35,8 @@ public class VotingCreateView extends GenericCDIView {
 	private String description;
 	private String description;
 	@Min(value=1, message="{voting.create.participantsError}")
 	@Min(value=1, message="{voting.create.participantsError}")
 	private Integer maxParticipants;
 	private Integer maxParticipants;
-	private Date compoStart;
 	
 	
+	private Date compoStart;
 	private Date compoEnd;
 	private Date compoEnd;
 	private Date voteStart;
 	private Date voteStart;
 	private Date voteEnd;
 	private Date voteEnd;
@@ -95,5 +98,38 @@ public class VotingCreateView extends GenericCDIView {
 		this.submitEnd = submitEnd;
 		this.submitEnd = submitEnd;
 	}
 	}
 	
 	
+	public String send(){
+		Compo co = new Compo();
+		co.setName(name);
+		co.setDescription(description);
+		co.setMaxParticipantCount(maxParticipants);
+		
+		Calendar ct = Calendar.getInstance();
+		ct.setTime(compoStart);
+		co.setStartTime(ct);
+		
+		Calendar ce = Calendar.getInstance();
+		ce.setTime(compoEnd);
+		co.setEndTime(ce);
+		
+		Calendar vs = Calendar.getInstance();
+		vs.setTime(voteStart);
+		co.setVoteStart(vs);
+		
+		Calendar ve = Calendar.getInstance();
+		ve.setTime(voteEnd);
+		co.setVoteEnd(ve);
+		
+		Calendar ss = Calendar.getInstance();
+		ss.setTime(submitStart);
+		co.setSubmitStart(ss);
+		
+		Calendar se = Calendar.getInstance();
+		se.setTime(submitEnd);
+		co.setSubmitEnd(se);
+		votbean.createCompo(co);
+		return "success.";
+	}
+	
 
 
 }
 }