fix reset password

README.md

@@ -14,7 +14,7 @@ This repository contains the code for the EZGG LAN Manager.
 
 ### Step 1: Preparing Database
 
-To prepare the database, apply the SQL file located in `sql/create_database.sql` to your database server. This is easily accomplished with the MYSQL Workbench, but it can be also done by pipeing the file into the mariadb-server executable.
+To prepare the database, apply the SQL file located in `sql/create_database.sql` followed by `sql/tournament_patch.sql` to your database server. This is easily accomplished with the MYSQL Workbench, but it can be also done by pipeing the file into the mariadb-server executable.
 
 Optionally, you can now execute the script `create_demo_database_content.py`, found in `src/ezgg_lan_manager/helpers`. Be aware that it can be buggy sometimes, especially if you overwrite existing data.
 
@@ -43,3 +43,4 @@ FLUSH PRIVILEGES;
 ```
 3. Make sure to **NOT** use the default passwords!
 4. Apply the `create_database.sql` when starting the MariaDB container for the first time.
+5. Apply the `tournament_patch.sql` when starting the MariaDB container for the first time.

VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

src/ezgg_lan_manager/pages/TournamentDetailsPage.py

@@ -4,7 +4,7 @@ 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 import ConfigurationService, TournamentService, UserService, TicketingService
 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
@@ -53,13 +53,18 @@ class TournamentDetailsPage(Component):
         if not self.user:
             return
 
-        try:
+        user_ticket = await self.session[TicketingService].get_user_ticket(self.user.user_id)
-            await self.session[TournamentService].register_user_for_tournament(self.user.user_id, self.tournament.id)
+        if user_ticket is None:
-            self.is_success = True
-            self.message = f"Erfolgreich angemeldet!"
-        except Exception as e:
             self.is_success = False
-            self.message = f"Fehler: {e}"
+            self.message = "Turnieranmeldung nur mit Ticket"
+        else:
+            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()
 

src/ezgg_lan_manager/services/MailingService.py

@@ -45,7 +45,7 @@ class MailingService:
         return f"""
         Hallo {user.user_name},
         
-        deinem Account wurden {added_balance} € hinzugefügt. Dein neues Guthaben beträgt nun {total_balance} €.
+        deinem Account wurden {added_balance:.2f} € hinzugefügt. Dein neues Guthaben beträgt nun {total_balance:.2f} €.
         
         Wenn du zu dieser Aufladung Fragen hast, stehen wir dir in unserem Discord Server oder per Mail an {self._configuration_service.get_lan_info().organizer_mail} zur Verfügung.