Merge branch 'tournadmin' into 'master'

Turnausjutukkeita

revertoidaan myös n/a takaisin GameID defaultiksi

code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/TournamentBean.java

@@ -234,14 +234,19 @@ public class TournamentBean implements TournamentBeanLocal {
 		EventUser executor = permissionBean.getCurrentUser();
 
 		// Assert we have permission to remove participant
-		// TODO: this will include check for remove any participation too!
-		if (!permissionBean.hasPermission(TournamentPermission.REMOVE_OWN_PARTICIPATION) || !tp.getParticipator().equals(executor)) {
+		if(tp.getParticipator().equals(executor)) {
+			// own participation, can we delete?
+			if(!permissionBean.hasPermission(TournamentPermission.REMOVE_OWN_PARTICIPATION)) {
 				throw new Exception("tournaments.can_only_remove_own_participations");
 			}
+		} else {
+			if(!permissionBean.hasPermission(TournamentPermission.MANAGE_ALL)) {
+				throw new Exception("tournaments.cannot_remove_others_participations");
+			}
+		}
 
 		// Assert that tournament has not closed participation
-		// TODO: admin exception!
-		if (!tp.getTournament().getRegistrationClosesAt().after(new Date())) {
+		if (!permissionBean.hasPermission(TournamentPermission.MANAGE_ALL) && !tp.getTournament().getRegistrationClosesAt().after(new Date())) {
 			throw new Exception("tournaments.cannot_remove_participation_from_closed_tournament");
 		}
 

code/MoyaWeb/WebContent/tournaments/admin/view_tournament_single.xhtml

@@ -38,7 +38,18 @@
        						<h:outputText value="#{groupMembership.placeReservation.name}" />&nbsp;
        					</ui:repeat>
 					</p:column>
+					<p:column>
+						<p:commandButton value="#{i18n['delete']}" actionListener="#{tournamentParticipantsView.deleteParticipation}"  update="@form">
+	        				<p:confirm header="#{i18n['confirmdialog.header']}" message="#{i18n['confirmdialog.are_you_sure']}" icon="ui-icon-alert" />
+	        				<f:attribute name="participantid" value="#{participant.id}" />
+	    				</p:commandButton>
+			 			<p:confirmDialog global="true">
+					        <p:commandButton value="#{i18n['confirmdialog.yes']}" type="button" styleClass="ui-confirmdialog-yes" icon="ui-icon-check" />
+					        <p:commandButton value="#{i18n['confirmdialog.no']}" type="button" styleClass="ui-confirmdialog-no" icon="ui-icon-close" />
+					    </p:confirmDialog>
+				    </p:column>
 	 			</p:dataTable> 
+
  			</h:form> 
  			
  			 

code/MoyaWeb/WebContent/tournaments/admin/view_tournament_team.xhtml

@@ -28,6 +28,16 @@
 						</f:facet>
 						<h:outputText value="#{participant.participator.nick}" />
 					</p:column>
+					<p:column>
+						<p:commandButton value="#{i18n['delete']}" actionListener="#{tournamentParticipantsView.deleteParticipation}"  update="@form">
+	        				<p:confirm header="#{i18n['confirmdialog.header']}" message="#{i18n['confirmdialog.are_you_sure']}" icon="ui-icon-alert" />
+	        				<f:attribute name="participantid" value="#{participant.id}" />
+	    				</p:commandButton>
+			 			<p:confirmDialog global="true">
+					        <p:commandButton value="#{i18n['confirmdialog.yes']}" type="button" styleClass="ui-confirmdialog-yes" icon="ui-icon-check" />
+					        <p:commandButton value="#{i18n['confirmdialog.no']}" type="button" styleClass="ui-confirmdialog-no" icon="ui-icon-close" />
+					    </p:confirmDialog>
+				    </p:column>
 	 				<p:rowExpansion styleClass="inlineRow">
 	 					<p:dataTable value="#{participant.teamMembers}" var="member">
 	 						<p:column>

code/MoyaWeb/WebContent/tournaments/participate_multi.xhtml

@@ -16,6 +16,7 @@
 			<h2>#{i18n['tournaments.participate_team_members']}</h2>
 			<p:messages autoUpdate="true" redisplay="false"></p:messages>
 			<h:form>
+				<p:commandButton style="width: 0px; height: 0px;" value="" action="#{tournamentParticipateView.addMainPlayerToTeam}" update="@form"/>
 				<h3>#{i18n['tournaments.team_details']}</h3>
 				<h:panelGrid columns="2">
 	 				<h:outputText value="#{i18n['tournament.team_name']}" />

code/MoyaWeb/src/fi/codecrew/moya/web/cdiview/tournaments/TournamentParticipantsView.java

@@ -4,6 +4,8 @@ import java.util.HashMap;
 
 import javax.ejb.EJB;
 import javax.enterprise.context.ConversationScoped;
+import javax.faces.event.ActionEvent;
+import javax.faces.event.ActionListener;
 import javax.inject.Named;
 
 import fi.codecrew.moya.beans.TournamentBeanLocal;
@@ -12,6 +14,7 @@ import fi.codecrew.moya.model.GameID;
 import fi.codecrew.moya.model.Tournament;
 import fi.codecrew.moya.model.TournamentParticipant;
 import fi.codecrew.moya.model.TournamentTeamMember;
+import fi.codecrew.moya.utilities.jsf.MessageHelper;
 import fi.codecrew.moya.web.cdiview.GenericCDIView;
 
 @Named
@@ -27,7 +30,7 @@ public class TournamentParticipantsView extends GenericCDIView {
 	
 	public String showView(Integer tournamentId) {
 		if(eventUserGameID == null) {
-			this.setTournament(tournamentBean.getTournamentById(tournamentId));
+			this.tournament = tournamentBean.getTournamentById(tournamentId);
 			this.beginConversation();
 			eventUserGameID = new HashMap<Integer, String>();
 			for(TournamentParticipant tp : tournament.getParticipants()) { 
@@ -36,7 +39,7 @@ public class TournamentParticipantsView extends GenericCDIView {
 					if(gid != null)
 						eventUserGameID.put(ttm.getEventUser().getId(), gid.getIdentifier());
 					else
-						eventUserGameID.put(ttm.getEventUser().getId(), ttm.getEventUser().getUser().getNick());
+						eventUserGameID.put(ttm.getEventUser().getId(), "n/a");
 				}
 			}
 		}
@@ -46,6 +49,17 @@ public class TournamentParticipantsView extends GenericCDIView {
 			return "/tournaments/admin/view_tournament_team.xhtml";
 	}
 	
+	public void deleteParticipation(ActionEvent ae) {
+		try {
+			Integer id = (Integer)ae.getComponent().getAttributes().get("participantid");
+			tournamentBean.deleteParticipationById(id);
+			
+			this.tournament = tournamentBean.getTournamentById(this.tournament.getId());
+		} catch(Exception e) {
+			MessageHelper.err(e.getMessage());
+		}
+	}
+	
 	public String cancel() {
 		this.endConversation();
 		return "/tournaments/admin/index.xhtml";