From 87d9291bfbdcc515677556c9a259d351ef47271a Mon Sep 17 00:00:00 2001 From: Michel ten Voorde Date: Thu, 6 Nov 2025 23:19:00 +0100 Subject: [PATCH] Use substitutions for disable button test --- .../tournament-manage.component.ts | 34 ++++++++++--------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/src/app/components/tournament-manage/tournament-manage.component.ts b/src/app/components/tournament-manage/tournament-manage.component.ts index 889ef90..2ee3476 100644 --- a/src/app/components/tournament-manage/tournament-manage.component.ts +++ b/src/app/components/tournament-manage/tournament-manage.component.ts @@ -210,10 +210,10 @@ export class TournamentManageComponent implements OnInit, OnDestroy { matchContainsPlayersThatArePlaying(match: Match): boolean { 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.getTournamentPlayerFromPlayer(match.team2.player1).id); - if (match.team2.player2) matchPlayers.push(this.getTournamentPlayerFromPlayer(match.team2.player2).id); + matchPlayers.push(this.getPlayerOrSubstitute(match.team1.player1, match.type).id); + if (match.team1.player2) matchPlayers.push(this.getPlayerOrSubstitute(match.team1.player2, match.type).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); let matchPlayersThatArePlaying = this.tournament.playersPlaying.filter(Set.prototype.has, new Set(matchPlayers)); return matchPlayersThatArePlaying.length > 0; @@ -221,20 +221,21 @@ export class TournamentManageComponent implements OnInit, OnDestroy { matchPlayersThatArePlaying(match: Match): 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.getTournamentPlayerFromPlayer(match.team2.player1).id); - if (match.team2.player2) matchPlayers.push(this.getTournamentPlayerFromPlayer(match.team2.player2).id); + + matchPlayers.push(this.getPlayerOrSubstitute(match.team1.player1, match.type).id); + if (match.team1.player2) matchPlayers.push(this.getPlayerOrSubstitute(match.team1.player2, match.type).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)); } matchContainsPlayersThatAreCounting(match: Match): boolean { 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.getTournamentPlayerFromPlayer(match.team2.player1).id); - if (match.team2.player2) matchPlayers.push(this.getTournamentPlayerFromPlayer(match.team2.player2).id); + matchPlayers.push(this.getPlayerOrSubstitute(match.team1.player1, match.type).id); + if (match.team1.player2) matchPlayers.push(this.getPlayerOrSubstitute(match.team1.player2, match.type).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); let matchPlayersThatAreCounting = this.tournament.playersCounting.filter(Set.prototype.has, new Set(matchPlayers)); return matchPlayersThatAreCounting.length > 0; @@ -242,10 +243,11 @@ export class TournamentManageComponent implements OnInit, OnDestroy { matchPlayersThatAreCounting(match: Match): 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.getTournamentPlayerFromPlayer(match.team2.player1).id); - if (match.team2.player2) matchPlayers.push(this.getTournamentPlayerFromPlayer(match.team2.player2).id); + + matchPlayers.push(this.getPlayerOrSubstitute(match.team1.player1, match.type).id); + if (match.team1.player2) matchPlayers.push(this.getPlayerOrSubstitute(match.team1.player2, match.type).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)); }