Add Tournaments UI (#32)

Co-authored-by: David Rodenkirchen <drodenkirchen@linetco.com> Reviewed-on: #32
2026-02-03 23:00:58 +00:00
parent ff5d715a4e
commit 54df84a7da
28 changed files with 1116 additions and 56 deletions
@@ -1,32 +1,117 @@
 import logging
+from datetime import datetime
+from typing import Optional

-from rio import Column, Component, event, TextStyle, Text, Spacer
+from from_root import from_root
+from rio import Column, Component, event, TextStyle, Text, Spacer, Row, Image, Tooltip, IconButton, Popup, Rectangle, Dropdown, ThemeContextSwitcher, Button

-from src.ezgg_lan_manager import ConfigurationService
+from src.ezgg_lan_manager import ConfigurationService, TournamentService, UserService
 from src.ezgg_lan_manager.components.MainViewContentBox import MainViewContentBox
+from src.ezgg_lan_manager.types.DateUtil import weekday_to_display_text
+from src.ezgg_lan_manager.types.Participant import Participant
+from src.ezgg_lan_manager.types.Tournament import Tournament
+from src.ezgg_lan_manager.types.TournamentBase import TournamentStatus

 logger = logging.getLogger(__name__.split(".")[-1])

 class ManageTournamentsPage(Component):
+    tournaments: list[Tournament] = []
+    remove_participant_popup_open: bool = False
+    cancel_options: dict[str, Optional[Participant]] = {"": None}
+    tournament_id_selected_for_participant_removal: Optional[int] = None
+    participant_selected_for_removal: Optional[Participant] = None
+
    @event.on_populate
    async def on_populate(self) -> None:
+        self.tournaments = await self.session[TournamentService].get_tournaments()
        await self.session.set_title(f"{self.session[ConfigurationService].get_lan_info().name} - Turnier Verwaltung")

+    async def on_start_pressed(self, tournament_id: int) -> None:
+        logger.info(f"Starting tournament with ID {tournament_id}")
+        await self.session[TournamentService].start_tournament(tournament_id)
+
+    async def on_cancel_pressed(self, tournament_id: int) -> None:
+        logger.info(f"Canceling tournament with ID {tournament_id}")
+        await self.session[TournamentService].cancel_tournament(tournament_id)
+
+    async def on_remove_participant_pressed(self, tournament_id: int) -> None:
+        tournament = await self.session[TournamentService].get_tournament_by_id(tournament_id)
+        if tournament is None:
+            return
+        users = await self.session[UserService].get_all_users()
+        try:
+            self.cancel_options = {next(filter(lambda u: u.user_id == p.id, users)).user_name: p for p in tournament.participants}
+        except StopIteration as e:
+            logger.error(f"Error trying to find user for participant: {e}")
+        self.tournament_id_selected_for_participant_removal = tournament_id
+        self.remove_participant_popup_open = True
+
+    async def on_remove_participant_confirm_pressed(self) -> None:
+        if self.participant_selected_for_removal is not None and self.tournament_id_selected_for_participant_removal is not None:
+            logger.info(f"Removing participant with ID {self.participant_selected_for_removal.id} from tournament with ID {self.tournament_id_selected_for_participant_removal}")
+        await self.session[TournamentService].unregister_user_from_tournament(self.participant_selected_for_removal.id, self.tournament_id_selected_for_participant_removal)
+        await self.on_remove_participant_cancel_pressed()
+
+    async def on_remove_participant_cancel_pressed(self) -> None:
+        self.tournament_id_selected_for_participant_removal = None
+        self.participant_selected_for_removal = None
+        self.remove_participant_popup_open = False
+
    def build(self) -> Component:
-        return Column(
-            MainViewContentBox(
-                Column(
-                    Text(
-                        text="Turnier Verwaltung",
-                        style=TextStyle(
-                            fill=self.session.theme.background_color,
-                            font_size=1.2
-                        ),
-                        margin_top=2,
-                        margin_bottom=2,
-                        align_x=0.5
-                    )
+        tournament_rows = []
+        for tournament in self.tournaments:
+            start_time_color = self.session.theme.background_color
+            if tournament.start_time < datetime.now() and tournament.status == TournamentStatus.OPEN:
+                start_time_color = self.session.theme.warning_color
+
+            tournament_rows.append(
+                Row(
+                    Image(image=from_root(f"src/ezgg_lan_manager/assets/img/games/{tournament.game_title.image_name}"), min_width=1.5, margin_right=1),
+                    Text(tournament.name, style=TextStyle(fill=self.session.theme.background_color, font_size=0.8), justify="left", margin_right=1.5),
+                    Text(f"{weekday_to_display_text(tournament.start_time.weekday())[:2]}.{tournament.start_time.strftime('%H:%M')} Uhr", style=TextStyle(fill=start_time_color, font_size=0.8), justify="left", margin_right=1),
+                    Spacer(),
+                    Tooltip(anchor=IconButton("material/play_arrow", min_size=2, margin_right=0.5, on_press=lambda: self.on_start_pressed(tournament.id)), tip="Starten"),
+                    Tooltip(anchor=IconButton("material/cancel_schedule_send", min_size=2, margin_right=0.5, on_press=lambda: self.on_cancel_pressed(tournament.id)), tip="Absagen"),
+                    Tooltip(anchor=IconButton("material/person_cancel", min_size=2, on_press=lambda: self.on_remove_participant_pressed(tournament.id)), tip="Spieler entfernen"),
+                    margin=1
                )
+            )
+
+        return Column(
+            Popup(
+                anchor=MainViewContentBox(
+                    Column(
+                        Text(
+                            text="Turnier Verwaltung",
+                            style=TextStyle(
+                                fill=self.session.theme.background_color,
+                                font_size=1.2
+                            ),
+                            margin_top=2,
+                            margin_bottom=2,
+                            align_x=0.5
+                        ),
+                        *tournament_rows
+                    )
+                ),
+                content=Rectangle(
+                    content=Row(
+                        ThemeContextSwitcher(
+                            content=Dropdown(options=self.cancel_options, min_width=20, selected_value=self.bind().participant_selected_for_removal), color=self.session.theme.hud_color
+                        ),
+                        Button(content="REMOVE", shape="rectangle", grow_x=False, on_press=self.on_remove_participant_confirm_pressed),
+                        Button(content="CANCEL", shape="rectangle", grow_x=False, on_press=self.on_remove_participant_cancel_pressed),
+                        margin=0.5
+                    ),
+                    min_width=30,
+                    min_height=4,
+                    fill=self.session.theme.primary_color,
+                    margin_top=3.5,
+                    stroke_width=0.3,
+                    stroke_color=self.session.theme.neutral_color,
+                ),
+                is_open=self.remove_participant_popup_open,
+                color="none"
            ),
            Spacer()
-        )
+            )
@@ -0,0 +1,252 @@
+from typing import Optional, Union, Literal
+
+from from_root import from_root
+from rio import Column, Component, event, TextStyle, Text, Row, Image, Spacer, ProgressCircle, Button, Checkbox, ThemeContextSwitcher, Link, Revealer, PointerEventListener, \
+    PointerEvent, Rectangle, Color
+
+from src.ezgg_lan_manager import ConfigurationService, TournamentService, UserService
+from src.ezgg_lan_manager.components.MainViewContentBox import MainViewContentBox
+from src.ezgg_lan_manager.components.TournamentDetailsInfoRow import TournamentDetailsInfoRow
+from src.ezgg_lan_manager.types.DateUtil import weekday_to_display_text
+from src.ezgg_lan_manager.types.Participant import Participant
+from src.ezgg_lan_manager.types.SessionStorage import SessionStorage
+from src.ezgg_lan_manager.types.Tournament import Tournament
+from src.ezgg_lan_manager.types.TournamentBase import TournamentStatus, tournament_status_to_display_text, tournament_format_to_display_texts
+from src.ezgg_lan_manager.types.User import User
+
+
+class TournamentDetailsPage(Component):
+    tournament: Optional[Union[Tournament, str]] = None
+    rules_accepted: bool = False
+    user: Optional[User] = None
+    loading: bool = False
+    participant_revealer_open: bool = False
+    current_tournament_user_list: list[User] = []  # ToDo: Integrate Teams
+
+    # State for message above register button
+    message: str = ""
+    is_success: bool = False
+
+    @event.on_populate
+    async def on_populate(self) -> None:
+        try:
+            tournament_id = int(self.session.active_page_url.query_string.split("id=")[-1])
+        except (ValueError, AttributeError, TypeError):
+            tournament_id = None
+        if tournament_id is not None:
+            self.tournament = await self.session[TournamentService].get_tournament_by_id(tournament_id)
+            if self.tournament is not None:
+                await self.session.set_title(f"{self.session[ConfigurationService].get_lan_info().name} - {self.tournament.name}")
+                self.current_tournament_user_list = await self.session[TournamentService].get_users_from_participant_list(self.tournament.participants)
+        else:
+            await self.session.set_title(f"{self.session[ConfigurationService].get_lan_info().name} - Turniere")
+
+        self.user = await self.session[UserService].get_user(self.session[SessionStorage].user_id)
+
+        self.loading_done()
+
+    def open_close_participant_revealer(self, _: PointerEvent) -> None:
+        self.participant_revealer_open = not self.participant_revealer_open
+
+    async def register_pressed(self) -> None:
+        self.loading = True
+        if not self.user:
+            return
+
+        try:
+            await self.session[TournamentService].register_user_for_tournament(self.user.user_id, self.tournament.id)
+            self.is_success = True
+            self.message = f"Erfolgreich angemeldet!"
+        except Exception as e:
+            self.is_success = False
+            self.message = f"Fehler: {e}"
+        self.loading = False
+        await self.on_populate()
+
+    async def unregister_pressed(self) -> None:
+        self.loading = True
+        if not self.user:
+            return
+
+        try:
+            await self.session[TournamentService].unregister_user_from_tournament(self.user.user_id, self.tournament.id)
+            self.is_success = True
+            self.message = f"Erfolgreich abgemeldet!"
+        except Exception as e:
+            self.is_success = False
+            self.message = f"Fehler: {e}"
+        self.loading = False
+        await self.on_populate()
+
+    async def tree_button_clicked(self) -> None:
+        pass  # ToDo: Implement tournament tree view
+
+    def loading_done(self) -> None:
+        if self.tournament is None:
+            self.tournament = "Turnier konnte nicht gefunden werden"
+        self.session[SessionStorage].subscribe_to_logged_in_or_out_event(str(self.__class__), self.on_populate)
+
+    def build(self) -> Component:
+        if self.tournament is None:
+            content = Column(
+                ProgressCircle(
+                    color="secondary",
+                    align_x=0.5,
+                    margin_top=0,
+                    margin_bottom=0
+                ),
+                min_height=10
+            )
+        elif isinstance(self.tournament, str):
+            content = Row(
+                Text(
+                    text=self.tournament,
+                    style=TextStyle(
+                        fill=self.session.theme.background_color,
+                        font_size=1
+                    ),
+                    margin_top=2,
+                    margin_bottom=2,
+                    align_x=0.5
+                )
+            )
+        else:
+            tournament_status_color = self.session.theme.background_color
+            tree_button = Spacer(grow_x=False, grow_y=False)
+            if self.tournament.status == TournamentStatus.OPEN:
+                tournament_status_color = self.session.theme.success_color
+            elif self.tournament.status == TournamentStatus.CLOSED:
+                tournament_status_color = self.session.theme.danger_color
+            elif self.tournament.status == TournamentStatus.ONGOING or self.tournament.status == TournamentStatus.COMPLETED:
+                tournament_status_color = self.session.theme.warning_color
+                tree_button = Button(
+                    content="Turnierbaum anzeigen",
+                    shape="rectangle",
+                    style="minor",
+                    color="hud",
+                    margin_left=4,
+                    margin_right=4,
+                    margin_top=1,
+                    on_press=self.tree_button_clicked
+                )
+
+            # ToDo: Integrate Teams logic
+            ids_of_participants = [p.id for p in self.tournament.participants]
+            color_key: Literal["hud", "danger"] = "hud"
+            on_press_function = self.register_pressed
+            if self.user and self.user.user_id in ids_of_participants:  # User already registered for tournament
+                button_text = "Abmelden"
+                button_sensitive_hook = True  # User has already accepted the rules previously
+                color_key = "danger"
+                on_press_function = self.unregister_pressed
+            elif self.user and self.user.user_id not in ids_of_participants:
+                button_text = "Anmelden"
+                button_sensitive_hook = self.rules_accepted
+            else:
+                # This should NEVER happen
+                button_text = "Anmelden"
+                button_sensitive_hook = False
+
+            if self.tournament.status != TournamentStatus.OPEN or self.tournament.is_full:
+                button_sensitive_hook = False  # Override button controls if tournament is not open anymore or full
+
+            if self.user:
+                accept_rules_row = Row(
+                    ThemeContextSwitcher(content=Checkbox(is_on=self.bind().rules_accepted, margin_left=4), color=self.session.theme.hud_color),
+                    Text("Ich akzeptiere die ", margin_left=1, style=TextStyle(fill=self.session.theme.background_color, font_size=0.8), overflow="nowrap", justify="right"),
+                    Link(Text("Turnierregeln", margin_right=4, style=TextStyle(fill=self.session.theme.background_color, font_size=0.8, italic=True), overflow="nowrap", justify="left"), "./tournament-rules", open_in_new_tab=True)
+                )
+                button = Button(
+                    content=button_text,
+                    shape="rectangle",
+                    style="major",
+                    color=color_key,
+                    margin_left=2,
+                    margin_right=2,
+                    is_sensitive=button_sensitive_hook,
+                    on_press=on_press_function,
+                    is_loading=self.loading
+                )
+            else:
+                # No UI here if user not logged in
+                accept_rules_row, button = Spacer(), Spacer()
+
+
+
+            content = Column(
+                Row(
+                    Image(image=from_root(f"src/ezgg_lan_manager/assets/img/games/{self.tournament.game_title.image_name}"), margin_right=1),
+                    Text(
+                        text=self.tournament.name,
+                        style=TextStyle(
+                            fill=self.session.theme.background_color,
+                            font_size=1.2
+                        ),
+                        margin_top=1,
+                        margin_bottom=1,
+                        align_x=0.5
+                    ),
+                    margin_right=6,
+                    margin_left=6
+                ),
+                Spacer(min_height=1),
+                TournamentDetailsInfoRow("Status", tournament_status_to_display_text(self.tournament.status), value_color=tournament_status_color),
+                TournamentDetailsInfoRow("Startzeit", f"{weekday_to_display_text(self.tournament.start_time.weekday())}, {self.tournament.start_time.strftime('%H:%M')} Uhr"),
+                TournamentDetailsInfoRow("Format", tournament_format_to_display_texts(self.tournament.format)[0]),
+                TournamentDetailsInfoRow("Best of", tournament_format_to_display_texts(self.tournament.format)[1]),
+                PointerEventListener(
+                    content=Rectangle(
+                        content=TournamentDetailsInfoRow(
+                            "Teilnehmer ▴" if self.participant_revealer_open else "Teilnehmer ▾",
+                            f"{len(self.tournament.participants)} / {self.tournament.max_participants}",
+                            value_color=self.session.theme.danger_color if self.tournament.is_full else self.session.theme.background_color,
+                            key_color=self.session.theme.secondary_color
+                        ),
+                        fill=Color.TRANSPARENT,
+                        cursor="pointer"
+                    ),
+                    on_press=self.open_close_participant_revealer
+                ),
+                Revealer(
+                    header=None,
+                    content=Text(
+                        "\n".join([u.user_name for u in self.current_tournament_user_list]),  # ToDo: Integrate Teams
+                        style=TextStyle(fill=self.session.theme.background_color)
+                    ),
+                    is_open=self.participant_revealer_open,
+                    margin_left=4,
+                    margin_right=4
+                ),
+                tree_button,
+                Row(
+                    Text(
+                        text="Info",
+                        style=TextStyle(
+                            fill=self.session.theme.background_color,
+                            font_size=1.2
+                        ),
+                        margin_top=1,
+                        margin_bottom=1,
+                        align_x=0.5
+                    )
+                ),
+                # FixMe: Use rio.Markdown with correct TextStyle instead to allow basic text formatting from DB-side.
+                Text(self.tournament.description, margin_left=2, margin_right=2, style=TextStyle(fill=self.session.theme.background_color, font_size=1), overflow="wrap"),
+                Spacer(min_height=2),
+                accept_rules_row,
+                Spacer(min_height=0.5),
+                Text(self.message, margin_left=2, margin_right=2, style=TextStyle(fill=self.session.theme.success_color if self.is_success else self.session.theme.danger_color, font_size=1), overflow="wrap", justify="center"),
+                Spacer(min_height=0.5),
+                button
+            )
+
+        return Column(
+            MainViewContentBox(
+                Column(
+                    Spacer(min_height=1),
+                    content,
+                    Spacer(min_height=1)
+                )
+            ),
+            align_y=0
+        )
@@ -0,0 +1,52 @@
+from rio import Column, Component, event, TextStyle, Text, Spacer
+
+from src.ezgg_lan_manager import ConfigurationService
+from src.ezgg_lan_manager.components.MainViewContentBox import MainViewContentBox
+
+RULES: list[str] = [
+    "Den Anweisungen der Turnierleitung ist stets Folge zu leisten.",
+    "Teilnehmer müssen aktiv dafür sorgen, dass Spiele ohne Verzögerungen stattfinden.",
+    "Unvollständige Teams werden ggf. zum Turnierstart entfernt.",
+    "Verzögerungen und Ausfälle sind er Turnierleitung sofort zu melden.",
+    "Jeder Spieler erstellt Screenshots am Rundenende zur Ergebnisdokumentation.",
+    "Der Verlierer trägt das Ergebnis ein, der Gewinner überprüft es.",
+    "Bei fehlendem oder falschem Ergebnis, ist sofort die Turnierorganisation zu informieren.",
+    "Von 02:00–11:00 Uhr besteht keine Spielpflicht",
+    "Täuschung, Falschangaben sowie Bugusing und Cheaten führen zur sofortigen Disqualifikation."
+]
+
+class TournamentRulesPage(Component):
+    @event.on_populate
+    async def on_populate(self) -> None:
+        await self.session.set_title(f"{self.session[ConfigurationService].get_lan_info().name} - Turnierregeln")
+
+    def build(self) -> Component:
+        return Column(
+            MainViewContentBox(
+                Column(
+                    Text(
+                        text="Turnierregeln",
+                        style=TextStyle(
+                            fill=self.session.theme.background_color,
+                            font_size=1.2
+                        ),
+                        margin_top=2,
+                        margin_bottom=2,
+                        align_x=0.5
+                    ),
+                    *[Text(
+                        f"{idx + 1}. {rule}",
+                        style=TextStyle(
+                            fill=self.session.theme.background_color,
+                            font_size=0.9
+                        ),
+                        margin_bottom=0.8,
+                        margin_left=1,
+                        margin_right=1,
+                        overflow="wrap"
+                    ) for idx, rule in enumerate(RULES)],
+                    Spacer(min_height=1)
+                )
+            ),
+            Spacer(grow_y=True)
+        )
@@ -1,15 +1,50 @@
-from rio import Column, Component, event, TextStyle, Text
+from rio import Column, Component, event, TextStyle, Text, Spacer, ProgressCircle

-from src.ezgg_lan_manager import ConfigurationService
+from src.ezgg_lan_manager import ConfigurationService, TournamentService
 from src.ezgg_lan_manager.components.MainViewContentBox import MainViewContentBox
+from src.ezgg_lan_manager.components.TournamentPageRow import TournamentPageRow
+from src.ezgg_lan_manager.types.Tournament import Tournament


 class TournamentsPage(Component):
+    tournament_data: list[Tournament] = []
+
    @event.on_populate
    async def on_populate(self) -> None:
+        self.tournament_data = await self.session[TournamentService].get_tournaments()
        await self.session.set_title(f"{self.session[ConfigurationService].get_lan_info().name} - Turniere")

+    def tournament_clicked(self, tournament_id: int) -> None:
+        self.session.navigate_to(f"tournament?id={tournament_id}")
+
    def build(self) -> Component:
+        tournament_page_rows = []
+        for tournament in self.tournament_data:
+            tournament_page_rows.append(
+                TournamentPageRow(
+                    tournament.id,
+                    tournament.name,
+                    tournament.game_title.image_name,
+                    len(tournament.participants),
+                    tournament.max_participants,
+                    tournament.status,
+                    self.tournament_clicked
+                )
+            )
+
+        if len(self.tournament_data) == 0:
+            content = [Column(
+                ProgressCircle(
+                    color="secondary",
+                    align_x=0.5,
+                    margin_top=0,
+                    margin_bottom=0
+                ),
+                min_height=10
+            )]
+        else:
+            content = tournament_page_rows
+
        return Column(
            MainViewContentBox(
                Column(
@@ -20,18 +55,11 @@ class TournamentsPage(Component):
                            font_size=1.2
                        ),
                        margin_top=2,
-                        margin_bottom=0,
+                        margin_bottom=2,
                        align_x=0.5
                    ),
-                    Text(
-                        text="Aktuell ist noch kein Turnierplan hinterlegt.",
-                        style=TextStyle(
-                            fill=self.session.theme.background_color,
-                            font_size=0.9
-                        ),
-                        margin=1,
-                        overflow="wrap"
-                    )
+                    *content,
+                    Spacer(min_height=1)
                )
            ),
            align_y=0
@@ -20,3 +20,5 @@ from .ManageUsersPage import ManageUsersPage
 from .ManageCateringPage import ManageCateringPage
 from .ManageTournamentsPage import ManageTournamentsPage
 from .OverviewPage import OverviewPage
+from .TournamentDetailsPage import TournamentDetailsPage
+from .TournamentRulesPage import TournamentRulesPage