Skip to content

Linnea Samila / Moya

Go to a project
Commit b2317e5d by Tuomas Riihimäki
Options

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

2 parents 368f0d40 3a0b0e0c
Inline Side-by-side
Showing with 265 additions and 8 deletions
code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/TournamentBean.java
...@@ -98,8 +98,14 @@ public class TournamentBean implements TournamentBeanLocal { ...@@ -98,8 +98,14 @@ public class TournamentBean implements TournamentBeanLocal {
@Override @Override
@RolesAllowed(TournamentPermission.S_VIEW) @RolesAllowed(TournamentPermission.S_VIEW)
public List<Tournament> getTournamentsInStatus(TournamentStatus status, boolean useTimeConstraints) { public List<Tournament> getTournamentsInStatus(TournamentStatus status, boolean useTimeConstraints, boolean invertMatch) {
return tournamentFacade.getTournamentsInStatusWithParticipationTimeIn(status, eventBean.getCurrentEvent()); if(useTimeConstraints)
if(!invertMatch)
return tournamentFacade.getTournamentsInStatusWithParticipationTimeIn(status, eventBean.getCurrentEvent());
else
return tournamentFacade.getTournamentsInStatusWithParticipationTimeNotIn(status, eventBean.getCurrentEvent());
else
return tournamentFacade.getTournamentsInStatus(status, eventBean.getCurrentEvent());
} }
@Override @Override
......
code/MoyaBeans/ejbModule/fi/codecrew/moya/facade/TournamentFacade.java
...@@ -68,6 +68,23 @@ public class TournamentFacade extends IntegerPkGenericFacade<Tournament> { ...@@ -68,6 +68,23 @@ public class TournamentFacade extends IntegerPkGenericFacade<Tournament> {
return getEm().createQuery(cq).getResultList(); return getEm().createQuery(cq).getResultList();
} }
public List<Tournament> getTournamentsInStatusWithParticipationTimeNotIn(TournamentStatus status, LanEvent event) {
CriteriaBuilder cb = getEm().getCriteriaBuilder();
CriteriaQuery<Tournament> cq = cb.createQuery(Tournament.class);
Root<Tournament> root = cq.from(Tournament.class);
cq.where(
cb.and(
cb.equal(root.get(Tournament_.tournamentStatus), status),
cb.equal(root.get(Tournament_.lanEvent), event),
cb.not(
cb.between(cb.currentDate(), root.get(Tournament_.registrationOpensAt), root.get(Tournament_.registrationClosesAt))
)
)
);
return getEm().createQuery(cq).getResultList();
}
} }
code/MoyaBeansClient/ejbModule/fi/codecrew/moya/beans/TournamentBeanLocal.java
...@@ -28,6 +28,7 @@ public interface TournamentBeanLocal { ...@@ -28,6 +28,7 @@ public interface TournamentBeanLocal {
void createParticipation(TournamentParticipant tournamentParticipant) throws Exception; void createParticipation(TournamentParticipant tournamentParticipant) throws Exception;
boolean hasParticipations(EventUser currentUser, Tournament tournament); boolean hasParticipations(EventUser currentUser, Tournament tournament);
EventUser findAvailablePlayerForTournamentByLogin(Tournament t, String login) throws Exception; EventUser findAvailablePlayerForTournamentByLogin(Tournament t, String login) throws Exception;
List<Tournament> getTournamentsInStatus(TournamentStatus status, boolean useTimeConstraints); List<Tournament> getTournamentsInStatus(TournamentStatus status,
boolean useTimeConstraints, boolean invertMatch);
} }
code/MoyaWeb/WebContent/resources/cditools/user/usertabs.xhtml
...@@ -47,6 +47,7 @@ ...@@ -47,6 +47,7 @@
</ul> </ul>
</div> </div>
<div style="clear: both;">&nbsp;</div>
</composite:implementation> </composite:implementation>
</html> </html>
code/MoyaWeb/WebContent/tournaments/admin/view_tournament_single.xhtml
...@@ -24,6 +24,12 @@ ...@@ -24,6 +24,12 @@
</f:facet> </f:facet>
<h:outputText value="#{tournamentParticipantsView.eventUserGameID[participant.participator.id]}" /> <h:outputText value="#{tournamentParticipantsView.eventUserGameID[participant.participator.id]}" />
</p:column> </p:column>
<p:column>
<f:facet name="header">
<h:outputText value="#{i18n['tournament.participant_email']}" />
</f:facet>
<h:outputText value="#{participant.participator.email}" />
</p:column>
</p:dataTable> </p:dataTable>
</h:form> </h:form>
......
code/MoyaWeb/WebContent/tournaments/admin/view_tournament_team.xhtml
...@@ -35,8 +35,15 @@ ...@@ -35,8 +35,15 @@
<ul> <ul>
<ui:repeat var="member" value="#{participant.teamMembers}"> <ui:repeat var="member" value="#{participant.teamMembers}">
<li> <li>
<h:outputText value="#{member.eventUser.nick}" /> <h:outputText value="#{member.eventUser.nick}" />
(<h:outputText value="#{tournamentParticipantsView.eventUserGameID[member.eventUser.id]}" />) <ul>
<li>
<h:outputText value="#{tournamentParticipantsView.eventUserGameID[member.eventUser.id]}" />
</li>
<li>
<h:outputText value="#{member.eventUser.email}" />
</li>
</ul>
</li> </li>
</ui:repeat> </ui:repeat>
</ul> </ul>
......
code/MoyaWeb/WebContent/tournaments/index.xhtml
...@@ -94,6 +94,213 @@ ...@@ -94,6 +94,213 @@
</h:panelGrid> </h:panelGrid>
</p:rowExpansion> </p:rowExpansion>
</p:dataTable> </p:dataTable>
<h2>#{i18n['tournaments.setup_closed_tournaments']}</h2>
<p:dataTable value="#{tournamentListView.setupClosedPhaseTournaments}" var="tournament">
<p:column style="width:2%">
<p:rowToggler />
</p:column>
<p:column>
<f:facet name="header">
<h:outputText value="#{i18n['tournament.name']}" />
</f:facet>
<h:outputText value="#{tournament.tournamentName}" />
</p:column>
<p:column>
<f:facet name="header">
<h:outputText value="#{i18n['tournament.game']}" />
</f:facet>
<h:outputText value="#{tournament.tournamentGame.name}" />
</p:column>
<p:column>
<f:facet name="header">
<h:outputText value="#{i18n['tournament.status']}" />
</f:facet>
<h:outputText value="#{i18n[tournament.tournamentStatus.i18nKey]}" />
</p:column>
<p:column>
<f:facet name="header">
<h:outputText value="#{i18n['tournament.type']}" />
</f:facet>
<h:outputText value="#{i18n[tournament.tournamentType.i18nKey]}" />
</p:column>
<p:column>
<f:facet name="header">
<h:outputText value="#{i18n['tournament.fillamount']}" />
</f:facet>
<h:outputText value="#{tournament.participants.size()}/#{tournament.maxParticipants}" />
</p:column>
<p:column>
<f:facet name="header">
<h:outputText value="#{i18n['tournament.participation_time']}" />
</f:facet>
<h:outputText value="#{tournament.registrationOpensAt}">
<f:convertDateTime pattern="#{sessionHandler.datetimeFormat}" timeZone="#{sessionHandler.timezone}" />
</h:outputText>
-
<h:outputText value="#{tournament.registrationClosesAt}">
<f:convertDateTime pattern="#{sessionHandler.datetimeFormat}" timeZone="#{sessionHandler.timezone}" />
</h:outputText>
</p:column>
<p:column>
<f:facet name="header">
<h:outputText value="#{i18n['tournament.rules']}" />
</f:facet>
<h:link value="#{tournament.rules.name}" outcome="/tournaments/showrules.xhtml">
<f:param name="tournament_id" value="#{tournament.id}" />
</h:link>
</p:column>
<p:rowExpansion>
<h:panelGrid id="display" columns="2" cellpadding="4" styleClass=" ui-widget-content grid">
<h:outputText value="#{i18n['tournament.participants']}" />
<h:panelGroup>
<ul>
<ui:repeat var="participant" value="#{tournament.participants}">
<li><h:outputText value="#{participant.teamName}" rendered="#{not empty participant.teamName}" /> <h:outputText value="#{participant.participator.user.nick}"
rendered="#{empty participant.teamName}" /></li>
</ui:repeat>
</ul>
</h:panelGroup>
</h:panelGrid>
</p:rowExpansion>
</p:dataTable>
<h2>#{i18n['tournaments.in_progress_tournaments']}</h2>
<p:dataTable value="#{tournamentListView.inProgressTournaments}" var="tournament">
<p:column style="width:2%">
<p:rowToggler />
</p:column>
<p:column>
<f:facet name="header">
<h:outputText value="#{i18n['tournament.name']}" />
</f:facet>
<h:outputText value="#{tournament.tournamentName}" />
</p:column>
<p:column>
<f:facet name="header">
<h:outputText value="#{i18n['tournament.game']}" />
</f:facet>
<h:outputText value="#{tournament.tournamentGame.name}" />
</p:column>
<p:column>
<f:facet name="header">
<h:outputText value="#{i18n['tournament.status']}" />
</f:facet>
<h:outputText value="#{i18n[tournament.tournamentStatus.i18nKey]}" />
</p:column>
<p:column>
<f:facet name="header">
<h:outputText value="#{i18n['tournament.type']}" />
</f:facet>
<h:outputText value="#{i18n[tournament.tournamentType.i18nKey]}" />
</p:column>
<p:column>
<f:facet name="header">
<h:outputText value="#{i18n['tournament.fillamount']}" />
</f:facet>
<h:outputText value="#{tournament.participants.size()}/#{tournament.maxParticipants}" />
</p:column>
<p:column>
<f:facet name="header">
<h:outputText value="#{i18n['tournament.participation_time']}" />
</f:facet>
<h:outputText value="#{tournament.registrationOpensAt}">
<f:convertDateTime pattern="#{sessionHandler.datetimeFormat}" timeZone="#{sessionHandler.timezone}" />
</h:outputText>
-
<h:outputText value="#{tournament.registrationClosesAt}">
<f:convertDateTime pattern="#{sessionHandler.datetimeFormat}" timeZone="#{sessionHandler.timezone}" />
</h:outputText>
</p:column>
<p:column>
<f:facet name="header">
<h:outputText value="#{i18n['tournament.rules']}" />
</f:facet>
<h:link value="#{tournament.rules.name}" outcome="/tournaments/showrules.xhtml">
<f:param name="tournament_id" value="#{tournament.id}" />
</h:link>
</p:column>
<p:rowExpansion>
<h:panelGrid id="display" columns="2" cellpadding="4" styleClass=" ui-widget-content grid">
<h:outputText value="#{i18n['tournament.participants']}" />
<h:panelGroup>
<ul>
<ui:repeat var="participant" value="#{tournament.participants}">
<li><h:outputText value="#{participant.teamName}" rendered="#{not empty participant.teamName}" /> <h:outputText value="#{participant.participator.user.nick}"
rendered="#{empty participant.teamName}" /></li>
</ui:repeat>
</ul>
</h:panelGroup>
</h:panelGrid>
</p:rowExpansion>
</p:dataTable>
<h2>#{i18n['tournaments.completed_tournaments']}</h2>
<p:dataTable value="#{tournamentListView.completedTournaments}" var="tournament">
<p:column style="width:2%">
<p:rowToggler />
</p:column>
<p:column>
<f:facet name="header">
<h:outputText value="#{i18n['tournament.name']}" />
</f:facet>
<h:outputText value="#{tournament.tournamentName}" />
</p:column>
<p:column>
<f:facet name="header">
<h:outputText value="#{i18n['tournament.game']}" />
</f:facet>
<h:outputText value="#{tournament.tournamentGame.name}" />
</p:column>
<p:column>
<f:facet name="header">
<h:outputText value="#{i18n['tournament.status']}" />
</f:facet>
<h:outputText value="#{i18n[tournament.tournamentStatus.i18nKey]}" />
</p:column>
<p:column>
<f:facet name="header">
<h:outputText value="#{i18n['tournament.type']}" />
</f:facet>
<h:outputText value="#{i18n[tournament.tournamentType.i18nKey]}" />
</p:column>
<p:column>
<f:facet name="header">
<h:outputText value="#{i18n['tournament.fillamount']}" />
</f:facet>
<h:outputText value="#{tournament.participants.size()}/#{tournament.maxParticipants}" />
</p:column>
<p:column>
<f:facet name="header">
<h:outputText value="#{i18n['tournament.participation_time']}" />
</f:facet>
<h:outputText value="#{tournament.registrationOpensAt}">
<f:convertDateTime pattern="#{sessionHandler.datetimeFormat}" timeZone="#{sessionHandler.timezone}" />
</h:outputText>
-
<h:outputText value="#{tournament.registrationClosesAt}">
<f:convertDateTime pattern="#{sessionHandler.datetimeFormat}" timeZone="#{sessionHandler.timezone}" />
</h:outputText>
</p:column>
<p:column>
<f:facet name="header">
<h:outputText value="#{i18n['tournament.rules']}" />
</f:facet>
<h:link value="#{tournament.rules.name}" outcome="/tournaments/showrules.xhtml">
<f:param name="tournament_id" value="#{tournament.id}" />
</h:link>
</p:column>
<p:rowExpansion>
<h:panelGrid id="display" columns="2" cellpadding="4" styleClass=" ui-widget-content grid">
<h:outputText value="#{i18n['tournament.participants']}" />
<h:panelGroup>
<ul>
<ui:repeat var="participant" value="#{tournament.participants}">
<li><h:outputText value="#{participant.teamName}" rendered="#{not empty participant.teamName}" /> <h:outputText value="#{participant.participator.user.nick}"
rendered="#{empty participant.teamName}" /></li>
</ui:repeat>
</ul>
</h:panelGroup>
</h:panelGrid>
</p:rowExpansion>
</p:dataTable>
</h:form> </h:form>
</ui:define> </ui:define>
</ui:composition> </ui:composition>
......
code/MoyaWeb/src/fi/codecrew/moya/resources/i18n_en.properties
...@@ -1032,6 +1032,7 @@ tournament.game = Game ...@@ -1032,6 +1032,7 @@ tournament.game = Game
tournament.name = Tournament name tournament.name = Tournament name
tournament.not_within_participation_time = Not within the participation time for the tournament tournament.not_within_participation_time = Not within the participation time for the tournament
tournament.participant_captain = Captain tournament.participant_captain = Captain
tournament.participant_email = Participant E-Mail
tournament.participant_gameid = Game-ID tournament.participant_gameid = Game-ID
tournament.participant_nick = Nickname tournament.participant_nick = Nickname
tournament.participants = Participants tournament.participants = Participants
...@@ -1082,7 +1083,9 @@ tournaments.admin.view_tournament_title = View tournamen ...@@ -1082,7 +1083,9 @@ tournaments.admin.view_tournament_title = View tournamen
tournaments.back_to_tournament_list = Back to tournament list tournaments.back_to_tournament_list = Back to tournament list
tournaments.backup_players = Max backup players tournaments.backup_players = Max backup players
tournaments.cancel_participation = Cancel participation tournaments.cancel_participation = Cancel participation
tournaments.completed_tournaments = Completed tournaments
tournaments.description = You can view & participate into tournaments from this page. tournaments.description = You can view & participate into tournaments from this page.
tournaments.in_progress_tournaments = In progress
tournaments.max_participants = Max participants tournaments.max_participants = Max participants
tournaments.menutitle = Tournaments tournaments.menutitle = Tournaments
tournaments.open_tournaments = Open tournaments tournaments.open_tournaments = Open tournaments
...@@ -1103,6 +1106,7 @@ tournaments.registration_opens = Set registrati ...@@ -1103,6 +1106,7 @@ tournaments.registration_opens = Set registrati
tournaments.ruleset_description = Ruleset description tournaments.ruleset_description = Ruleset description
tournaments.ruleset_name = Ruleset name tournaments.ruleset_name = Ruleset name
tournaments.ruleset_rules = Tournament ruleset tournaments.ruleset_rules = Tournament ruleset
tournaments.setup_closed_tournaments = Participation closed
tournaments.start_time = Start Time tournaments.start_time = Start Time
tournaments.team_details = Team Details tournaments.team_details = Team Details
tournaments.title = Tournaments tournaments.title = Tournaments
......
code/MoyaWeb/src/fi/codecrew/moya/resources/i18n_fi.properties
...@@ -1017,6 +1017,7 @@ tournament.game = Peli ...@@ -1017,6 +1017,7 @@ tournament.game = Peli
tournament.name = Turnauksen nimi tournament.name = Turnauksen nimi
tournament.not_within_participation_time = Turnauksen ilmoittautuminen ei ole aktiivinen tournament.not_within_participation_time = Turnauksen ilmoittautuminen ei ole aktiivinen
tournament.participant_captain = Kapteeni tournament.participant_captain = Kapteeni
tournament.participant_email = Osallistujan s\u00E4hk\u00F6posti
tournament.participant_gameid = Peli-ID tournament.participant_gameid = Peli-ID
tournament.participant_nick = Nimimerkki tournament.participant_nick = Nimimerkki
tournament.participants = Osallistujat tournament.participants = Osallistujat
...@@ -1067,7 +1068,9 @@ tournaments.admin.view_tournament_title = Tarkastele tur ...@@ -1067,7 +1068,9 @@ tournaments.admin.view_tournament_title = Tarkastele tur
tournaments.back_to_tournament_list = Takaisin turnauslistaukseen tournaments.back_to_tournament_list = Takaisin turnauslistaukseen
tournaments.backup_players = Maksimim\u00E4\u00E4r\u00E4 varapelaajia tournaments.backup_players = Maksimim\u00E4\u00E4r\u00E4 varapelaajia
tournaments.cancel_participation = Peruuta osallistuminen tournaments.cancel_participation = Peruuta osallistuminen
tournaments.completed_tournaments = Menneet turnaukset
tournaments.description = Voit osallistua sek\u00E4 katselmoida turnauksia t\u00E4ll\u00E4 sivulla. tournaments.description = Voit osallistua sek\u00E4 katselmoida turnauksia t\u00E4ll\u00E4 sivulla.
tournaments.in_progress_tournaments = K\u00E4ynniss\u00E4
tournaments.max_participants = Maksimiosallistujam\u00E4\u00E4r\u00E4 tournaments.max_participants = Maksimiosallistujam\u00E4\u00E4r\u00E4
tournaments.menutitle = Turnaukset tournaments.menutitle = Turnaukset
tournaments.open_tournaments = Avoimet turnaukset tournaments.open_tournaments = Avoimet turnaukset
...@@ -1088,6 +1091,7 @@ tournaments.registration_opens = Rekister\u00F6 ...@@ -1088,6 +1091,7 @@ tournaments.registration_opens = Rekister\u00F6
tournaments.ruleset_description = S\u00E4\u00E4nn\u00F6st\u00F6n kuvaus tournaments.ruleset_description = S\u00E4\u00E4nn\u00F6st\u00F6n kuvaus
tournaments.ruleset_name = S\u00E4\u00E4nn\u00F6st\u00F6n nimi tournaments.ruleset_name = S\u00E4\u00E4nn\u00F6st\u00F6n nimi
tournaments.ruleset_rules = Turnauksen s\u00E4\u00E4nn\u00F6t tournaments.ruleset_rules = Turnauksen s\u00E4\u00E4nn\u00F6t
tournaments.setup_closed_tournaments = Ilmoittautuminen suljettu
tournaments.start_time = Aloitusaika tournaments.start_time = Aloitusaika
tournaments.team_details = Joukkuekohtaiset tiedot tournaments.team_details = Joukkuekohtaiset tiedot
tournaments.title = Turnaukset tournaments.title = Turnaukset
......
code/MoyaWeb/src/fi/codecrew/moya/web/cdiview/tournaments/TournamentListView.java
...@@ -32,14 +32,18 @@ public class TournamentListView extends GenericCDIView { ...@@ -32,14 +32,18 @@ public class TournamentListView extends GenericCDIView {
} }
public List<Tournament> getSetupPhaseTournaments() { public List<Tournament> getSetupPhaseTournaments() {
return tournamentBean.getTournamentsInStatus(TournamentStatus.SETUP, true); return tournamentBean.getTournamentsInStatus(TournamentStatus.SETUP, true, false);
}
public List<Tournament> getSetupClosedPhaseTournaments() {
return tournamentBean.getTournamentsInStatus(TournamentStatus.SETUP, true, true);
} }
public List<Tournament> getInProgressTournaments() { public List<Tournament> getInProgressTournaments() {
return tournamentBean.getTournamentsInStatus(TournamentStatus.IN_PROGRESS, false); return tournamentBean.getTournamentsInStatus(TournamentStatus.IN_PROGRESS, false, false);
} }
public List<Tournament> getCompletedTournaments() { public List<Tournament> getCompletedTournaments() {
return tournamentBean.getTournamentsInStatus(TournamentStatus.COMPLETED, false); return tournamentBean.getTournamentsInStatus(TournamentStatus.COMPLETED, false, false);
} }
} }
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!