From 3715177924aee60148a4f58ede335376afb9c9cd Mon Sep 17 00:00:00 2001 From: Software Magico Date: Fri, 14 Jun 2024 10:20:02 +0200 Subject: [PATCH 1/2] Refrshing shiaijos correctly when changing the number of winners. --- .../softwaremagico/kt/core/providers/TournamentProvider.java | 3 +++ .../tournament-brackets/arrow/arrow.component.ts | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/backend/kendo-tournament-core/src/main/java/com/softwaremagico/kt/core/providers/TournamentProvider.java b/backend/kendo-tournament-core/src/main/java/com/softwaremagico/kt/core/providers/TournamentProvider.java index 5a935519..39719d07 100644 --- a/backend/kendo-tournament-core/src/main/java/com/softwaremagico/kt/core/providers/TournamentProvider.java +++ b/backend/kendo-tournament-core/src/main/java/com/softwaremagico/kt/core/providers/TournamentProvider.java @@ -215,6 +215,9 @@ public void setNumberOfWinners(Integer tournamentId, Integer numberOfWinners, St //Resize tournament ((TreeTournamentHandler) tournamentManager).recreateGroupSize(tournament, numberOfWinners); KendoTournamentLogger.info(this.getClass(), "Updated tournament '{}' with number of winners '{}' by '{}'", tournament, numberOfWinners, updatedBy); + + //Update the shiaijo numbers. + ((TreeTournamentHandler) tournamentManager).adjustGroupsShiaijos(tournament); } else { KendoTournamentLogger.warning(this.getClass(), "Cannot change the number of winners as tournament is of type '{}'.", tournament.getType()); } diff --git a/frontend/src/app/components/tournament-brackets-editor/tournament-brackets/arrow/arrow.component.ts b/frontend/src/app/components/tournament-brackets-editor/tournament-brackets/arrow/arrow.component.ts index 36760839..fe75df1a 100644 --- a/frontend/src/app/components/tournament-brackets-editor/tournament-brackets/arrow/arrow.component.ts +++ b/frontend/src/app/components/tournament-brackets-editor/tournament-brackets/arrow/arrow.component.ts @@ -75,7 +75,7 @@ export class ArrowComponent implements OnInit { this.y2 += ArrowComponent.WINNER_SEPARATION; } } - if (this.level > 0) { + if (this.level > 0 || this.numberOfWinnersFirstLevel == 1) { if (this.y1 < this.y2) { this.y2 -= ArrowComponent.WINNER_SEPARATION; } else { From 25aebdf42d357bcb97c92167bdc3aeb1e0d00fec Mon Sep 17 00:00:00 2001 From: Software Magico Date: Fri, 14 Jun 2024 10:20:31 +0200 Subject: [PATCH 2/2] Refrshing shiaijos correctly when changing the number of winners. --- .../softwaremagico/kt/core/providers/TournamentProvider.java | 3 --- .../kt/core/tournaments/TreeTournamentHandler.java | 2 ++ 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/backend/kendo-tournament-core/src/main/java/com/softwaremagico/kt/core/providers/TournamentProvider.java b/backend/kendo-tournament-core/src/main/java/com/softwaremagico/kt/core/providers/TournamentProvider.java index 39719d07..5a935519 100644 --- a/backend/kendo-tournament-core/src/main/java/com/softwaremagico/kt/core/providers/TournamentProvider.java +++ b/backend/kendo-tournament-core/src/main/java/com/softwaremagico/kt/core/providers/TournamentProvider.java @@ -215,9 +215,6 @@ public void setNumberOfWinners(Integer tournamentId, Integer numberOfWinners, St //Resize tournament ((TreeTournamentHandler) tournamentManager).recreateGroupSize(tournament, numberOfWinners); KendoTournamentLogger.info(this.getClass(), "Updated tournament '{}' with number of winners '{}' by '{}'", tournament, numberOfWinners, updatedBy); - - //Update the shiaijo numbers. - ((TreeTournamentHandler) tournamentManager).adjustGroupsShiaijos(tournament); } else { KendoTournamentLogger.warning(this.getClass(), "Cannot change the number of winners as tournament is of type '{}'.", tournament.getType()); } diff --git a/backend/kendo-tournament-core/src/main/java/com/softwaremagico/kt/core/tournaments/TreeTournamentHandler.java b/backend/kendo-tournament-core/src/main/java/com/softwaremagico/kt/core/tournaments/TreeTournamentHandler.java index 70575840..7a059f04 100644 --- a/backend/kendo-tournament-core/src/main/java/com/softwaremagico/kt/core/tournaments/TreeTournamentHandler.java +++ b/backend/kendo-tournament-core/src/main/java/com/softwaremagico/kt/core/tournaments/TreeTournamentHandler.java @@ -128,6 +128,8 @@ public Group addGroup(Tournament tournament, Group group) { public void recreateGroupSize(Tournament tournament, int numberOfWinners) { groupProvider.delete(tournament, 1); adjustGroupsSize(tournament, numberOfWinners); + //Update the shiaijo numbers. + adjustGroupsShiaijos(tournament); } public void adjustGroupsSize(Tournament tournament, int numberOfWinners) {