Skip to content

Max Mecklin / Moya

Go to a project
Commit dceb91a2 by Antti Tonkyra
Options

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

Conflicts:
	code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/VotingBeanLocal.java
2 parents bc2924ff eda91b75
Inline Side-by-side
Showing with 144 additions and 42 deletions
code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/VotingBeanLocal.java
package fi.insomnia.bortal.beans;
import java.util.List;
import javax.ejb.Local;
import fi.insomnia.bortal.model.Compo;
......@@ -10,4 +12,5 @@ import fi.insomnia.bortal.model.CompoEntryFile;
public interface VotingBeanLocal {
public void createCompo(Compo c);
public void addEntry(CompoEntry compoEntry, CompoEntryFile compoEntryFile);
public List<Compo> getCompoList();
}
code/LanBortalWeb/WebContent/WEB-INF/faces-config.xml
......@@ -117,6 +117,15 @@
<redirect />
</navigation-case>
</navigation-rule>
<navigation-rule>
<display-name>voting/create</display-name>
<from-view-id>/voting/create.xhtml</from-view-id>
<navigation-case>
<from-outcome>success</from-outcome>
<to-view-id>/voting/compolist.xhtml</to-view-id>
<redirect />
</navigation-case>
</navigation-rule>
</faces-config>
......
code/LanBortalWeb/WebContent/voting/compolist.xhtml
<!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:h="http://java.sun.com/jsf/html" xmlns:users="http://java.sun.com/jsf/composite/cditools/user"
xmlns:tools="http://java.sun.com/jsf/composite/cditools" xmlns:f="http://java.sun.com/jsf/core"
xmlns:p="http://primefaces.org/ui">
<h:body>
<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
<f:metadata>
<!-- f:event type="preRenderView" listener="#{newsListView.initView}" /-->
</f:metadata>
<ui:define name="content">
<!-- <h:outputStylesheet library="style" name="insomnia2/css/actionlog.css" /> -->
<h1>#{i18n['voting.allcompos.header']}</h1>
<p>#{i18n['voting.allcompos.description']}</p>
<div class="clearfix"></div>
</ui:define>
</ui:composition>
</h:body>
<!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:h="http://java.sun.com/jsf/html" xmlns:users="http://java.sun.com/jsf/composite/cditools/user"
xmlns:tools="http://java.sun.com/jsf/composite/cditools" xmlns:f="http://java.sun.com/jsf/core"
xmlns:p="http://primefaces.org/ui">
<h:body>
<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
<f:metadata>
<!-- <f:event type="preRenderView" listener="#{votingCompoListView.initView}" /> -->
</f:metadata>
<ui:define name="content">
<!-- <h:outputStylesheet library="style" name="insomnia2/css/actionlog.css" /> -->
<h1>#{i18n['voting.allcompos.header']}</h1>
<p>#{i18n['voting.allcompos.description']}</p>
<div class="clearfix"></div>
<div id="compolist">
<h:dataTable styleClass="bordertable" rowClasses="roweven,rowodd" id="compolisttable" value="#{votingCompoListView.compos}" var="compo">
<h:column>
<f:facet name="header">
<h:outputText value="Name" />
</f:facet>
<h:outputText value="#{compo.name}" />
</h:column>
<h:column>
<f:facet name="header">
<h:outputText value="Kuvaus" />
</f:facet>
<h:outputText value="#{compo.description}" />
</h:column>
<h:column>
<f:facet name="header" >
<h:outputText value="Max parts" />
</f:facet>
<h:outputText value="#{compo.maxParticipantCount}" />
</h:column>
<h:column>
<f:facet name="header">
<h:outputText value="Start time" />
</f:facet>
<h:outputText value="#{compo.startTime.time}" >
<f:convertDateTime type="both" pattern="dd.MM.yyyy HH:mm" />
</h:outputText>
</h:column>
<h:column>
<f:facet name="header" >
<h:outputText value="End time" />
</f:facet>
<h:outputText value="#{compo.endTime.time}" >
<f:convertDateTime type="both" pattern="dd.MM.yyyy HH:mm" />
</h:outputText>
</h:column>
<h:column>
<f:facet name="header" >
<h:outputText value="Vote start" />
</f:facet>
<h:outputText value="#{compo.voteStart.time}" >
<f:convertDateTime type="both" pattern="dd.MM.yyyy HH:mm" />
</h:outputText>
</h:column>
<h:column>
<f:facet name="header" >
<h:outputText value="Vote end" />
</f:facet>
<h:outputText value="#{compo.voteEnd.time}" >
<f:convertDateTime type="both" pattern="dd.MM.yyyy HH:mm" />
</h:outputText>
</h:column>
<h:column>
<f:facet name="header">
<h:outputText value="Submit start" />
</f:facet>
<h:outputText value="#{compo.submitStart.time}" >
<f:convertDateTime type="both" pattern="dd.MM.yyyy HH:mm" />
</h:outputText>
</h:column>
<h:column>
<f:facet name="header">
<h:outputText value="Submit end" />
</f:facet>
<h:outputText value="#{compo.submitEnd.time}" >
<f:convertDateTime type="both" pattern="dd.MM.yyyy HH:mm" />
</h:outputText>
</h:column>
</h:dataTable>
</div>
</ui:define>
</ui:composition>
</h:body>
</html>
\ No newline at end of file
code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/voting/VotingCompoListView.java
package fi.insomnia.bortal.web.cdiview.voting;
import javax.faces.bean.RequestScoped;
import javax.inject.Named;
import fi.insomnia.bortal.web.cdiview.GenericCDIView;
@Named
@RequestScoped
public class VotingCompoListView extends GenericCDIView {
/**
*
*/
private static final long serialVersionUID = 4166316634472472472L;
}
package fi.insomnia.bortal.web.cdiview.voting;
import java.util.List;
import javax.ejb.EJB;
import javax.faces.bean.ManagedBean;
import javax.faces.bean.RequestScoped;
import javax.inject.Named;
import fi.insomnia.bortal.beans.VotingBeanLocal;
import fi.insomnia.bortal.model.Compo;
import fi.insomnia.bortal.web.cdiview.GenericCDIView;
@ManagedBean
@Named
@RequestScoped
public class VotingCompoListView extends GenericCDIView {
/**
*
*/
private static final long serialVersionUID = 4166316634472472472L;
@EJB
private VotingBeanLocal votbean;
public List<Compo> getCompos() {
return votbean.getCompoList();
}
}
code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/voting/VotingCreateView.java
......@@ -128,7 +128,7 @@ public class VotingCreateView extends GenericCDIView {
se.setTime(submitEnd);
co.setSubmitEnd(se);
votbean.createCompo(co);
return "success.";
return "success";
}
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!