Skip to content

Riina Antikainen / Moya

Go to a project
Commit ad311f94 by Petri Jarvisalo
Options

Merge branch 'devel' of codecrew.fi:bortal into devel

2 parents 8514d4d0 155aceb3
Inline Side-by-side
Showing with 63 additions and 41 deletions
code/MoyaBeans/ejbModule/META-INF/ejb-jar.xml
<?xml version="1.0" encoding="UTF-8"?>
<ejb-jar xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:ejb="http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd" version="3.1">
<ejb-jar xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:ejb="http://java.sun.com/xml/ns/javaee" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd" version="3.1">
<display-name>MoyaBeans</display-name>
<ejb-client-jar>MoyaBeansClient.jar</ejb-client-jar>
</ejb-jar>
\ No newline at end of file
code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/TournamentBean.java 0 → 100644
package fi.codecrew.moya.beans;
import javax.ejb.LocalBean;
import javax.ejb.Stateless;
/**
* Session Bean implementation class TournamentBean
*/
@Stateless
@LocalBean
public class TournamentBean {
/**
* Default constructor.
*/
public TournamentBean() {
// TODO Auto-generated constructor stub
}
}
code/MoyaEar/EarContent/META-INF/application.xml
<?xml version="1.0" encoding="UTF-8"?>
<application xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://xmlns.jcp.org/xml/ns/javaee"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/application_7.xsd"
version="7">
<display-name>moya-ear</display-name>
<module>
<ejb>moya-beans-0.2.0.jar</ejb>
</module>
<module>
<web>
<web-uri>moya-web-0.2.0.war</web-uri>
<context-root>/MoyaWeb</context-root>
</web>
</module>
<library-directory>lib</library-directory>
<application xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://xmlns.jcp.org/xml/ns/javaee" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/application_7.xsd" version="7">
<display-name>moya-ear</display-name>
<module>
<ejb>moya-beans-0.2.0.jar</ejb>
</module>
<module>
<web>
<web-uri>moya-web-0.2.0.war</web-uri>
<context-root>/MoyaWeb</context-root>
</web>
</module>
<library-directory>lib</library-directory>
</application>
\ No newline at end of file
code/MoyaWeb/WebContent/tournaments/addTeam.xhtml
......@@ -29,7 +29,7 @@
<p:column style="width:25%">
[kuva]
</p:column>
</p:column>
<p:column style="width:75%;">
<p:inputText />
......
code/MoyaWeb/WebContent/tournaments/admin/createwizard.xhtml
......@@ -5,37 +5,37 @@
<h:body>
<ui:composition template="#{sessionHandler.template}">
<f:metadata>
<!-- <f:event type="preRenderView" listener="#{userOverviewView.initView()}" /> -->
<f:event type="preRenderView" listener="#{tournamentCreateView.initView()}" />
</f:metadata>
<ui:define name="content">
<h1>Create tournament</h1>
<h1>#{i18n['actionlog.tournaments.admin.create_tournament']}</h1>
<h:form>
<p:wizard widgetVar="wiz" flowListener="#{tournamentCreateView.onFlowProcess}">
<p:tab id="selectGame" title="Select a game">
<p:tab id="selectGame" title="#{i18n['actionlog.tournaments.admin.select_a_game']}">
<p:panel header="Select a game">
<p:panel>
<h:messages errorClass="error" />
Select a game
<h2>#{i18n['actionlog.tournaments.admin.select_a_game']}</h2>
<p:selectOneMenu>
<f:selectItem itemLabel="" />
<f:selectItem itemLabel="spurdo spärde" />
<f:selectItem itemLabel="cockmaster" />
</p:selectOneMenu>
<h2>Create new game</h2>
<h2>#{i18n['actionlog.tournaments.admin.create_a_game']}</h2>
<h:panelGrid columns="2">
<h:outputText value="Name" />
<h:outputText value="Description" />
<h:outputText value="#{i18n['actionlog.tournaments.admin.game_name']}" />
<h:outputText value="#{i18n['actionlog.tournaments.admin.game_description']}" />
<p:inputText />
<p:inputText />
<h:outputText value="Upload image" />
<h:outputText value="#{i18n['actionlog.tournaments.admin.upload_game_image']}" />
<h:outputText value="" />
<p:fileUpload mode="simple" />
......@@ -43,10 +43,10 @@
</p:panel>
</p:tab>
<p:tab id="selectRuleset" title="Select a ruleset">
<p:panel header="Select a ruleset">
<p:tab id="selectRuleset" title="#{i18n['actionlog.tournaments.admin.rules']}">
<p:panel>
<h:messages errorClass="error" />
Select a ruleset
<h2>#{i18n['actionlog.tournaments.admin.select_a_ruleset']}</h2>
<p:selectOneMenu>
<f:selectItem itemLabel="" />
<f:selectItem itemLabel="Pro-rules" />
......@@ -54,39 +54,38 @@
</p:selectOneMenu>
<br />
<h2>Create new ruleset</h2>
<h:outputText value="Rule Name" />
<h2>#{i18n['actionlog.tournaments.admin.create_new_ruleset']}</h2>
<h:outputText value="#{i18n['actionlog.tournaments.ruleset_name']}" />
<br />
<p:inputText />
<br />
<h:outputText value="Description" />
<h:outputText value="#{i18n['actionlog.tournaments.ruleset_description']}" />
<br />
<p:inputTextarea />
</p:panel>
</p:tab>
<p:tab id="selectRegTimes" title="Set registration times">
<p:panel header="Select registration times">
<p:tab id="selectRegTimes" title="#{i18n['actionlog.tournaments.admin.set_time_constraints']}">
<p:panel>
<h:messages errorClass="error" />
<h2>Registration</h2>
<h2>#{i18n['actionlog.tournaments.admin.registration_time_constraints']}</h2>
<h:panelGrid columns="2">
<h:outputText value="Opens" />
<h:outputText value="Closees" />
<h:outputText value="#{i18n['actionlog.tournaments.registration_opens']}" />
<h:outputText value="#{i18n['actionlog.tournaments.registration_closes']}" />
<p:calendar stepHour="1" stepMinute="10" pattern="dd.MM.yyyy hh:mm" />
<p:calendar stepHour="1" stepMinute="10" pattern="dd.MM.yyyy hh:mm" />
</h:panelGrid>
<h2>Event Start time</h2>
<h2>#{i18n['actionlog.tournaments.admin.begin_time_constraints']}</h2>
<h:panelGrid>
<h:outputText value="Start time" />
<p:calendar stepHour="1" stepMinute="10" pattern="dd.MM.yyyy hh:mm" />
</h:panelGrid>
</p:panel>
<div style="float: right;">
<p:commandButton icon="apply" value="Create event" />
<p:commandButton icon="apply" value="#{i18n['actionlog.tournaments.admin.create_tournament']}" />
</div>
</p:tab>
</p:wizard>
</h:form>
......
code/MoyaWeb/WebContent/tournaments/index.xhtml
......@@ -12,7 +12,7 @@
<h1>Tournaments</h1>
</ui:define>
</ui:composition>
......
code/MoyaWeb/src/fi/codecrew/moya/web/cdiview/tournaments/TournamentCreateView.java
......@@ -21,6 +21,9 @@ public class TournamentCreateView implements Serializable {
*/
private static final long serialVersionUID = 2547358764980373797L;
public void initView() {
System.out.println("MOI");
}
// called on finish
public void save(ActionEvent actionEvent) {
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!