feature/137-improve-catering-ui (#68)

Co-authored-by: David Rodenkirchen <davidr.develop@gmail.com>
Reviewed-on: #68

VERSION

@@ -1 +1 @@
-0.3.7
+0.5.1

docker-compose.yml

@@ -31,6 +31,7 @@ services:
       - database:/var/lib/mysql
       - ./sql/create_database.sql:/docker-entrypoint-initdb.d/init.sql
       - ./sql:/sql
+      - ./tournament_data:/opt/ezgg-lan-manager/tournament_data
 
 
 volumes:

src/EzggLanManager.py

@@ -1,14 +1,14 @@
 import logging
+from uuid import uuid4
 
 import sys
 
 from pathlib import Path
-from uuid import uuid4
 
 from rio import App, Theme, Color, Font, ComponentPage, Session
 from from_root import from_root
 
-from src.ezgg_lan_manager import pages, init_services, LocalDataService
+from src.ezgg_lan_manager import pages, init_services, LocalDataService, RefreshService
 from src.ezgg_lan_manager.helpers.LoggedInGuard import logged_in_guard, not_logged_in_guard, team_guard
 from src.ezgg_lan_manager.services.LocalDataService import LocalData
 from src.ezgg_lan_manager.types.UserSession import UserSession
@@ -38,6 +38,7 @@ if __name__ == "__main__":
         # Use this line to fake being any user without having to log in
         # session.attach(UserSession(id=uuid4(), user_id=30, is_team_member=True))
         await session.set_title(lan_info.name)
+        session.attach(RefreshService())
         if session[LocalData].stored_session_token:
             user_session = session[LocalDataService].verify_token(session[LocalData].stored_session_token)
             if user_session is not None:
@@ -155,6 +156,12 @@ if __name__ == "__main__":
                 build=pages.ManageCateringPage,
                 guard=team_guard
             ),
+            ComponentPage(
+                name="NewPosOrderPage",
+                url_segment="new-pos-order",
+                build=pages.NewPosOrderPage,
+                guard=team_guard
+            ),
             ComponentPage(
                 name="ManageTournamentsPage",
                 url_segment="manage-tournaments",
@@ -177,6 +184,11 @@ if __name__ == "__main__":
                 url_segment="tournament",
                 build=pages.TournamentDetailsPage,
             ),
+            ComponentPage(
+                name="TournamentTreePage",
+                url_segment="tournament-tree",
+                build=pages.TournamentTreePage,
+            ),
             ComponentPage(
                 name="TournamentRulesPage",
                 url_segment="tournament-rules",
@@ -216,7 +228,14 @@ if __name__ == "__main__":
         }
     )
 
-    sys.exit(app.run_as_web_server(
+    try:
-        host="0.0.0.0",
+        app.run_as_web_server(
-        port=8000,
+            host="0.0.0.0",
-    ))
+            port=8000,
+        )
+    except (KeyboardInterrupt, SystemExit):
+        logger.info("EZGG LAN Manager was shut down.")
+        sys.exit(0)
+    except Exception as e:
+        logger.error(e)
+        sys.exit(1)

src/ezgg_lan_manager/__init__.py

@@ -20,7 +20,7 @@ from src.ezgg_lan_manager.services.UserService import UserService
 from src.ezgg_lan_manager.types import *
 
 # Inits services in the correct order
-def init_services() -> tuple[AccountingService, CateringService, ConfigurationService, DatabaseService, MailingService, NewsService, SeatingService, TicketingService, UserService, LocalDataService, ReceiptPrintingService, TournamentService, TeamService, RefreshService]:
+def init_services() -> tuple[AccountingService, CateringService, ConfigurationService, DatabaseService, MailingService, NewsService, SeatingService, TicketingService, UserService, LocalDataService, ReceiptPrintingService, TournamentService, TeamService]:
     logging.basicConfig(level=logging.DEBUG)
     configuration_service = ConfigurationService(from_root("config.toml"))
     db_service = DatabaseService(configuration_service.get_database_configuration())
@@ -37,4 +37,4 @@ def init_services() -> tuple[AccountingService, CateringService, ConfigurationSe
     team_service = TeamService(db_service)
     refresh_service = RefreshService()
 
-    return accounting_service, catering_service, configuration_service, db_service, mailing_service, news_service, seating_service, ticketing_service, user_service, local_data_service, receipt_printing_service, tournament_service, team_service, refresh_service
+    return accounting_service, catering_service, configuration_service, db_service, mailing_service, news_service, seating_service, ticketing_service, user_service, local_data_service, receipt_printing_service, tournament_service, team_service

src/ezgg_lan_manager/components/CateringManagementOrderDisplay.py

@@ -1,29 +1,30 @@
+import logging
+from asyncio import create_task, sleep
 from functools import partial
 from typing import Optional, Callable
 
-from rio import Component, Row, Card, Column, Text, TextStyle, Spacer, PointerEventListener, Button
+from rio import Component, Row, Card, Column, Text, TextStyle, Spacer, PointerEventListener, Button, Rectangle, Popup, Icon, Color
 
+from src.ezgg_lan_manager import ReceiptPrintingService
+from src.ezgg_lan_manager.components.StatusChangePopup import StatusChangePopup
 from src.ezgg_lan_manager.services.CateringService import CateringService
 from src.ezgg_lan_manager.types.CateringOrder import CateringOrder, CateringOrderStatus
 from src.ezgg_lan_manager.types.Seat import Seat
 
-class CateringManagementOrderDisplayStatusButton(Component):
+logger = logging.getLogger(__name__.split(".")[-1])
-    status: CateringOrderStatus
-    clicked_cb: Callable
-    def build(self) -> Component:
-        return Button(
-            content=Text(
-                CateringOrder.translate_order_status(self.status)
-            ),
-            shape="rectangle",
-            on_press=partial(self.clicked_cb, self.status)
-        )
 
 
 class CateringManagementOrderDisplay(Component):
     order: CateringOrder
     seat: Optional[Seat]
     clicked_cb: Callable
+    status_change_popup_open: bool = False
+
+    def reprint_order(self) -> None:
+        create_task(self.session[ReceiptPrintingService].print_order(self.order.customer, self.order))
+
+    def open_status_change_popup(self) -> None:
+        self.status_change_popup_open = True
 
     def format_order_status(self, status: CateringOrderStatus) -> Text:
         status_text = CateringOrder.translate_order_status(status)
@@ -36,14 +37,12 @@ class CateringManagementOrderDisplay(Component):
 
         return Text(text=status_text, style=TextStyle(fill=color))
 
-    async def status_button_clicked(self, new_status: CateringOrderStatus) -> None:
+    async def change_status(self, new_status: CateringOrderStatus) -> Optional[str]:
-        if self.order.status == CateringOrderStatus.CANCELED:
+        await sleep(1)
-            return
 
-        if new_status == CateringOrderStatus.CANCELED:
+        logger.debug(f"Status of order with ID {self.order.order_id} changing from {self.order.status} to {new_status}")
-            # ToDo: Hier sollten wir nochmal nachfragen ob der Bediener sich wirklich sicher ist,
+        if self.order.status == CateringOrderStatus.CANCELED:  # Can not un-cancel
-            #       und anwarnen das eine stornierte Bestellung nicht ent-storniert werden kann.
+            return "Stornierte Bestellungen können nicht angepasst werden"
-            pass
 
         if self.order.status != new_status:
             if new_status == CateringOrderStatus.CANCELED:
@@ -61,43 +60,58 @@ class CateringManagementOrderDisplay(Component):
                     is_delivery=self.order.is_delivery
                 )
 
+        self.status_change_popup_open = False
+
+
     def build(self) -> Component:
-        return PointerEventListener(
+        card = Card(
-            content=Card(
+            content=Column(
-                content=Column(
+                Row(
-                    Row(
+                    Text(f"ID: {self.order.order_id}", margin_left=0.3, margin_top=0.2, justify="center", style=TextStyle(font_size=1.2)),
-                        Text(f"ID: {self.order.order_id}", margin_left=0.3, margin_top=0.2, justify="center", style=TextStyle(font_size=1.2)),
-                    ),
-                    Row(
-                        Text(f"Status: ", margin_left=0.3, margin_top=0.2),
-                        self.format_order_status(self.order.status),
-                        Spacer(),
-                        Text(self.order.order_date.strftime("%d.%m. - %H:%M Uhr"), margin_right=0.3),
-                    ),
-                    Row(
-                        Text(f"Gast: {self.order.customer.user_name}", margin_left=0.3),
-                        Spacer(),
-                        Text(f"Sitzplatz: {'-' if not self.seat else self.seat.seat_id}", margin_right=0.3),
-                    ),
-                    Row(
-                        Text("Diese Bestellung wird:", margin_left=0.3, margin_bottom=0.5),
-                        Spacer(),
-                        Text("Geliefert" if self.order.is_delivery else "Abgeholt", margin_right=0.3, margin_bottom=0.5),
-                    ),
-                    Row(
-                        CateringManagementOrderDisplayStatusButton(CateringOrderStatus.RECEIVED, self.status_button_clicked),
-                        CateringManagementOrderDisplayStatusButton(CateringOrderStatus.CANCELED, self.status_button_clicked),
-                        CateringManagementOrderDisplayStatusButton(CateringOrderStatus.EN_ROUTE, self.status_button_clicked)
-                    ),
-                    Row(
-                        CateringManagementOrderDisplayStatusButton(CateringOrderStatus.READY_FOR_PICKUP, self.status_button_clicked),
-                        CateringManagementOrderDisplayStatusButton(CateringOrderStatus.COMPLETED, self.status_button_clicked),
-                        CateringManagementOrderDisplayStatusButton(CateringOrderStatus.DELAYED, self.status_button_clicked),
-                    )
                 ),
-                color=self.session.theme.hud_color,
+                Row(
-                colorize_on_hover=True,
+                    Text(f"Status: ", margin_left=0.3, margin_top=0.2),
-                margin=1
+                    self.format_order_status(self.order.status),
+                    Spacer(),
+                    Text(self.order.order_date.strftime("%d.%m. - %H:%M Uhr"), margin_right=0.3),
+                ),
+                Row(
+                    Text(f"Gast: {self.order.customer.user_name}", margin_left=0.3),
+                    Spacer(),
+                    Text(f"Sitzplatz: {'-' if not self.seat else self.seat.seat_id}", margin_right=0.3),
+                ),
+                Row(
+                    Text("Diese Bestellung wird:", margin_left=0.3, margin_bottom=0.5),
+                    Spacer(),
+                    Text("Geliefert" if self.order.is_delivery else "Abgeholt", margin_right=0.3, margin_bottom=0.5),
+                ),
+                Row(
+                    Rectangle(
+                        content=Button(
+                            content=Text("Beleg drucken", justify="left"),
+                            shape="rectangle",
+                            on_press=self.reprint_order
+                        ),
+                        stroke_width=0.1
+                    ),
+                    Rectangle(
+                        content=Button(
+                            content=Text("Status ändern", justify="right"),
+                            shape="rectangle",
+                            on_press=self.open_status_change_popup
+                        ),
+                        stroke_width=0.1
+                    ),
+                )
             ),
+            color=self.session.theme.hud_color,
+            colorize_on_hover=True,
+            margin=1
+        )
+
+        status_change_popup = StatusChangePopup(card, self.status_change_popup_open, self.change_status)
+
+        return PointerEventListener(
+            content=status_change_popup,
             on_press=partial(self.clicked_cb, self.order)
         )

src/ezgg_lan_manager/components/StatusChangePopup.py

@@ -0,0 +1,92 @@
+from functools import partial
+from typing import Callable, Optional
+
+from rio import Column, Row, Text, Button, Component, Icon, Popup, Rectangle, Color, Tooltip, PointerEventListener, PointerEvent, ProgressCircle
+
+from src.ezgg_lan_manager.types.CateringOrder import CateringOrderStatus, CateringOrder
+
+ICONS_BY_STATUS = {
+    CateringOrderStatus.RECEIVED: "material/move_to_inbox",
+    CateringOrderStatus.DELAYED: "material/hourglass_top",
+    CateringOrderStatus.READY_FOR_PICKUP: "material/takeout_dining",
+    CateringOrderStatus.EN_ROUTE: "material/local_shipping",
+    CateringOrderStatus.COMPLETED: "material/check_circle",
+    CateringOrderStatus.CANCELED: "material/cancel",
+}
+
+
+class StatusChangeButton(Component):
+    status: CateringOrderStatus
+    clicked_cb: Callable
+
+    def build(self) -> Component:
+        return Tooltip(
+            anchor=PointerEventListener(
+                content=Rectangle(
+                    fill=Color.TRANSPARENT,
+                    content=Column(
+                        Icon(
+                            icon=ICONS_BY_STATUS[self.status]
+                        )
+                    ),
+                    stroke_width=0.1,
+                    stroke_color=Color.TRANSPARENT,
+                    hover_stroke_width=0.1,
+                    hover_stroke_color=Color.BLACK
+                ),
+                on_press=partial(self.clicked_cb, self.status)
+            ),
+            tip=Text(text=CateringOrder.translate_order_status(self.status)),
+            position="top"
+        )
+
+
+class StatusChangePopup(Component):
+    anchor: Component
+    popup_open: bool
+    status_should_change_cb: Callable
+    response: Optional[str] = None
+    is_loading: bool = False
+
+    async def handle_button_clicked(self, status: CateringOrderStatus, _: PointerEvent) -> None:
+        self.is_loading = True
+        self.response = await self.status_should_change_cb(status)
+        self.is_loading = False
+
+    def close(self) -> None:
+        self.popup_open = False
+
+    def build(self) -> Component:
+        if self.is_loading:
+            content = Row(
+                ProgressCircle(margin=1)
+            )
+        elif self.response:
+            content = Row(
+                Text(text=self.response, justify="center", overflow="wrap", margin=1)
+            )
+        else:
+            content = Row(
+                StatusChangeButton(CateringOrderStatus.RECEIVED, self.handle_button_clicked),
+                StatusChangeButton(CateringOrderStatus.DELAYED, self.handle_button_clicked),
+                StatusChangeButton(CateringOrderStatus.READY_FOR_PICKUP, self.handle_button_clicked),
+                StatusChangeButton(CateringOrderStatus.EN_ROUTE, self.handle_button_clicked),
+                StatusChangeButton(CateringOrderStatus.COMPLETED, self.handle_button_clicked),
+                StatusChangeButton(CateringOrderStatus.CANCELED, self.handle_button_clicked),
+                spacing=0.5,
+                margin=0.5
+            )
+        return Popup(
+            anchor=self.anchor,
+            content=Rectangle(
+                content=Column(
+                    content,
+                    Button(content=Text(text="Abbrechen", justify="center", fill=self.session.theme.secondary_color), shape="rectangle", style="colored-text", on_press=self.close),
+                    proportions=[2.5, 1]
+                ),
+                fill=self.session.theme.hud_color,
+                min_width=34,
+                min_height=8.3
+            ),
+            is_open=self.popup_open
+        )

src/ezgg_lan_manager/components/UserInfoBox.py

@@ -68,9 +68,10 @@ class UserInfoBox(Component):
     @event.on_populate
     async def async_init(self) -> None:
         self.user = await self.session[UserService].get_user(self.user_id)
-        self.user_balance = await self.session[AccountingService].get_balance(self.user.user_id)
+        if self.user is not None:
-        self.user_ticket = await self.session[TicketingService].get_user_ticket(self.user.user_id)
+            self.user_balance = await self.session[AccountingService].get_balance(self.user.user_id)
-        self.user_seat = await self.session[SeatingService].get_user_seat(self.user.user_id)
+            self.user_ticket = await self.session[TicketingService].get_user_ticket(self.user.user_id)
+            self.user_seat = await self.session[SeatingService].get_user_seat(self.user.user_id)
         self.session[AccountingService].add_update_hook(self.update)
 
     async def update(self) -> None:

src/ezgg_lan_manager/pages/CateringPage.py

@@ -18,7 +18,6 @@ class CateringPage(Component):
 
     @event.on_populate
     async def on_populate(self) -> None:
-        self.session[RefreshService].subscribe(self.on_populate)
         await self.session.set_title(f"{self.session[ConfigurationService].get_lan_info().name} - Catering")
         self.all_menu_items = await self.session[CateringService].get_menu()
 

src/ezgg_lan_manager/pages/ManageCateringPage.py

@@ -3,7 +3,7 @@ from dataclasses import field, dataclass
 from datetime import datetime
 from typing import Optional, Callable
 
-from rio import Column, Component, event, TextStyle, Text, Spacer, PointerEvent, Button, Popup, Card, Row
+from rio import Column, Component, event, TextStyle, Text, Spacer, PointerEvent, Button, Popup, Card, Row, Rectangle, Color, PointerEventListener
 
 from src.ezgg_lan_manager import ConfigurationService, CateringService, SeatingService, AccountingService
 from src.ezgg_lan_manager.components.CateringManagementOrderDisplay import CateringManagementOrderDisplay
@@ -106,6 +106,7 @@ class ManageCateringPage(Component):
         return sorted_list
 
     async def order_clicked(self, order: CateringOrder, _: PointerEvent) -> None:
+        await self.update_orders()
         self.order_popup_order = order
         self.order_popup_open = True
 
@@ -120,7 +121,7 @@ class ManageCateringPage(Component):
                 font_size=1.2
             ),
             margin_top=2,
-            margin_bottom=2,
+            margin_bottom=1,
             align_x=0.5
         )
         popup = Popup(
@@ -132,7 +133,26 @@ class ManageCateringPage(Component):
         )
         return Column(
             MainViewContentBox(
-                Column(popup)
+                Column(
+                    popup,
+                    PointerEventListener(
+                        content=Rectangle(
+                            content=Text(text="Neue Bestellung anlegen", fill=Color.WHITE, justify="center", margin=0.3),
+                            margin_bottom=1,
+                            margin_right=5,
+                            margin_left=5,
+                            fill=self.session.theme.secondary_color,
+                            hover_fill=self.session.theme.hud_color,
+                            stroke_width=0.2,
+                            stroke_color=Color.TRANSPARENT,
+                            hover_stroke_width=0.2,
+                            hover_stroke_color=self.session.theme.background_color,
+                            cursor="pointer",
+                            transition_time=0.1
+                        ),
+                        on_press=lambda _: self.session.navigate_to("new-pos-order")
+                    )
+                )
             ),
             MainViewContentBox(
                 Column(

src/ezgg_lan_manager/pages/ManageTournamentsPage.py

@@ -11,7 +11,7 @@ from src.ezgg_lan_manager.components.MainViewContentBox import MainViewContentBo
 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
+from src.ezgg_lan_manager.types.TournamentBase import TournamentStatus, TournamentError
 
 logger = logging.getLogger(__name__.split(".")[-1])
 
@@ -29,7 +29,10 @@ class ManageTournamentsPage(Component):
 
     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)
+        try:
+            await self.session[TournamentService].start_tournament(tournament_id)
+        except TournamentError as e:
+            logger.error(f"Error trying to start tournament: {e}")
 
     async def on_cancel_pressed(self, tournament_id: int) -> None:
         logger.info(f"Canceling tournament with ID {tournament_id}")
@@ -92,9 +95,17 @@ class ManageTournamentsPage(Component):
                                 font_size=1.2
                             ),
                             margin_top=2,
-                            margin_bottom=2,
+                            margin_bottom=1,
                             align_x=0.5
                         ),
+                        Button(
+                            content="Cache erneuern",
+                            shape="rectangle",
+                            style="colored-text",
+                            margin_bottom=2,
+                            align_x=0.5,
+                            on_press=self.session[TournamentService].queue_cache_renewal
+                        ),
                         *tournament_rows
                     )
                 ),

src/ezgg_lan_manager/pages/NewPosOrderPage.py

@@ -0,0 +1,417 @@
+import logging
+from asyncio import sleep, create_task
+from decimal import Decimal
+from typing import Optional, Callable
+
+from rio import Column, Component, event, TextStyle, Text, Spacer, Revealer, ProgressCircle, ScrollContainer, Row, Popup, List, Rectangle, PointerEventListener, \
+    PointerEvent, TextInput, TextInputChangeEvent
+
+from src.ezgg_lan_manager import ConfigurationService, CateringService, AccountingService
+from src.ezgg_lan_manager.components.CateringCartItem import CateringCartItem
+from src.ezgg_lan_manager.components.CateringSelectionItem import CateringSelectionItem
+from src.ezgg_lan_manager.components.MainViewContentBox import MainViewContentBox
+from src.ezgg_lan_manager.services.CateringService import CateringError, CateringErrorType
+from src.ezgg_lan_manager.types.CateringMenuItem import CateringMenuItemCategory, CateringMenuItem
+from src.ezgg_lan_manager.types.CateringOrder import CateringMenuItemsWithAmount
+from src.ezgg_lan_manager.types.UserSession import UserSession
+
+POPUP_CLOSE_TIMEOUT_SECONDS = 3
+logger = logging.getLogger(__name__.split(".")[-1])
+
+class Cart(Component):
+    cart: List[CateringMenuItem]
+    user_id: Optional[int]
+    clear_cb: Callable
+    order_button_loading: bool = False
+    popup_message: str = ""
+    popup_is_shown: bool = False
+    popup_is_error: bool = True
+
+    async def on_remove_item(self, list_id: int) -> None:
+        try:
+            self.cart.pop(list_id)
+        except IndexError:
+            return
+
+    async def on_empty_cart_pressed(self, _: PointerEvent) -> None:
+        self.cart.clear()
+
+    async def show_popup(self, text: str, is_error: bool) -> None:
+        self.popup_is_error = is_error
+        self.popup_message = text
+        self.popup_is_shown = True
+        self.force_refresh()
+        await sleep(POPUP_CLOSE_TIMEOUT_SECONDS)
+        self.popup_is_shown = False
+        self.force_refresh()
+
+    async def on_order_pressed(self, _: PointerEvent) -> None:
+        if self.user_id is None:
+            return
+        self.order_button_loading = True
+        self.force_refresh()
+
+        show_popup_task = None
+        if len(self.cart) < 1:
+            show_popup_task = create_task(self.show_popup("Warenkorb leer", True))
+        else:
+            items_with_amounts: CateringMenuItemsWithAmount = {}
+            for item in self.cart:
+                try:
+                    items_with_amounts[item] += 1
+                except KeyError:
+                    items_with_amounts[item] = 1
+            try:
+                await self.session[CateringService].place_order(items_with_amounts, self.user_id, is_delivery=False)
+            except CateringError as catering_error:
+                logger.error(catering_error)
+                if catering_error.error_type == CateringErrorType.INCLUDES_DISABLED_ITEM:
+                    show_popup_task = create_task(self.show_popup("Warenkorb enthält gesperrte Artikel", True))
+                elif catering_error.error_type == CateringErrorType.INSUFFICIENT_FUNDS:
+                    show_popup_task = create_task(self.show_popup("Guthaben nicht ausreichend", True))
+                else:
+                    show_popup_task = create_task(self.show_popup(f"Unbekannter Fehler: {catering_error}", True))
+            else:
+                self.cart.clear()
+                self.user_id = None
+                await self.clear_cb()
+        self.order_button_loading = False
+        if not show_popup_task:
+            show_popup_task = create_task(self.show_popup("Bestellung erfolgreich aufgegeben!", False))
+
+    def build(self) -> Component:
+        cart_container = ScrollContainer(
+            content=Column(
+                *[CateringCartItem(
+                    article_name=cart_item.name,
+                    article_price=cart_item.price,
+                    article_id=cart_item.item_id,
+                    remove_item_cb=self.on_remove_item,
+                    list_id=idx
+                ) for idx, cart_item in enumerate(self.cart)],
+                Spacer(grow_y=True)
+            ),
+            min_height=8,
+            min_width=33,
+            margin=1
+        )
+        return Column(
+                Popup(
+                    anchor=cart_container,
+                    content=Text(self.popup_message, style=TextStyle(fill=self.session.theme.danger_color if self.popup_is_error else self.session.theme.success_color), overflow="wrap", margin=2, justify="center", min_width=20),
+                    is_open=self.popup_is_shown,
+                    position="center",
+                    color=self.session.theme.primary_color
+                ),
+                Row(
+                    Text(
+                        text=f"Preis: {AccountingService.make_euro_string_from_decimal(sum((cart_item.price for cart_item in self.cart), Decimal(0)))}",
+                        style=TextStyle(
+                            fill=self.session.theme.background_color,
+                            font_size=0.8
+                        ),
+                        margin=1
+                    ),
+                    PointerEventListener(
+                        content=Rectangle(
+                            content=Text(
+                                "Warenkorb leeren",
+                                style=TextStyle(fill=self.session.theme.danger_color, font_size=0.9),
+                                justify="center",
+                                margin=0.2
+                            ),
+                            hover_fill=self.session.theme.hud_color,
+                            transition_time=0.1,
+                            margin=0.5,
+                            cursor="pointer"
+                        ),
+                        on_press=self.on_empty_cart_pressed
+                    ),
+                    PointerEventListener(
+                        content=Rectangle(
+                            content=Text(
+                                "Bestellen",
+                                style=TextStyle(fill=self.session.theme.success_color, font_size=0.9),
+                                justify="center",
+                                margin=0.2
+                            ),
+                            hover_fill=self.session.theme.hud_color if self.user_id is not None else self.session.theme.danger_color,
+                            transition_time=0.1,
+                            margin=0.5,
+                            cursor="pointer" if self.user_id is not None else "not-allowed"
+                        ),
+                        on_press=self.on_order_pressed
+                    )
+                )
+        )
+
+
+class NewPosOrderPage(Component):
+    user_id_input_value: str = ""
+    user_id: Optional[int] = None
+    all_menu_items: Optional[list[CateringMenuItem]] = None
+    cart: List[CateringMenuItem] = List()
+
+
+    @event.on_populate
+    async def on_populate(self) -> None:
+        await self.session.set_title(f"{self.session[ConfigurationService].get_lan_info().name} - Neue Bestellung anlegen")
+        self.all_menu_items = await self.session[CateringService].get_menu()
+
+    async def on_user_logged_in_status_changed(self) -> None:
+        self.force_refresh()
+
+    async def on_user_id_input_change(self, change_event: TextInputChangeEvent) -> None:
+        try:
+            id_ = int(change_event.text)
+        except ValueError:
+            return
+
+        self.user_id = id_
+        
+    async def on_add(self, article_id: int) -> None:
+        try:
+            menu_item = await self.session[CateringService].get_menu_item_by_id(article_id)
+        except CateringError as e:
+            logger.error(e)
+            return
+        self.cart.append(menu_item)
+
+    @staticmethod
+    def get_menu_items_by_category(all_menu_items: list[CateringMenuItem], category: Optional[CateringMenuItemCategory]) -> list[CateringMenuItem]:
+        return list(filter(lambda item: item.category == category, all_menu_items))
+
+    async def clear_user_id_input(self) -> None:
+        self.user_id_input_value = ""
+
+    def build(self) -> Component:
+        try:
+            is_team_member = self.session[UserSession].is_team_member
+        except KeyError:
+            is_team_member = False
+
+
+        shopping_cart_container = MainViewContentBox(
+            Column(
+                Text(
+                    text="Neue Bestellung anlegen",
+                    style=TextStyle(
+                        fill=self.session.theme.background_color,
+                        font_size=1.2
+                    ),
+                    margin_top=2,
+                    margin_bottom=0.5,
+                    align_x=0.5
+                ),
+                TextInput(text=self.bind().user_id_input_value, label="Nutzer ID", on_change=self.on_user_id_input_change, change_delay=1, margin_bottom=0.5, margin_left=5, margin_right=5),
+                Cart(cart=self.cart, user_id=self.user_id, clear_cb=self.clear_user_id_input)
+            )
+        ) if is_team_member else Spacer()
+
+        menu = [MainViewContentBox(
+            ProgressCircle(
+                color="secondary",
+                align_x=0.5,
+                margin_top=2,
+                margin_bottom=2
+            )
+        )] if not self.all_menu_items else [MainViewContentBox(
+            Revealer(
+                header="Snacks",
+                content=Column(
+                    *[CateringSelectionItem(
+                        article_name=catering_menu_item.name,
+                        article_price=catering_menu_item.price,
+                        article_id=catering_menu_item.item_id,
+                        on_add_callback=self.on_add,
+                        is_sensitive=not catering_menu_item.is_disabled,
+                        additional_info=catering_menu_item.additional_info,
+                        is_grey=idx % 2 == 0
+                    ) for idx, catering_menu_item in enumerate(self.get_menu_items_by_category(self.all_menu_items, CateringMenuItemCategory.SNACK))],
+                ),
+                header_style=TextStyle(
+                    fill=self.session.theme.background_color,
+                    font_size=1.2
+                ),
+                margin=1,
+                align_y=0.5
+            )
+        ),
+            MainViewContentBox(
+                Revealer(
+                    header="Frühstück",
+                    content=Column(
+                        *[CateringSelectionItem(
+                            article_name=catering_menu_item.name,
+                            article_price=catering_menu_item.price,
+                            article_id=catering_menu_item.item_id,
+                            on_add_callback=self.on_add,
+                            is_sensitive=not catering_menu_item.is_disabled,
+                            additional_info=catering_menu_item.additional_info,
+                            is_grey=idx % 2 == 0
+                        ) for idx, catering_menu_item in enumerate(self.get_menu_items_by_category(self.all_menu_items, CateringMenuItemCategory.BREAKFAST))],
+                    ),
+                    header_style=TextStyle(
+                        fill=self.session.theme.background_color,
+                        font_size=1.2
+                    ),
+                    margin=1,
+                    align_y=0.5
+                )
+            ),
+            MainViewContentBox(
+                Revealer(
+                    header="Hauptspeisen",
+                    content=Column(
+                        *[CateringSelectionItem(
+                            article_name=catering_menu_item.name,
+                            article_price=catering_menu_item.price,
+                            article_id=catering_menu_item.item_id,
+                            on_add_callback=self.on_add,
+                            is_sensitive=not catering_menu_item.is_disabled,
+                            additional_info=catering_menu_item.additional_info,
+                            is_grey=idx % 2 == 0
+                        ) for idx, catering_menu_item in enumerate(self.get_menu_items_by_category(self.all_menu_items, CateringMenuItemCategory.MAIN_COURSE))],
+                    ),
+                    header_style=TextStyle(
+                        fill=self.session.theme.background_color,
+                        font_size=1.2
+                    ),
+                    margin=1,
+                    align_y=0.5
+                )
+            ),
+            MainViewContentBox(
+                Revealer(
+                    header="Desserts",
+                    content=Column(
+                        *[CateringSelectionItem(
+                            article_name=catering_menu_item.name,
+                            article_price=catering_menu_item.price,
+                            article_id=catering_menu_item.item_id,
+                            on_add_callback=self.on_add,
+                            is_sensitive=not catering_menu_item.is_disabled,
+                            additional_info=catering_menu_item.additional_info,
+                            is_grey=idx % 2 == 0
+                        ) for idx, catering_menu_item in enumerate(self.get_menu_items_by_category(self.all_menu_items, CateringMenuItemCategory.DESSERT))],
+                    ),
+                    header_style=TextStyle(
+                        fill=self.session.theme.background_color,
+                        font_size=1.2
+                    ),
+                    margin=1,
+                    align_y=0.5
+                )
+            ),
+            MainViewContentBox(
+                Revealer(
+                    header="Wasser & Softdrinks",
+                    content=Column(
+                        *[CateringSelectionItem(
+                            article_name=catering_menu_item.name,
+                            article_price=catering_menu_item.price,
+                            article_id=catering_menu_item.item_id,
+                            on_add_callback=self.on_add,
+                            is_sensitive=not catering_menu_item.is_disabled,
+                            additional_info=catering_menu_item.additional_info,
+                            is_grey=idx % 2 == 0
+                        ) for idx, catering_menu_item in enumerate(self.get_menu_items_by_category(self.all_menu_items, CateringMenuItemCategory.BEVERAGE_NON_ALCOHOLIC))],
+                    ),
+                    header_style=TextStyle(
+                        fill=self.session.theme.background_color,
+                        font_size=1.2
+                    ),
+                    margin=1,
+                    align_y=0.5
+                )
+            ),
+            MainViewContentBox(
+                Revealer(
+                    header="Alkoholische Getränke",
+                    content=Column(
+                        *[CateringSelectionItem(
+                            article_name=catering_menu_item.name,
+                            article_price=catering_menu_item.price,
+                            article_id=catering_menu_item.item_id,
+                            on_add_callback=self.on_add,
+                            is_sensitive=not catering_menu_item.is_disabled,
+                            additional_info=catering_menu_item.additional_info,
+                            is_grey=idx % 2 == 0
+                        ) for idx, catering_menu_item in enumerate(self.get_menu_items_by_category(self.all_menu_items, CateringMenuItemCategory.BEVERAGE_ALCOHOLIC))],
+                    ),
+                    header_style=TextStyle(
+                        fill=self.session.theme.background_color,
+                        font_size=1.2
+                    ),
+                    margin=1,
+                    align_y=0.5
+                )
+            ),
+            MainViewContentBox(
+                Revealer(
+                    header="Cocktails & Longdrinks",
+                    content=Column(
+                        *[CateringSelectionItem(
+                            article_name=catering_menu_item.name,
+                            article_price=catering_menu_item.price,
+                            article_id=catering_menu_item.item_id,
+                            on_add_callback=self.on_add,
+                            is_sensitive=not catering_menu_item.is_disabled,
+                            additional_info=catering_menu_item.additional_info,
+                            is_grey=idx % 2 == 0
+                        ) for idx, catering_menu_item in enumerate(self.get_menu_items_by_category(self.all_menu_items, CateringMenuItemCategory.BEVERAGE_COCKTAIL))],
+                    ),
+                    header_style=TextStyle(
+                        fill=self.session.theme.background_color,
+                        font_size=1.2
+                    ),
+                    margin=1,
+                    align_y=0.5
+                )
+            ),
+            MainViewContentBox(
+                Revealer(
+                    header="Shots",
+                    content=Column(
+                        *[CateringSelectionItem(
+                            article_name=catering_menu_item.name,
+                            article_price=catering_menu_item.price,
+                            article_id=catering_menu_item.item_id,
+                            on_add_callback=self.on_add,
+                            is_sensitive=not catering_menu_item.is_disabled,
+                            additional_info=catering_menu_item.additional_info,
+                            is_grey=idx % 2 == 0
+                        ) for idx, catering_menu_item in enumerate(self.get_menu_items_by_category(self.all_menu_items, CateringMenuItemCategory.BEVERAGE_SHOT))],
+                    ),
+                    header_style=TextStyle(
+                        fill=self.session.theme.background_color,
+                        font_size=1.2
+                    ),
+                    margin=1,
+                    align_y=0.5
+                )
+            ),
+            MainViewContentBox(
+                Revealer(
+                    header="Sonstiges",
+                    content=Column(
+                        *[CateringSelectionItem(
+                            article_name=catering_menu_item.name,
+                            article_price=catering_menu_item.price,
+                            article_id=catering_menu_item.item_id,
+                            on_add_callback=self.on_add,
+                            is_sensitive=not catering_menu_item.is_disabled,
+                            additional_info=catering_menu_item.additional_info,
+                            is_grey=idx % 2 == 0
+                        ) for idx, catering_menu_item in enumerate(self.get_menu_items_by_category(self.all_menu_items, CateringMenuItemCategory.NON_FOOD))],
+                    ),
+                    header_style=TextStyle(
+                        fill=self.session.theme.background_color,
+                        font_size=1.2
+                    ),
+                    margin=1,
+                    align_y=0.5
+                )
+            )]
+
+        return Column(shopping_cart_container, *menu, align_y=0)

src/ezgg_lan_manager/pages/TournamentDetailsPage.py

@@ -7,13 +7,13 @@ 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, Popup, Dropdown
 
-from src.ezgg_lan_manager import ConfigurationService, TournamentService, UserService, TicketingService, TeamService
+from src.ezgg_lan_manager import ConfigurationService, TournamentService, UserService, TicketingService, TeamService, RefreshService
 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.Team import Team, TeamStatus
 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, ParticipantType
+from src.ezgg_lan_manager.types.TournamentBase import TournamentStatus, tournament_status_to_display_text, tournament_format_to_display_texts, ParticipantType, TournamentFormat
 from src.ezgg_lan_manager.types.User import User
 from src.ezgg_lan_manager.types.UserSession import UserSession
 
@@ -44,7 +44,7 @@ class TournamentDetailsPage(Component):
             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:
+            if isinstance(self.tournament, Tournament):
                 await self.session.set_title(f"{self.session[ConfigurationService].get_lan_info().name} - {self.tournament.name}")
                 if self.tournament.participant_type == ParticipantType.PLAYER:
                     self.current_tournament_user_or_team_list = await self.session[TournamentService].get_users_from_participant_list(self.tournament.participants)
@@ -61,6 +61,8 @@ class TournamentDetailsPage(Component):
             self.user = None
             self.user_teams = []
 
+        self.session[RefreshService].subscribe(self.on_populate)
+
         self.loading_done()
 
     @staticmethod
@@ -68,13 +70,14 @@ class TournamentDetailsPage(Component):
         await sleep(0.8)  # https://medium.com/design-bootcamp/ux-psychology-of-artificial-waiting-enhancing-user-experiences-through-deliberate-delays-d7822faf3930
 
     async def update(self) -> None:
-        self.tournament = await self.session[TournamentService].get_tournament_by_id(self.tournament.id)
+        if isinstance(self.tournament, Tournament):
-        if self.tournament is None:
+            self.tournament = await self.session[TournamentService].get_tournament_by_id(self.tournament.id)
-            return
+            if self.tournament is None or isinstance(self.tournament, str):
-        if self.tournament.participant_type == ParticipantType.PLAYER:
+                return
-            self.current_tournament_user_or_team_list = await self.session[TournamentService].get_users_from_participant_list(self.tournament.participants)
+            if self.tournament.participant_type == ParticipantType.PLAYER:
-        elif self.tournament.participant_type == ParticipantType.TEAM:
+                self.current_tournament_user_or_team_list = await self.session[TournamentService].get_users_from_participant_list(self.tournament.participants)
-            self.current_tournament_user_or_team_list = await self.session[TournamentService].get_teams_from_participant_list(self.tournament.participants)
+            elif self.tournament.participant_type == ParticipantType.TEAM:
+                self.current_tournament_user_or_team_list = await self.session[TournamentService].get_teams_from_participant_list(self.tournament.participants)
 
     def open_close_participant_revealer(self, _: PointerEvent) -> None:
         self.participant_revealer_open = not self.participant_revealer_open
@@ -88,6 +91,9 @@ class TournamentDetailsPage(Component):
         if user_ticket is None:
             self.is_success = False
             self.message = "Turnieranmeldung nur mit Ticket"
+        elif not isinstance(self.tournament, Tournament):
+            self.is_success = False
+            self.message = "Fehler bei der Anmeldung"
         else:
             # Register single player
             if self.tournament.participant_type == ParticipantType.PLAYER:
@@ -125,12 +131,15 @@ class TournamentDetailsPage(Component):
             await self.on_team_register_canceled()
             return
         try:
-            await self.session[TournamentService].register_team_for_tournament(self.team_selected_for_register.id, self.tournament.id)
+            if isinstance(self.tournament, Tournament):
-            await self.artificial_delay()
+                await self.session[TournamentService].register_team_for_tournament(self.team_selected_for_register.id, self.tournament.id)
-            self.is_success = True
+                await self.artificial_delay()
-            self.message = f"Erfolgreich angemeldet!"
+                self.is_success = True
-            self.team_dialog_open = False
+                self.message = f"Erfolgreich angemeldet!"
-            self.team_selected_for_register = None
+                self.team_dialog_open = False
+                self.team_selected_for_register = None
+            else:
+                raise ValueError("Turnier nicht gefunden")
         except Exception as e:
             logger.error(e)
             self.message = f"Fehler: {e}"
@@ -149,9 +158,9 @@ class TournamentDetailsPage(Component):
             return
 
         try:
-            if self.tournament.participant_type == ParticipantType.PLAYER:
+            if isinstance(self.tournament, Tournament) and self.tournament.participant_type == ParticipantType.PLAYER:
                 await self.session[TournamentService].unregister_user_from_tournament(self.user.user_id, self.tournament.id)
-            elif self.tournament.participant_type == ParticipantType.TEAM:
+            elif isinstance(self.tournament, Tournament) and self.tournament.participant_type == ParticipantType.TEAM:
                 if team.members[self.user] == TeamStatus.OFFICER or team.members[self.user] == TeamStatus.LEADER:
                     await self.session[TournamentService].unregister_team_from_tournament(team.id, self.tournament.id)
                 else:
@@ -166,7 +175,8 @@ class TournamentDetailsPage(Component):
         self.loading = False
 
     async def tree_button_clicked(self) -> None:
-        pass  # ToDo: Implement tournament tree view
+        if isinstance(self.tournament, Tournament):
+            self.session.navigate_to(f"tournament-tree?id={self.tournament.id}")
 
     def loading_done(self) -> None:
         if self.tournament is None:
@@ -205,16 +215,17 @@ class TournamentDetailsPage(Component):
                 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(
+                if self.tournament.format != TournamentFormat.FFA:
-                    content="Turnierbaum anzeigen",
+                    tree_button = Button(
-                    shape="rectangle",
+                        content="Turnierbaum anzeigen",
-                    style="minor",
+                        shape="rectangle",
-                    color="hud",
+                        style="minor",
-                    margin_left=4,
+                        color="hud",
-                    margin_right=4,
+                        margin_left=4,
-                    margin_top=1,
+                        margin_right=4,
-                    on_press=self.tree_button_clicked
+                        margin_top=1,
-                )
+                        on_press=self.tree_button_clicked
+                    )
 
             ids_of_participants = [p.id for p in self.tournament.participants]
             color_key: Literal["hud", "danger"] = "hud"
@@ -349,7 +360,7 @@ class TournamentDetailsPage(Component):
                 button
             )
 
-        if self.tournament and self.tournament.participant_type == ParticipantType.TEAM:
+        if isinstance(self.tournament, Tournament) and self.tournament.participant_type == ParticipantType.TEAM:
             content = Popup(
                 anchor=content,
                 content=Rectangle(

src/ezgg_lan_manager/pages/TournamentTreePage.py

@@ -0,0 +1,280 @@
+import json
+import logging
+from typing import Optional, Union
+
+from from_root import from_root
+from rio import Column, Component, event, TextStyle, Text, Row, Spacer, ProgressCircle, Rectangle, Stack
+
+from src.ezgg_lan_manager import ConfigurationService, TournamentService, UserService, TeamService, RefreshService, SeatingService
+from src.ezgg_lan_manager.components.MainViewContentBox import MainViewContentBox
+from src.ezgg_lan_manager.types.Team import Team, TeamStatus
+from src.ezgg_lan_manager.types.Tournament import Tournament
+from src.ezgg_lan_manager.types.TournamentBase import ParticipantType, TournamentFormat
+from src.ezgg_lan_manager.types.User import User
+from src.ezgg_lan_manager.types.UserSession import UserSession
+
+logger = logging.getLogger(__name__.split(".")[-1])
+
+class MatchInfo(Component):
+    opponent_1: str = ""
+    opponent_2: str = ""
+    opponent_1_seat: str = ""
+    opponent_2_seat: str = ""
+    winner: str = ""
+
+    def build(self) -> Component:
+        return Rectangle(
+            content=Column(
+                Stack(
+                    Row(
+                        Row(
+                            Text(
+                                text=self.opponent_1,
+                                style=TextStyle(fill=self.session.theme.success_color if self.winner == self.opponent_1 else self.session.theme.background_color),
+                                justify="left",
+                                margin_right=0.6,
+                                font_size=0.9
+                            ),
+                            Text(
+                                text=f"({self.opponent_1_seat})" if self.opponent_1_seat else "Freilos",
+                                style=TextStyle(fill=self.session.theme.background_color),
+                                justify="left",
+                                font_size=0.9
+                            )
+                        ),
+                        Spacer(),
+                        Row(
+                            Text(
+                                text=self.opponent_2,
+                                style=TextStyle(fill=self.session.theme.success_color if self.winner == self.opponent_2 else self.session.theme.background_color),
+                                justify="right",
+                                margin_right=0.6,
+                                font_size=0.9
+                            ),
+                            Text(
+                                text=f"({self.opponent_2_seat})" if self.opponent_2_seat else "Freilos",
+                                style=TextStyle(fill=self.session.theme.background_color),
+                                justify="right",
+                                font_size=0.9
+                            )
+                        ),
+                        margin=0.3
+                    ),
+                    Row(
+                        Text(
+                            text=f"vs.",
+                            style=TextStyle(fill=self.session.theme.background_color),
+                            justify="center"
+                        ),
+                        margin=0.3
+                    )
+                )
+            ),
+            margin=1,
+            stroke_width=0.2,
+            stroke_color=self.session.theme.background_color,
+            fill=self.session.theme.hud_color,
+        )
+
+class TournamentTreePage(Component):
+    tournament: Optional[Union[Tournament, str]] = None
+    user: Optional[User] = None
+    teams: list[Team] = []
+    id_to_username_map: dict[int, str] = {}
+    id_to_seat_map: dict[int, str] = {}
+    is_fully_loaded: 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 isinstance(self.tournament, Tournament):
+                await self.session.set_title(f"{self.session[ConfigurationService].get_lan_info().name} - {self.tournament.name}")
+        else:
+            await self.session.set_title(f"{self.session[ConfigurationService].get_lan_info().name} - Turniere")
+
+        try:
+            user_id = self.session[UserSession].user_id
+            self.user = await self.session[UserService].get_user(user_id)
+        except KeyError:
+            self.user = None
+
+        self.teams = await self.session[TeamService].get_all_teams()
+
+        all_users = await self.session[UserService].get_all_users()
+        id_to_username_map = {}
+        id_to_seat_map = {}
+        for user in all_users:
+            id_to_username_map[user.user_id] = user.user_name
+            seat = await self.session[SeatingService].get_user_seat(user.user_id)
+            if seat is not None:
+                id_to_seat_map[user.user_id] = seat.seat_id
+
+        self.id_to_username_map = id_to_username_map
+        self.id_to_seat_map = id_to_seat_map
+        self.session[RefreshService].subscribe(self.on_populate)
+        self.is_fully_loaded = True
+
+    def _get_seat_for_team(self, team: Team) -> str:
+        # Retrieves seat id for leader of a team
+        leader = list(team.members.keys())[0]
+        for member, rank in team.members.items():
+            if rank == TeamStatus.LEADER:
+                leader = member
+                break
+
+        return self.id_to_seat_map[leader.user_id]
+
+
+    def build(self) -> Component:
+        if self.tournament is None or not self.is_fully_loaded:
+            return Column(
+                MainViewContentBox(
+                    Column(
+                        Spacer(min_height=1),
+                        Column(
+                            ProgressCircle(
+                                color="secondary",
+                                align_x=0.5,
+                                margin_top=0,
+                                margin_bottom=0
+                            ),
+                            min_height=10
+                        ),
+                        Spacer(min_height=1)
+                    )
+                ),
+                align_y=0
+            )
+        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:
+            if self.tournament.format == TournamentFormat.FFA:
+                content = Column(
+                    Text(
+                        text=f"Dieses Turnier hat keinen Turnierbaum.",
+                        style=TextStyle(fill=self.session.theme.background_color),
+                        margin_top=1,
+                        margin_bottom=1,
+                        align_x=0.5,
+                        overflow="wrap",
+                        min_width=30,
+                        justify="center"
+                    )
+                )
+            else:
+                try:
+                    file_name = self.tournament.name.replace(" ", "_") + ".json"
+                    games_per_matchup = int(self.tournament.format.name[-1])
+                    logger.info(f"Trying to read tournament data from {file_name}")
+                    with open(from_root("tournament_data", file_name), "r") as f:
+                        json_data = json.load(f)
+
+                    last_valid_round = None
+                    round_num = 0
+                    for round_ in json_data["rounds"]:
+                        if all(
+                                match["opponent_1_id"] is not None or match["opponent_2_id"] is not None
+                                for match in round_
+                        ):
+                            last_valid_round = round_
+                            round_num += 1
+
+                    if last_valid_round is None:
+                        last_valid_round = json_data["rounds"][0]
+
+                    match_infos = []
+                    if self.tournament.participant_type == ParticipantType.PLAYER:
+                        match_infos = [MatchInfo(
+                            opponent_1=self.id_to_username_map.get(match["opponent_1_id"], ""),
+                            opponent_2=self.id_to_username_map.get(match["opponent_2_id"], ""),
+                            winner=self.id_to_username_map.get(match["winner"], ""),
+                            opponent_1_seat=self.id_to_seat_map.get(match["opponent_1_id"], ""),
+                            opponent_2_seat=self.id_to_seat_map.get(match["opponent_2_id"], ""),
+                        ) for match in last_valid_round]
+                    elif self.tournament.participant_type == ParticipantType.TEAM:
+                        for match in last_valid_round:
+                            team_1: Optional[Team] = next(filter(lambda t: t.id == match["opponent_1_id"], self.teams), None)
+                            team_2: Optional[Team] = next(filter(lambda t: t.id == match["opponent_2_id"], self.teams), None)
+                            winner: Union[str, Team] = next(filter(lambda t: t.id == match["winner"], self.teams), "")
+                            match_infos.append(
+                                MatchInfo(
+                                    opponent_1=team_1.name if team_1 is not None else "",
+                                    opponent_2=team_2.name if team_2 is not None else "",
+                                    winner=winner if isinstance(winner, str) else winner.name,
+                                    opponent_1_seat=self._get_seat_for_team(team_1) if team_1 is not None else "",
+                                    opponent_2_seat=self._get_seat_for_team(team_2) if team_2 is not None else "",
+                                )
+                            )
+                    else:
+                        raise ValueError("Unknown participant type")
+
+
+
+                    content = Column(
+                        Text(
+                            text=f"{self.tournament.name}",
+                            style=TextStyle(fill=self.session.theme.background_color),
+                            justify="center",
+                            font_size=1.2
+                        ),
+                        Text(
+                            text="Finale" if len(json_data["rounds"]) == round_num else f"Runde {round_num}",
+                            style=TextStyle(fill=self.session.theme.background_color),
+                            justify="center",
+                            font_size=0.9,
+                            margin_bottom=1
+                        ),
+                        Text(
+                            text=f"Spiele pro Matchup: {games_per_matchup}",
+                            style=TextStyle(fill=self.session.theme.background_color),
+                            justify="center",
+                            font_size=0.8
+                        ),
+                        Text(
+                            text=f"Melde als Verlierer deinen Matchausgang\nim Discord oder an der Orga-Ecke",
+                            style=TextStyle(fill=self.session.theme.background_color),
+                            justify="center",
+                            font_size=0.8
+                        ),
+                        *match_infos
+                    )
+                except (FileNotFoundError, ValueError, AttributeError):
+                    content = Column(
+                        Text(
+                            text=f"Der Turnierbaum für dieses Turnier steht leider nicht zur Verfügung.\n\nBitte melde sich beim Orga-Team.",
+                            style=TextStyle(fill=self.session.theme.background_color),
+                            margin_top=1,
+                            margin_bottom=1,
+                            align_x=0.5,
+                            overflow="wrap",
+                            min_width=30,
+                            justify="center"
+                        )
+                    )
+
+        return Column(
+            MainViewContentBox(
+                Column(
+                    Spacer(min_height=1),
+                    content,
+                    Spacer(min_height=1)
+                )
+            ),
+            align_y=0
+        )

src/ezgg_lan_manager/pages/__init__.py

@@ -25,3 +25,5 @@ from .TournamentRulesPage import TournamentRulesPage
 from .ConwayPage import ConwayPage
 from .TeamsPage import TeamsPage
 from .AdminNavigationPage import AdminNavigationPage
+from .TournamentTreePage import TournamentTreePage
+from .NewPosOrderPage import NewPosOrderPage

src/ezgg_lan_manager/services/DatabaseService.py

@@ -1,6 +1,6 @@
 import logging
 
-from datetime import date, datetime
+from datetime import date, datetime, UTC
 from typing import Optional
 from decimal import Decimal
 
@@ -16,7 +16,7 @@ from src.ezgg_lan_manager.types.Seat import Seat
 from src.ezgg_lan_manager.types.Team import TeamStatus, Team
 from src.ezgg_lan_manager.types.Ticket import Ticket
 from src.ezgg_lan_manager.types.Tournament import Tournament
-from src.ezgg_lan_manager.types.TournamentBase import GameTitle, TournamentFormat, TournamentStatus, ParticipantType
+from src.ezgg_lan_manager.types.TournamentBase import GameTitle, TournamentFormat, TournamentStatus, ParticipantType, MatchStatus
 from src.ezgg_lan_manager.types.Transaction import Transaction
 from src.ezgg_lan_manager.types.User import User
 
@@ -1185,3 +1185,18 @@ class DatabaseService:
                     if not pool_init_result:
                         raise NoDatabaseConnectionError
                     return await self.remove_user_from_team(team, user)
+
+    async def change_tournament_status(self, tournament_id: int, status: TournamentStatus) -> None:
+        async with self._connection_pool.acquire() as conn:
+            async with conn.cursor(aiomysql.Cursor) as cursor:
+                try:
+                    await cursor.execute(
+                        "UPDATE tournaments SET status = %s WHERE (id = %s)",
+                        (status.name, tournament_id)
+                    )
+                    await conn.commit()
+                except aiomysql.InterfaceError:
+                    pool_init_result = await self.init_db_pool()
+                    if not pool_init_result:
+                        raise NoDatabaseConnectionError
+                    return await self.change_tournament_status(tournament_id, status)

src/ezgg_lan_manager/services/ReceiptPrintingService.py

@@ -15,11 +15,15 @@ class ReceiptPrintingService:
         self._seating_service = seating_service
         self._config = config
         self._dev_mode_enabled = dev_mode_enabled
+        self._url = f"http://{self._config.host}:{self._config.port}/{self._config.order_print_endpoint}"
 
     async def print_order(self, user: User, order: CateringOrder) -> None:
-        seat_id = await self._seating_service.get_user_seat(user.user_id)
+        seat = await self._seating_service.get_user_seat(user.user_id)
-        if not seat_id:
+        if seat is None:
             seat_id = " - "
+        else:
+            seat_id = str(seat.seat_id)
+
 
         menu_items_payload = []
         for item, amount in order.items.items():
@@ -35,14 +39,19 @@ class ReceiptPrintingService:
             "seat_id": seat_id,
             "items": menu_items_payload
         }
+
+        logger.info(f"Sending print order to {self._url}: {payload}")
         try:
-            requests.post(
+            response = requests.post(
-                f"http://{self._config.host}:{self._config.port}/{self._config.order_print_endpoint}",
+                self._url,
                 json=payload,
-                headers={"x-password": self._config.password}
+                headers={"x-password": self._config.password},
+                timeout=2.0
             )
+            if response.status_code != 200:
+                logger.error(f"Received an error with code {response.status_code}: {response.text}")
         except Exception as e:
             if self._dev_mode_enabled:
-                logger.info("An error occurred trying to print a receipt:", e)
+                logger.info("An error occurred trying to print a receipt: %s", e)
                 return
-            logger.error("An error occurred trying to print a receipt:", e)
+            logger.error("An error occurred trying to print a receipt: %s", e)

src/ezgg_lan_manager/services/RefreshService.py

@@ -1,17 +1,17 @@
-from typing import Callable
+from typing import Callable, Optional
 
 
 class RefreshService:
     """
-    rio.Components can subscribe to this service with their on_populate method.
+    The active rio.Components can subscribe to this service with their on_populate method.
-    Those methods get called whenever a overall refresh is needed. Usually when the user logs in or out.
+    This methods get called whenever a overall refresh is needed. Usually when the user logs in or out.
     """
     def __init__(self) -> None:
-        self.subscribers: set[Callable] = set()
+        self.subscriber: Optional[Callable] = None
 
     def subscribe(self, refresh_cb: Callable) -> None:
-        self.subscribers.add(refresh_cb)
+        self.subscriber = refresh_cb
 
     async def trigger_refresh(self) -> None:
-        for refresh_cb in self.subscribers:
+        if self.subscriber is not None:
-            await refresh_cb()
+            await self.subscriber()

src/ezgg_lan_manager/services/TournamentService.py

@@ -1,5 +1,9 @@
+import json
+from pprint import pprint
 from typing import Optional
 
+from from_root import from_root
+
 from src.ezgg_lan_manager.services.DatabaseService import DatabaseService
 from src.ezgg_lan_manager.services.UserService import UserService
 from src.ezgg_lan_manager.types.Participant import Participant
@@ -18,6 +22,10 @@ class TournamentService:
         self._cache: dict[int, Tournament] = {}
         self._cache_dirty: bool = True  # Setting this flag invokes cache update on next read
         
+    async def queue_cache_renewal(self) -> None:
+        # Used in admin UI to provoke cache renewal after direct database access
+        self._cache_dirty = True
+
     async def _update_cache(self) -> None:
         tournaments = await self._db_service.get_all_tournaments()
         for tournament in tournaments:
@@ -90,12 +98,47 @@ class TournamentService:
         tournament = await self.get_tournament_by_id(tournament_id)
         if tournament:
             tournament.start()
-        # ToDo: Write matches/round to database
+            await self._generate_initial_json_file(tournament)
+            await self._db_service.change_tournament_status(tournament_id, tournament.status)
         self._cache_dirty = True
 
     async def cancel_tournament(self, tournament_id: int):
         tournament = await self.get_tournament_by_id(tournament_id)
         if tournament:
             tournament.cancel()
-        # ToDo: Update to database
+            await self._db_service.change_tournament_status(tournament_id, tournament.status)
         self._cache_dirty = True
+
+    async def _generate_initial_json_file(self, tournament: Tournament) -> None:
+        """
+        Generates the initial JSON file for the tournament. Won't generate a new one if one already exists.
+        ToDo: Remove this method when final tournament system is completed.
+        """
+        p = tournament.participants
+        pairs = [
+            (p[i], p[i + 1]) if i + 1 < len(p) else (p[i], None)
+            for i in range(0, len(p), 2)
+        ]
+        data = {
+            "rounds": [
+                [
+                    {
+                        "opponent_1_id": pair[0].id if pair[0] is not None else None,
+                        "opponent_2_id": pair[1].id if pair[1] is not None else None,
+                        "winner": None
+                    } for pair in pairs
+                ]
+            ]
+        }
+
+        # Resolve byes
+        for match in data["rounds"][0]:
+            if match["opponent_2_id"] is None:
+                match["winner"] = match["opponent_1_id"]
+
+        file_name = tournament.name.replace(" ", "_") + ".json"
+        try:
+            with open(from_root("tournament_data", file_name), "x") as f:
+                json.dump(data, f, indent=4)
+        except FileExistsError:
+            pass

src/ezgg_lan_manager/types/Match.py

@@ -49,6 +49,14 @@ class Match:
             games.append(Game(game_id, self._match_id, game_number, None, None, False))
         return tuple(games)
 
+    @property
+    def round_number(self) -> int:
+        return self._round_number
+
+    @property
+    def best_of(self) -> int:
+        return self._best_of
+
     @property
     def status(self) -> MatchStatus:
         if self._status == MatchStatus.COMPLETED:

src/ezgg_lan_manager/types/Tournament.py

@@ -1,3 +1,4 @@
+import logging
 import uuid
 from datetime import datetime
 from typing import Optional
@@ -7,6 +8,7 @@ from src.ezgg_lan_manager.types.Match import Match, FFAMatch
 from src.ezgg_lan_manager.types.Participant import Participant
 from src.ezgg_lan_manager.types.TournamentBase import GameTitle, TournamentFormat, TournamentStatus, TournamentError, Bracket, MatchStatus, ParticipantType
 
+logger = logging.getLogger(__name__.split(".")[-1])
 
 class Tournament:
     def __init__(self,
@@ -353,6 +355,7 @@ class Tournament:
             raise TournamentError(f"Unknown bracket type: {bracket_type}")
 
         self._status = TournamentStatus.ONGOING
+        logger.info(f"New tournament status for {self._name}: {self._status}")
         for match in self._matches:
             match.check_completion()
 

src/ezgg_lan_manager/types/UserSession.py

@@ -1,9 +1,9 @@
-from dataclasses import dataclass
 from uuid import UUID
 
+from rio import Dataclass
 
-@dataclass
+
-class UserSession:
+class UserSession(Dataclass):
     id: UUID
     user_id: int
     is_team_member: bool

tournament_data/.gitignore

@@ -0,0 +1 @@
+*.json

tournament_data/README.md

@@ -0,0 +1,43 @@
+# Tournament data
+
+This directory contains JSON files for tournament trees.
+
+This is a temporary solution until the automatic tournament tree generation is completed.
+
+# Structure
+
+## Naming
+
+Tournament name with `_` as separators and `.json` suffix.
+
+## JSON structure
+
+```json
+{
+  "rounds": [
+    [
+      {
+        "opponent_1_id": 1,
+        "opponent_2_id": 2,
+        "winner": 1
+      },
+      {
+        "opponent_1_id": 3,
+        "opponent_2_id": 4,
+        "winner": null
+      }
+    ],
+    [
+      {
+        "opponent_1_id": 1,
+        "opponent_2_id": null,
+        "winner": null
+      }
+    ]
+  ]
+}
+```
+
+## ToDo
+
+- Make start button in UI generate initial `.json` file for started tournament