From df6784f5935d16717a1cc07a1f09b97613bd2270 Mon Sep 17 00:00:00 2001 From: Kalle <38327916+Sendouc@users.noreply.github.com> Date: Sun, 5 Jan 2025 11:46:05 +0200 Subject: [PATCH] Fix can't prepare maps in two day tournaments --- app/features/tournament-bracket/core/Tournament.ts | 3 +++ app/features/tournament-bracket/routes/to.$id.brackets.tsx | 2 ++ 2 files changed, 5 insertions(+) diff --git a/app/features/tournament-bracket/core/Tournament.ts b/app/features/tournament-bracket/core/Tournament.ts index 4acb15a52..b2c21762e 100644 --- a/app/features/tournament-bracket/core/Tournament.ts +++ b/app/features/tournament-bracket/core/Tournament.ts @@ -14,6 +14,7 @@ import { modesShort, rankedModesShort } from "~/modules/in-game-lists/modes"; import { isAdmin } from "~/permissions"; import { removeDuplicates } from "~/utils/arrays"; import { + databaseTimestampNow, databaseTimestampToDate, dateToDatabaseTimestamp, } from "~/utils/dates"; @@ -198,6 +199,7 @@ export class Tournament { sources, createdAt: null, canBeStarted: + (!startTime || startTime < databaseTimestampNow()) && checkedInTeams.length >= TOURNAMENT.ENOUGH_TEAMS_TO_START && (sources ? relevantMatchesFinished : this.regularCheckInHasEnded), teamsPendingCheckIn: @@ -242,6 +244,7 @@ export class Tournament { sources, createdAt: null, canBeStarted: + (!startTime || startTime < databaseTimestampNow()) && checkedInTeamsWithReplaysAvoided.length >= TOURNAMENT.ENOUGH_TEAMS_TO_START && (sources ? relevantMatchesFinished : this.regularCheckInHasEnded), diff --git a/app/features/tournament-bracket/routes/to.$id.brackets.tsx b/app/features/tournament-bracket/routes/to.$id.brackets.tsx index 68536569b..64d9cf2ba 100644 --- a/app/features/tournament-bracket/routes/to.$id.brackets.tsx +++ b/app/features/tournament-bracket/routes/to.$id.brackets.tsx @@ -471,6 +471,8 @@ export default function TournamentBracketsPage() { ⚠️{" "} {bracketIdx === 0 ? ( <>Tournament start time is in the future + ) : bracket.startTime && bracket.startTime > new Date() ? ( + <>Bracket start time is in the future ) : ( <>Teams pending from the previous bracket )}{" "}