From f4db57b2ff27a4650604bf4512db1b8c3443ab48 Mon Sep 17 00:00:00 2001 From: David Rodenkirchen Date: Sat, 21 Feb 2026 23:39:43 +0100 Subject: [PATCH] Various smaller improvements --- VERSION | 2 +- .../components/CateringOrderItem.py | 5 ++--- .../components/DesktopNavigation.py | 1 - .../components/ShoppingCartAndOrders.py | 14 ++++++-------- src/ezgg_lan_manager/pages/CateringPage.py | 2 +- src/ezgg_lan_manager/services/DatabaseService.py | 3 +-- 6 files changed, 11 insertions(+), 16 deletions(-) diff --git a/VERSION b/VERSION index 9fc80f9..87a0871 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.3.2 \ No newline at end of file +0.3.3 \ No newline at end of file diff --git a/src/ezgg_lan_manager/components/CateringOrderItem.py b/src/ezgg_lan_manager/components/CateringOrderItem.py index 42fde9b..233cffb 100644 --- a/src/ezgg_lan_manager/components/CateringOrderItem.py +++ b/src/ezgg_lan_manager/components/CateringOrderItem.py @@ -1,7 +1,6 @@ from typing import Callable -from rio import Component, Row, Text, TextStyle, Color, Rectangle, CursorStyle -from rio.components.pointer_event_listener import PointerEvent, PointerEventListener +from rio import Component, Row, Text, TextStyle, Color, Rectangle, PointerEventListener from src.ezgg_lan_manager.types.CateringOrder import CateringOrderStatus, CateringOrder @@ -41,7 +40,7 @@ class CateringOrderItem(Component): fill=self.session.theme.primary_color, hover_fill=self.session.theme.hud_color, transition_time=0.1, - cursor=CursorStyle.POINTER + cursor="pointer" ), on_press=lambda _: self.info_modal_cb(self.order), ) diff --git a/src/ezgg_lan_manager/components/DesktopNavigation.py b/src/ezgg_lan_manager/components/DesktopNavigation.py index cb8b55d..51ae7ce 100644 --- a/src/ezgg_lan_manager/components/DesktopNavigation.py +++ b/src/ezgg_lan_manager/components/DesktopNavigation.py @@ -1,4 +1,3 @@ -from copy import copy, deepcopy from typing import Optional, Callable from rio import * diff --git a/src/ezgg_lan_manager/components/ShoppingCartAndOrders.py b/src/ezgg_lan_manager/components/ShoppingCartAndOrders.py index 1bddff8..dc51237 100644 --- a/src/ezgg_lan_manager/components/ShoppingCartAndOrders.py +++ b/src/ezgg_lan_manager/components/ShoppingCartAndOrders.py @@ -1,8 +1,7 @@ from asyncio import sleep, create_task from decimal import Decimal -import rio -from rio import Component, Column, Text, TextStyle, Button, Row, ScrollContainer, Spacer, Popup, Table, event +from rio import Component, Column, Text, TextStyle, Button, Row, ScrollContainer, Spacer, Popup, Table, event, Card from src.ezgg_lan_manager.components.CateringCartItem import CateringCartItem from src.ezgg_lan_manager.components.CateringOrderItem import CateringOrderItem @@ -97,7 +96,7 @@ class ShoppingCartAndOrders(Component): show_popup_task = create_task(self.show_popup("Bestellung erfolgreich aufgegeben!", False)) async def _create_order_info_modal(self, order: CateringOrder) -> None: - def build_dialog_content() -> rio.Component: + def build_dialog_content() -> Component: # @todo: rio 0.10.8 did not have the ability to align the columns, check back in a future version table = Table( { @@ -107,9 +106,9 @@ class ShoppingCartAndOrders(Component): }, show_row_numbers=False ) - return rio.Card( - rio.Column( - rio.Text( + return Card( + Column( + Text( f"Deine Bestellung ({order.order_id})", align_x=0.5, margin_bottom=0.5 @@ -134,7 +133,7 @@ class ShoppingCartAndOrders(Component): ) await dialog.wait_for_close() - def build(self) -> rio.Component: + def build(self) -> Component: user_id = self.session[SessionStorage].user_id catering_service = self.session[CateringService] cart = catering_service.get_cart(user_id) @@ -155,7 +154,6 @@ class ShoppingCartAndOrders(Component): margin=1 ) return Column( - cart_container, 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), diff --git a/src/ezgg_lan_manager/pages/CateringPage.py b/src/ezgg_lan_manager/pages/CateringPage.py index 8f3ad44..420c989 100644 --- a/src/ezgg_lan_manager/pages/CateringPage.py +++ b/src/ezgg_lan_manager/pages/CateringPage.py @@ -1,4 +1,4 @@ -from typing import Optional, Callable +from typing import Optional from rio import Column, Component, event, TextStyle, Text, Spacer, Revealer, SwitcherBar, SwitcherBarChangeEvent, ProgressCircle diff --git a/src/ezgg_lan_manager/services/DatabaseService.py b/src/ezgg_lan_manager/services/DatabaseService.py index 13b0d7b..d6f46b8 100644 --- a/src/ezgg_lan_manager/services/DatabaseService.py +++ b/src/ezgg_lan_manager/services/DatabaseService.py @@ -1,7 +1,6 @@ import logging from datetime import date, datetime -from pprint import pprint from typing import Optional from decimal import Decimal @@ -448,7 +447,7 @@ class DatabaseService: pool_init_result = await self.init_db_pool() if not pool_init_result: raise NoDatabaseConnectionError - return await self.change_ticket_owner(ticket_id) + return await self.delete_ticket(ticket_id) except Exception as e: logger.warning(f"Error deleting ticket: {e}") return False