Skip to content

Two impovents and one bug fix #1488

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Rabe1402 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Two impovents and one bug fix #1488

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
37dd8ae
fix docker compose psotgres path from #1389
Rabe1402 Dec 23, 2025
2fdf4a5
Improvement: 1:) Tournaments will be now be sorted by time and will b…
Rabe1402 Dec 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ networks:
volumes:
bracket_pg_data:


services:
bracket-backend:
container_name: bracket-backend
Expand Down Expand Up @@ -43,4 +44,4 @@ services:
- bracket_lan
restart: always
volumes:
- bracket_pg_data:/var/lib/postgresql/data
- bracket_pg_data:/var/lib/postgresql
1 change: 1 addition & 0 deletions frontend/public/locales/de/common.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,7 @@
"tournament_title": "Turnier",
"tournaments_title": "Turniere",
"unarchive_tournament_button": "Turnierarchivierung aufheben",
"unplayed_matches_draw_disclaimer": "Solange das Spiel noch nicht gespielt worden ist zählt es automatisch als unentschieden",
"upcoming_matches_empty_table_info": "Bevorstehende Spiele",
"upload_placeholder_team": "Ziehen Sie eine Datei hierher, um sie als Teamlogo hochzuladen.",
"upload_placeholder_tournament": "Ziehen Sie eine Datei hierher, um sie als Tunierlogo hochzuladen.",
Expand Down
1 change: 1 addition & 0 deletions frontend/public/locales/en/common.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,7 @@
"tournament_title": "tournament",
"tournaments_title": "tournaments",
"unarchive_tournament_button": "Unarchive Tournament",
"unplayed_matches_draw_disclaimer": "As long as the match has not been played, it counts automatically as a draw",
"upcoming_matches_empty_table_info": "upcoming matches",
"upload_placeholder_team": "Drop a file here to upload as team logo.",
"upload_placeholder_tournament": "Drop a file here to upload as tournament logo.",
Expand Down
3 changes: 2 additions & 1 deletion frontend/src/components/utils/datetime.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,6 @@ export function formatTime(datetime: string) {
}

export function compareDateTime(datetime1: string, datetime2: string) {
return parseISO(datetime1) > parseISO(datetime2);
return parseISO(datetime1).getTime() - parseISO(datetime2).getTime();
Copy link
Copy Markdown
Owner

@evroon evroon Dec 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
return parseISO(datetime1).getTime() - parseISO(datetime2).getTime();
return dayjs(datetime1) - dayjs(datetime2);

I try to use dayjs now everywhere since that's also what mantine uses

}

2 changes: 1 addition & 1 deletion frontend/src/pages/tournaments/[id]/dashboard/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ export function Schedule({
.sort(
(m1: any, m2: any) =>
compareDateTime(m1.match.start_time, m2.match.start_time) ||
m1.match.court?.name.localeCompare(m2.match.court?.name)
(m1.match.court?.name || '').localeCompare(m2.match.court?.name || '')
);

const rows: React.JSX.Element[] = [];
Expand Down
3 changes: 3 additions & 0 deletions frontend/src/pages/tournaments/[id]/dashboard/standings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,9 @@ export default function DashboardStandingsPage() {
<DoubleHeader tournamentData={tournamentDataFull} />
<Container mt="1rem" px="0rem">
<Container style={{ width: '100%' }} px="sm">
<Text align="center" mb="md" size="sm" c="dimmed">
{t('unplayed_matches_draw_disclaimer')}
</Text>
<StandingsContent
swrStagesResponse={swrStagesResponse}
fontSizeInPixels={16}
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/pages/tournaments/[id]/settings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ function GeneralTournamentForm({
values.dashboard_endpoint,
values.players_can_be_in_multiple_teams,
values.auto_assign_courts,
values.start_time.toISOString(),
new Date(values.start_time).toISOString(),
Copy link
Copy Markdown
Owner

@evroon evroon Dec 23, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this already works right?

If not, it should just be:

Suggested change
new Date(values.start_time).toISOString(),
values.start_time,

values.duration_minutes,
values.margin_minutes
);
Expand Down
Loading