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

Optionally disable starting a match and show reason
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:00:00 +01:00
parent 8128ba4744
commit c646ae15ee
4 changed files with 120 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/app/components/tournament-manage/tournament-manage.component.html
View File

@@ -323,10 +323,19 @@
</td>
<td class="align-middle w-fill">
@if (match.status == 'NOT_STARTED') {
@if (match.canStart) {
<button mat-button (click)="startMatch(match)">
<mat-icon>play_arrow</mat-icon>
Wedstrijd starten
</button>
} @else {
<span [matTooltip]="match.cantStartReason" style="cursor: not-allowed;">
<button mat-button disabled>
<mat-icon>play_arrow</mat-icon>
Wedstrijd starten
</button>
</span>
}
} @else if (match.status == 'IN_PROGRESS') {
<button mat-button (click)="editResult(match, event, group, round)">
<mat-icon>leaderboard</mat-icon>

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

@@ -33,9 +33,10 @@ import {Standings} from "../../model/standings";
import {HeaderService} from "../../service/header.service";
import {TournamentPlayersComponent} from "../tournament-players/tournament-players.component";
import {TournamentPlayer} from "../../model/tournamentPlayer";
import {MatTooltip} from "@angular/material/tooltip";
import {TeamDisplayComponent} from "../team-display/team-display.component";
import {CounterSelectionComponent} from "../counter-selection/counter-selection.component";
import {Observable, Subscription, tap} from "rxjs";
import {MatTooltip} from '@angular/material/tooltip';
@Component({
selector: 'app-tournament-manage',
@@ -66,6 +67,7 @@ import {CounterSelectionComponent} from "../counter-selection/counter-selection.
TournamentPlayersComponent,
MatExpansionPanelActionRow,
TeamDisplayComponent,
MatTooltip,
],
providers: [
FullNamePipe,
@@ -98,10 +100,10 @@ export class TournamentManageComponent implements OnInit, OnDestroy {
this.activeRoundTab = params['tab'];
}
})
this.tournamentService.getById(Number(id)).subscribe(data => {
this.tournament = data;
this.headerService.setTitle(this.tournament.name);
});
this.loadTournament(
this.tournamentService.getById(Number(id)),
(tournament) => this.headerService.setTitle(tournament.name)
);
}
ngOnDestroy() {
@@ -152,45 +154,31 @@ export class TournamentManageComponent implements OnInit, OnDestroy {
}
startRound(round: Round) {
this.tournamentService.startRound(this.tournament.id, round.id).subscribe(data => {
this.tournament = data;
});
this.loadTournament(this.tournamentService.startRound(this.tournament.id, round.id));
}
finishRound(round: Round) {
this.tournamentService.finishRound(this.tournament.id, round.id).subscribe(data => {
this.tournament = data;
});
this.loadTournament(this.tournamentService.finishRound(this.tournament.id, round.id));
}
finishGroup(group: Group) {
this.tournamentService.finishGroup(this.tournament.id, group.id).subscribe(data => {
this.tournament = data;
});
this.loadTournament(this.tournamentService.finishGroup(this.tournament.id, group.id));
}
reopenGroup(group: Group) {
this.tournamentService.reopenGroup(this.tournament.id, group.id).subscribe(data => {
this.tournament = data;
});
this.loadTournament(this.tournamentService.reopenGroup(this.tournament.id, group.id));
}
divideTournament() {
this.tournamentService.divide(this.tournament.id).subscribe(data => {
this.tournament = data;
});
this.loadTournament(this.tournamentService.divide(this.tournament.id));
}
clearDivision() {
this.tournamentService.clearDivision(this.tournament.id).subscribe(data => {
this.tournament = data;
});
this.loadTournament(this.tournamentService.clearDivision(this.tournament.id));
}
drawTournament() {
this.tournamentService.draw(this.tournament.id).subscribe(data => {
this.tournament = data;
});
this.loadTournament(this.tournamentService.draw(this.tournament.id));
}
startMatch(match: Match) {
@@ -214,9 +202,7 @@ export class TournamentManageComponent implements OnInit, OnDestroy {
minHeight: '250px'
}).afterClosed().subscribe(result => {
if (result != undefined) {
this.tournamentService.startMatch(this.tournament.id, match.id, result.court, result.counter.playerId).subscribe(data => {
this.tournament = data;
});
this.loadTournament(this.tournamentService.startMatch(this.tournament.id, match.id, result.court, result.counter.playerId));
}
});
}
@@ -233,6 +219,16 @@ export class TournamentManageComponent implements OnInit, OnDestroy {
return matchPlayersThatArePlaying.length > 0;
}
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);
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);
@@ -244,6 +240,16 @@ export class TournamentManageComponent implements OnInit, OnDestroy {
return matchPlayersThatAreCounting.length > 0;
}
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);
return this.tournament.playersCounting.filter(Set.prototype.has, new Set(matchPlayers));
}
getTournamentPlayerFromPlayer(player: Player): TournamentPlayer {
for (let tournamentPlayer of this.tournament.tournamentPlayers) {
if (tournamentPlayer.playerId == player.id) {
@@ -303,15 +309,11 @@ export class TournamentManageComponent implements OnInit, OnDestroy {
}
stopMatch(match: Match) {
this.tournamentService.stopMatch(this.tournament.id, match.id).subscribe(data => {
this.tournament = data;
})
this.loadTournament(this.tournamentService.stopMatch(this.tournament.id, match.id));
}
newRound(group: Group) {
this.tournamentService.newRound(this.tournament.id, group.id).subscribe(data => {
this.tournament = data;
})
this.loadTournament(this.tournamentService.newRound(this.tournament.id, group.id));
}
getStrength(strength: string | undefined) {
@@ -376,9 +378,7 @@ export class TournamentManageComponent implements OnInit, OnDestroy {
minWidth: '800px'
}).afterClosed().subscribe(result => {
if (result != undefined) {
this.tournamentService.saveResult(this.tournament.id, result.matchId, result).subscribe(data => {
this.tournament = data;
})
this.loadTournament(this.tournamentService.saveResult(this.tournament.id, result.matchId, result));
}
});
}
@@ -439,13 +439,74 @@ export class TournamentManageComponent implements OnInit, OnDestroy {
minHeight: '250px'
}).afterClosed().subscribe(result => {
if (result != undefined) {
this.tournamentService.updateCounter(this.tournament.id, match.id, result.counter.playerId).subscribe(data => {
this.tournament = data;
});
this.loadTournament(this.tournamentService.updateCounter(this.tournament.id, match.id, result.counter.playerId));
}
});
}
private loadTournament(
observable: Observable<Tournament>,
afterLoad?: (tournament: Tournament) => void
): Subscription {
return observable.subscribe(data => {
this.tournament = data;
this.updateMatchAvailability();
afterLoad?.(data); // Optional chaining
});
}
private updateMatchAvailability() {
for (const event of this.tournament.events) {
for (const group of event.groups) {
for (const round of group.rounds) {
for (const match of round.matches) {
let canStart = true;
let matchPlayersThatArePlaying = this.matchPlayersThatArePlaying(match);
let matchPlayersThatAreCounting = this.matchPlayersThatAreCounting(match);
let cantStartReason = "";
if (matchPlayersThatArePlaying.length > 0) {
canStart = false;
cantStartReason = this.joinWithEn(matchPlayersThatArePlaying.map(m => this.getTournamentPlayerFromId(m).name));
if (matchPlayersThatArePlaying.length == 1) {
cantStartReason += " is al aan het spelen";
} else {
cantStartReason += " zijn al aan het spelen";
}
}
if (matchPlayersThatAreCounting.length > 0) {
canStart = false;
if (cantStartReason.length > 0) {
cantStartReason += " en ";
}
cantStartReason += this.joinWithEn(matchPlayersThatAreCounting.map(m => this.getTournamentPlayerFromId(m).name));
if (matchPlayersThatAreCounting.length == 1) {
cantStartReason += " is aan het tellen";
} else {
cantStartReason += " zijn aan het tellen";
}
}
match.canStart = canStart;
match.cantStartReason = cantStartReason;
}
}
}
}
}
joinWithEn(items: string[], separator = ", "): string {
const len = items.length;
if (len === 0) return "";
if (len === 1) return items[0];
if (len === 2) return items.join(" en ");
return items.slice(0, -1).join(separator) + `${separator}and ${items[len - 1]}`;
}
}
class ActiveMatch {

2
src/app/model/match.ts
View File

@@ -13,4 +13,6 @@ export class Match {
games: Game[];
court: number;
counter: Player;
canStart?: boolean;
cantStartReason?: string;
}

3
src/styles.css
View File

@@ -7,3 +7,6 @@ body { margin: 0; font-family: Roboto, "Helvetica Neue", sans-serif; }
z-index: 2000 !important;
}
*/
.mat-tooltip {
white-space: pre-line !important;
}