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 103 additions and 2 deletions
code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/VotingBeanLocal.java
package fi.insomnia.bortal.beans; package fi.insomnia.bortal.beans;
import java.util.List;
import javax.ejb.Local; import javax.ejb.Local;
import fi.insomnia.bortal.model.Compo; import fi.insomnia.bortal.model.Compo;
...@@ -10,4 +12,5 @@ import fi.insomnia.bortal.model.CompoEntryFile; ...@@ -10,4 +12,5 @@ import fi.insomnia.bortal.model.CompoEntryFile;
public interface VotingBeanLocal { public interface VotingBeanLocal {
public void createCompo(Compo c); public void createCompo(Compo c);
public void addEntry(CompoEntry compoEntry, CompoEntryFile compoEntryFile); public void addEntry(CompoEntry compoEntry, CompoEntryFile compoEntryFile);
public List<Compo> getCompoList();
} }
code/LanBortalWeb/WebContent/WEB-INF/faces-config.xml
...@@ -117,6 +117,15 @@ ...@@ -117,6 +117,15 @@
<redirect /> <redirect />
</navigation-case> </navigation-case>
</navigation-rule> </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> </faces-config>
......
code/LanBortalWeb/WebContent/voting/compolist.xhtml
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<h:body> <h:body>
<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml"> <ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
<f:metadata> <f:metadata>
<!-- f:event type="preRenderView" listener="#{newsListView.initView}" /--> <!-- <f:event type="preRenderView" listener="#{votingCompoListView.initView}" /> -->
</f:metadata> </f:metadata>
<ui:define name="content"> <ui:define name="content">
<!-- <h:outputStylesheet library="style" name="insomnia2/css/actionlog.css" /> --> <!-- <h:outputStylesheet library="style" name="insomnia2/css/actionlog.css" /> -->
...@@ -18,6 +18,79 @@ ...@@ -18,6 +18,79 @@
<div class="clearfix"></div> <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:define>
</ui:composition> </ui:composition>
......
code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/voting/VotingCompoListView.java
package fi.insomnia.bortal.web.cdiview.voting; 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.faces.bean.RequestScoped;
import javax.inject.Named; import javax.inject.Named;
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
@Named @Named
@RequestScoped @RequestScoped
public class VotingCompoListView extends GenericCDIView { public class VotingCompoListView extends GenericCDIView {
...@@ -14,4 +22,12 @@ public class VotingCompoListView extends GenericCDIView { ...@@ -14,4 +22,12 @@ public class VotingCompoListView extends GenericCDIView {
*/ */
private static final long serialVersionUID = 4166316634472472472L; 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 { ...@@ -128,7 +128,7 @@ public class VotingCreateView extends GenericCDIView {
se.setTime(submitEnd); se.setTime(submitEnd);
co.setSubmitEnd(se); co.setSubmitEnd(se);
votbean.createCompo(co); 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!