connected-it/swiss-client
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use substitutions for disable button test
All checks were successful
Gitea/swiss-client/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Michel ten Voorde
2025-11-06 23:19:00 +01:00
parent c646ae15ee
commit 87d9291bfb
1 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/app/components/tournament-manage/tournament-manage.component.ts
View File

@@ -210,10 +210,10 @@ export class TournamentManageComponent implements OnInit, OnDestroy {
matchContainsPlayersThatArePlaying(match: Match): boolean { matchContainsPlayersThatArePlaying(match: Match): boolean {
let matchPlayers: number[] = []; let matchPlayers: number[] = [];
matchPlayers.push(this.getTournamentPlayerFromPlayer(match.team1.player1).id); matchPlayers.push(this.getPlayerOrSubstitute(match.team1.player1, match.type).id);
if (match.team1.player2) matchPlayers.push(this.getTournamentPlayerFromPlayer(match.team1.player2).id); if (match.team1.player2) matchPlayers.push(this.getPlayerOrSubstitute(match.team1.player2, match.type).id);
matchPlayers.push(this.getTournamentPlayerFromPlayer(match.team2.player1).id); matchPlayers.push(this.getPlayerOrSubstitute(match.team2.player1, match.type).id);
if (match.team2.player2) matchPlayers.push(this.getTournamentPlayerFromPlayer(match.team2.player2).id); if (match.team2.player2) matchPlayers.push(this.getPlayerOrSubstitute(match.team2.player2, match.type).id);
let matchPlayersThatArePlaying = this.tournament.playersPlaying.filter(Set.prototype.has, new Set(matchPlayers)); let matchPlayersThatArePlaying = this.tournament.playersPlaying.filter(Set.prototype.has, new Set(matchPlayers));
return matchPlayersThatArePlaying.length > 0; return matchPlayersThatArePlaying.length > 0;
@@ -221,20 +221,21 @@ export class TournamentManageComponent implements OnInit, OnDestroy {
matchPlayersThatArePlaying(match: Match): number[] { matchPlayersThatArePlaying(match: Match): number[] {
let matchPlayers: number[] = []; let matchPlayers: number[] = [];
matchPlayers.push(this.getTournamentPlayerFromPlayer(match.team1.player1).id);
if (match.team1.player2) matchPlayers.push(this.getTournamentPlayerFromPlayer(match.team1.player2).id); matchPlayers.push(this.getPlayerOrSubstitute(match.team1.player1, match.type).id);
matchPlayers.push(this.getTournamentPlayerFromPlayer(match.team2.player1).id); if (match.team1.player2) matchPlayers.push(this.getPlayerOrSubstitute(match.team1.player2, match.type).id);
if (match.team2.player2) matchPlayers.push(this.getTournamentPlayerFromPlayer(match.team2.player2).id); matchPlayers.push(this.getPlayerOrSubstitute(match.team2.player1, match.type).id);
if (match.team2.player2) matchPlayers.push(this.getPlayerOrSubstitute(match.team2.player2, match.type).id);
return this.tournament.playersPlaying.filter(Set.prototype.has, new Set(matchPlayers)); return this.tournament.playersPlaying.filter(Set.prototype.has, new Set(matchPlayers));
} }
matchContainsPlayersThatAreCounting(match: Match): boolean { matchContainsPlayersThatAreCounting(match: Match): boolean {
let matchPlayers: number[] = []; let matchPlayers: number[] = [];
matchPlayers.push(this.getTournamentPlayerFromPlayer(match.team1.player1).id); matchPlayers.push(this.getPlayerOrSubstitute(match.team1.player1, match.type).id);
if (match.team1.player2) matchPlayers.push(this.getTournamentPlayerFromPlayer(match.team1.player2).id); if (match.team1.player2) matchPlayers.push(this.getPlayerOrSubstitute(match.team1.player2, match.type).id);
matchPlayers.push(this.getTournamentPlayerFromPlayer(match.team2.player1).id); matchPlayers.push(this.getPlayerOrSubstitute(match.team2.player1, match.type).id);
if (match.team2.player2) matchPlayers.push(this.getTournamentPlayerFromPlayer(match.team2.player2).id); if (match.team2.player2) matchPlayers.push(this.getPlayerOrSubstitute(match.team2.player2, match.type).id);
let matchPlayersThatAreCounting = this.tournament.playersCounting.filter(Set.prototype.has, new Set(matchPlayers)); let matchPlayersThatAreCounting = this.tournament.playersCounting.filter(Set.prototype.has, new Set(matchPlayers));
return matchPlayersThatAreCounting.length > 0; return matchPlayersThatAreCounting.length > 0;
@@ -242,10 +243,11 @@ export class TournamentManageComponent implements OnInit, OnDestroy {
matchPlayersThatAreCounting(match: Match): number[] { matchPlayersThatAreCounting(match: Match): number[] {
let matchPlayers: number[] = []; let matchPlayers: number[] = [];
matchPlayers.push(this.getTournamentPlayerFromPlayer(match.team1.player1).id);
if (match.team1.player2) matchPlayers.push(this.getTournamentPlayerFromPlayer(match.team1.player2).id); matchPlayers.push(this.getPlayerOrSubstitute(match.team1.player1, match.type).id);
matchPlayers.push(this.getTournamentPlayerFromPlayer(match.team2.player1).id); if (match.team1.player2) matchPlayers.push(this.getPlayerOrSubstitute(match.team1.player2, match.type).id);
if (match.team2.player2) matchPlayers.push(this.getTournamentPlayerFromPlayer(match.team2.player2).id); matchPlayers.push(this.getPlayerOrSubstitute(match.team2.player1, match.type).id);
if (match.team2.player2) matchPlayers.push(this.getPlayerOrSubstitute(match.team2.player2, match.type).id);
return this.tournament.playersCounting.filter(Set.prototype.has, new Set(matchPlayers)); return this.tournament.playersCounting.filter(Set.prototype.has, new Set(matchPlayers));
} }