Vereins-IT/ezgg-lan-manager
4
1
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Compare commits

base: Vereins-IT:fa90e16fdf31eb5b0c85eb3b8261a3038ac43258
Branches Tags
Vereins-IT:main
Vereins-IT:prod
Vereins-IT:feature/upgrade-rio-rc
Vereins-IT:feature/tournament
..
compare: Vereins-IT:f58a7872ef3407b96e011382c0bd8104ecfb510a
Branches Tags
Vereins-IT:prod
Vereins-IT:main
Vereins-IT:feature/upgrade-rio-rc
Vereins-IT:feature/tournament

No commits in common. "fa90e16fdf31eb5b0c85eb3b8261a3038ac43258" and "f58a7872ef3407b96e011382c0bd8104ecfb510a" have entirely different histories.
fa90e16fdf ... f58a7872ef

5 changed files with 65 additions and 129 deletions
Show Stats Expand all files Collapse all files

63
sql/catering_menu_items.sql Normal file
View File

@ -0,0 +1,63 @@
INSERT INTO `catering_menu_items` VALUES
(7,'Schnitzel Wiener Art','mit Pommes',10.50,'MAIN_COURSE',0),
(8,'Jäger Schnitzel mit Champignonrahm Sauce','mit Pommes',11.50,'MAIN_COURSE',0),
(9,'Tortellini in Käsesauce mit Fleischfüllung','',10.50,'MAIN_COURSE',0),
(10,'Tortellini in Käsesauce ohne Fleischfüllung','Vegetarisch',10.50,'MAIN_COURSE',0),
(11,'Käse Schinken Wrap','',5.00,'SNACK',1),
(12,'Puten Paprika Wrap','',7.00,'SNACK',0),
(13,'Tomate Mozzarella Wrap','',6.00,'SNACK',0),
(14,'Portion Pommes','',4.00,'SNACK',0),
(15,'Rinds-Currywurst','',4.50,'SNACK',0),
(16,'Rinds-Currywurst mit Pommes','',6.50,'SNACK',0),
(17,'Nudelsalat','',4.50,'SNACK',0),
(18,'Nudelsalat mit Bockwurst','',6.00,'SNACK',0),
(19,'Kartoffelsalat','',4.50,'SNACK',0),
(20,'Kartoffelsalat mit Bockwurst','',6.00,'SNACK',0),
(21,'Sandwichtoast - Schinken','',1.80,'SNACK',0),
(22,'Sandwichtoast - Käse','',1.80,'SNACK',0),
(23,'Sandwichtoast - Schinken/Käse','',2.10,'SNACK',0),
(24,'Sandwichtoast - Salami','',1.80,'SNACK',0),
(25,'Sandwichtoast - Salami/Käse','',2.10,'SNACK',0),
(26,'Chips - Western Style','',1.30,'SNACK',0),
(27,'Nachos - Salted','',1.30,'SNACK',0),
(28,'Panna Cotta mit Erdbeersauce','',7.00,'DESSERT',0),
(29,'Panna Cotta mit Blaubeersauce','',7.00,'DESSERT',0),
(30,'Mousse au Chocolat','',7.00,'DESSERT',0),
(31,'Fruit Loops','',1.50,'BREAKFAST',0),
(32,'Smacks','',1.50,'BREAKFAST',0),
(33,'Knuspermüsli','Schoko',2.00,'BREAKFAST',0),
(34,'Cini Minis','',1.50,'BREAKFAST',0),
(35,'Brötchen - Schinken','mit Margarine',1.20,'BREAKFAST',0),
(36,'Brötchen - Käse','mit Margarine',1.20,'BREAKFAST',0),
(37,'Brötchen - Schinken/Käse','mit Margarine',1.40,'BREAKFAST',0),
(38,'Brötchen - Salami','mit Margarine',1.20,'BREAKFAST',0),
(39,'Brötchen - Salami/Käse','mit Margarine',1.40,'BREAKFAST',0),
(40,'Brötchen - Nutella','mit Margarine',1.20,'BREAKFAST',0),
(41,'Wasser - Still','1L Flasche',2.00,'BEVERAGE_NON_ALCOHOLIC',0),
(42,'Wasser - Medium','1L Flasche',2.00,'BEVERAGE_NON_ALCOHOLIC',0),
(43,'Wasser - Spritzig','1L Flasche',2.00,'BEVERAGE_NON_ALCOHOLIC',0),
(44,'Coca-Cola','1L Flasche',2.00,'BEVERAGE_NON_ALCOHOLIC',0),
(45,'Coca-Cola Zero','1L Flasche',2.00,'BEVERAGE_NON_ALCOHOLIC',0),
(46,'Fanta','1L Flasche',2.00,'BEVERAGE_NON_ALCOHOLIC',0),
(47,'Sprite','1L Flasche',2.00,'BEVERAGE_NON_ALCOHOLIC',0),
(48,'Spezi','von Paulaner, 0,5L Flasche',1.50,'BEVERAGE_NON_ALCOHOLIC',0),
(49,'Red Bull','',2.00,'BEVERAGE_NON_ALCOHOLIC',0),
(50,'Energy','Hausmarke',1.50,'BEVERAGE_NON_ALCOHOLIC',0),
(51,'Pils','0,33L Flasche',1.90,'BEVERAGE_ALCOHOLIC',0),
(52,'Radler','0,33L Flasche',1.90,'BEVERAGE_ALCOHOLIC',0),
(53,'Diesel','0,33L Flasche',1.90,'BEVERAGE_ALCOHOLIC',0),
(54,'Apfelwein Pur','0,33L Flasche',1.90,'BEVERAGE_ALCOHOLIC',0),
(55,'Apfelwein Sauer','0,33L Flasche',1.90,'BEVERAGE_ALCOHOLIC',0),
(56,'Apfelwein Cola','0,33L Flasche',1.90,'BEVERAGE_ALCOHOLIC',0),
(57,'Vodka Energy','',4.00,'BEVERAGE_COCKTAIL',0),
(58,'Vodka O-Saft','',4.00,'BEVERAGE_COCKTAIL',0),
(59,'Whiskey Cola','mit Bourbon',4.00,'BEVERAGE_COCKTAIL',0),
(60,'Jägermeister Energy','',4.00,'BEVERAGE_COCKTAIL',0),
(61,'Sex on the Beach','',5.50,'BEVERAGE_COCKTAIL',0),
(62,'Long Island Ice Tea','',5.50,'BEVERAGE_COCKTAIL',0),
(63,'Caipirinha','',5.50,'BEVERAGE_COCKTAIL',0),
(64,'Jägermeister','',2.00,'BEVERAGE_SHOT',0),
(65,'Tequila','',2.00,'BEVERAGE_SHOT',0),
(66,'PfEZzi','Getunter Pfefferminz-Schnaps',1.99,'BEVERAGE_SHOT',0),
(67,'Zigaretten','Elixyr',8.00,'NON_FOOD',0),
(68,'Mentholfilter','passend für Elixyr',1.20,'NON_FOOD',0);

65
sql/catering_menu_items_ez_lan_1.sql
View File

@ -1,65 +0,0 @@
INSERT INTO `catering_menu_items` VALUES
(1,'Schnitzel Wiener Art','mit Pommes Frites und Salat',20.50,'MAIN_COURSE',1),
(2,'Jäger Schnitzel mit Champignonrahm Sauce','mit Spätzlen und Salat',22.50,'MAIN_COURSE',1),
(3,'Rumpsteak 250g','mit Pommes Frites und Salat',35.50,'MAIN_COURSE',1),
(4,'Rindergeschnetzeltes','mit Spätzlen und Salat',22.50,'MAIN_COURSE',1),
(5,'Galloway Burger','mit Amazing Fries',20.00,'MAIN_COURSE',1),
(6,'Käsespätzle mit Röstzwiebel','mit Salat',20.00,'MAIN_COURSE',1),
(11,'Käse Schinken Wrap','',5.00,'SNACK',1),
(12,'Puten Paprika Wrap','',7.00,'SNACK',1),
(13,'Tomate Mozzarella Wrap','',6.00,'SNACK',1),
(14,'Portion Pommes','',4.00,'SNACK',1),
(15,'Rinds-Currywurst','',4.50,'SNACK',1),
(16,'Rinds-Currywurst mit Pommes','',6.50,'SNACK',1),
(17,'Nudelsalat','',4.50,'SNACK',1),
(18,'Nudelsalat mit Bockwurst','',6.00,'SNACK',1),
(19,'Kartoffelsalat','',4.50,'SNACK',1),
(20,'Kartoffelsalat mit Bockwurst','',6.00,'SNACK',1),
(21,'Sandwichtoast - Schinken','',1.80,'SNACK',1),
(22,'Sandwichtoast - Käse','',1.80,'SNACK',1),
(23,'Sandwichtoast - Schinken/Käse','',2.10,'SNACK',1),
(24,'Sandwichtoast - Salami','',1.80,'SNACK',1),
(25,'Sandwichtoast - Salami/Käse','',2.10,'SNACK',1),
(26,'Chips - Western Style','',1.50,'SNACK',1),
(27,'Nachos - Salted','',1.50,'SNACK',1),
(28,'Panna Cotta mit Erdbeersauce','',7.00,'DESSERT',1),
(29,'Panna Cotta mit Blaubeersauce','',7.00,'DESSERT',1),
(30,'Mousse au Chocolat','',7.00,'DESSERT',1),
(31,'Fruit Loops','',1.50,'BREAKFAST',1),
(32,'Smacks','',1.50,'BREAKFAST',1),
(33,'Knuspermüsli','Schoko',2.00,'BREAKFAST',1),
(34,'Cini Minis','',1.50,'BREAKFAST',1),
(35,'Brötchen - Schinken','mit Margarine',1.20,'BREAKFAST',1),
(36,'Brötchen - Käse','mit Margarine',1.20,'BREAKFAST',1),
(37,'Brötchen - Schinken/Käse','mit Margarine',1.40,'BREAKFAST',1),
(38,'Brötchen - Salami','mit Margarine',1.20,'BREAKFAST',1),
(39,'Brötchen - Salami/Käse','mit Margarine',1.40,'BREAKFAST',1),
(40,'Brötchen - Nutella','mit Margarine',1.20,'BREAKFAST',1),
(41,'Wasser - Still','1L Flasche',2.00,'BEVERAGE_NON_ALCOHOLIC',1),
(42,'Wasser - Medium','1L Flasche',2.00,'BEVERAGE_NON_ALCOHOLIC',1),
(43,'Wasser - Spritzig','1L Flasche',2.00,'BEVERAGE_NON_ALCOHOLIC',1),
(44,'Coca-Cola','1L Flasche',2.00,'BEVERAGE_NON_ALCOHOLIC',1),
(45,'Coca-Cola Zero','1L Flasche',2.00,'BEVERAGE_NON_ALCOHOLIC',1),
(46,'Fanta','1L Flasche',2.00,'BEVERAGE_NON_ALCOHOLIC',1),
(47,'Sprite','1L Flasche',2.00,'BEVERAGE_NON_ALCOHOLIC',1),
(48,'Spezi','von Paulaner, 0,5L Flasche',1.50,'BEVERAGE_NON_ALCOHOLIC',1),
(49,'Red Bull','',2.00,'BEVERAGE_NON_ALCOHOLIC',1),
(50,'Energy','Hausmarke',1.50,'BEVERAGE_NON_ALCOHOLIC',1),
(51,'Pils','0,33L Flasche',1.90,'BEVERAGE_ALCOHOLIC',1),
(52,'Radler','0,33L Flasche',1.90,'BEVERAGE_ALCOHOLIC',1),
(53,'Diesel','0,33L Flasche',1.90,'BEVERAGE_ALCOHOLIC',1),
(54,'Apfelwein Pur','0,33L Flasche',1.90,'BEVERAGE_ALCOHOLIC',1),
(55,'Apfelwein Sauer','0,33L Flasche',1.90,'BEVERAGE_ALCOHOLIC',1),
(56,'Apfelwein Cola','0,33L Flasche',1.90,'BEVERAGE_ALCOHOLIC',1),
(57,'Vodka Energy','',4.00,'BEVERAGE_COCKTAIL',1),
(58,'Vodka O-Saft','',4.00,'BEVERAGE_COCKTAIL',1),
(59,'Whiskey Cola','mit Bourbon',4.00,'BEVERAGE_COCKTAIL',1),
(60,'Jägermeister Energy','',4.00,'BEVERAGE_COCKTAIL',1),
(61,'Sex on the Beach','',5.50,'BEVERAGE_COCKTAIL',1),
(62,'Long Island Ice Tea','',5.50,'BEVERAGE_COCKTAIL',1),
(63,'Caipirinha','',5.50,'BEVERAGE_COCKTAIL',1),
(64,'Jägermeister','',2.00,'BEVERAGE_SHOT',1),
(65,'Tequila','',2.00,'BEVERAGE_SHOT',1),
(66,'Pfeffi','Pfefferminz-Schnaps',1.50,'BEVERAGE_SHOT',1),
(67,'Zigaretten','Elixyr',8.00,'NON_FOOD',1),
(68,'Mentholfilter','passend für Elixyr',1.20,'NON_FOOD',1);

61
sql/seats_ez_lan_1.sql
View File

@ -1,61 +0,0 @@
INSERT INTO `seats` (`seat_id`, `is_blocked`, `seat_category`) VALUES
('A01', '0', 'NORMAL'),
('A02', '0', 'NORMAL'),
('A03', '0', 'NORMAL'),
('A04', '0', 'NORMAL'),
('A05', '0', 'NORMAL'),
('A06', '0', 'NORMAL'),
('A10', '0', 'NORMAL'),
('A11', '0', 'NORMAL'),
('A12', '0', 'NORMAL'),
('A13', '0', 'NORMAL'),
('A14', '0', 'NORMAL'),
('A15', '0', 'NORMAL'),
('B01', '0', 'NORMAL'),
('B02', '0', 'NORMAL'),
('B03', '0', 'NORMAL'),
('B04', '0', 'NORMAL'),
('B05', '0', 'NORMAL'),
('B10', '0', 'NORMAL'),
('B11', '0', 'NORMAL'),
('B12', '0', 'NORMAL'),
('B13', '0', 'NORMAL'),
('B14', '0', 'NORMAL'),
('C01', '0', 'NORMAL'),
('C02', '0', 'NORMAL'),
('C03', '0', 'NORMAL'),
('C04', '0', 'NORMAL'),
('C05', '0', 'NORMAL'),
('C10', '0', 'NORMAL'),
('C11', '0', 'NORMAL'),
('C12', '0', 'NORMAL'),
('C13', '0', 'NORMAL'),
('C14', '0', 'NORMAL'),
('D01', '0', 'NORMAL'),
('D02', '0', 'NORMAL'),
('D03', '0', 'NORMAL'),
('D04', '0', 'NORMAL'),
('D05', '0', 'NORMAL'),
('D06', '0', 'NORMAL'),
('D10', '0', 'NORMAL'),
('D11', '0', 'NORMAL'),
('D12', '0', 'NORMAL'),
('D13', '0', 'NORMAL'),
('D14', '0', 'NORMAL'),
('D15', '0', 'NORMAL'),
('E01', '0', 'NORMAL'),
('E02', '0', 'NORMAL'),
('E03', '0', 'NORMAL'),
('E04', '0', 'NORMAL'),
('E05', '0', 'NORMAL'),
('E06', '0', 'NORMAL'),
('E10', '0', 'NORMAL'),
('E11', '0', 'NORMAL'),
('E12', '0', 'NORMAL'),
('E13', '0', 'NORMAL'),
('E14', '0', 'NORMAL'),
('E15', '0', 'NORMAL');

2
src/ez_lan_manager/pages/RegisterPage.py
View File

@ -69,7 +69,7 @@ class RegisterPage(Component):
try:
new_user = await user_service.create_user(self.user_name_input.text, self.email_input.text, self.pw_1.text)
if not new_user:
logger.warning(f"UserService.create_user returned: {new_user}") # ToDo: Seems like the user is created fine, even if not returned #FixMe
raise RuntimeError("User could not be created")
except Exception as e:
logger.error(f"Unknown error during new user registration: {e}")
await self.animated_text.display_text(False, "Es ist ein unbekannter Fehler aufgetreten :(")

3
src/ez_lan_manager/services/UserService.py
View File

@ -47,8 +47,7 @@ class UserService:
user_name = user_name.lower()
hashed_pw = sha256(password_clear_text.encode(encoding="utf-8")).hexdigest()
created_user = await self._db_service.create_user(user_name, user_mail, hashed_pw)
return created_user
return await self._db_service.create_user(user_name, user_mail, hashed_pw)
async def update_user(self, user: User) -> User:
disallowed_char = self._check_for_disallowed_char(user.user_name)