From 1f404aa1666ded14f393f627d403167a58c75fc3 Mon Sep 17 00:00:00 2001
From: Jager72 <49473040+Jager72@users.noreply.github.com>
Date: Thu, 11 Apr 2024 13:30:21 +0200
Subject: [PATCH] feat: Added favorite meal for each klient
---
classes/data/data_initializer.py | 8 +++++++-
classes/data/klient.py | 6 ++++--
database/clients.xml | 6 +++++-
3 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/classes/data/data_initializer.py b/classes/data/data_initializer.py
index dbe7e37..deb52ad 100644
--- a/classes/data/data_initializer.py
+++ b/classes/data/data_initializer.py
@@ -62,10 +62,16 @@ for person in root.findall('person'):
age_element = person.find('age')
age = int(age_element.text) if age_element is not None and age_element.text else 0
+ favorite_meal_element = person.find('favoriteMeal')
+ favorite_meal = favorite_meal_element.text if favorite_meal_element is not None else None
+ if favorite_meal in [meal.nazwa for meal in meals]:
+ favorite_meal = next((meal for meal in meals if meal.nazwa == favorite_meal), None)
+
person_data = {
'imie': name,
'nazwisko': surname,
- 'wiek': age
+ 'wiek': age,
+ 'ulubiony_posilek': favorite_meal
}
clients.append(Klient(**person_data))
diff --git a/classes/data/klient.py b/classes/data/klient.py
index 7d9c85e..ff43d49 100644
--- a/classes/data/klient.py
+++ b/classes/data/klient.py
@@ -3,12 +3,13 @@ from rachunek import Rachunek
import random
class Klient:
- def __init__(self,imie,nazwisko,wiek):
+ def __init__(self,imie,nazwisko,wiek,ulubiony_posilek=None):
self.imie = imie
self.nazwisko = nazwisko
self.wiek = wiek
self.stolik = None
self.rachunek = Rachunek(random.randint(1,1000))
+ self.ulubiony_posilek = ulubiony_posilek
def zloz_zamowienie(self,zamowienie,stolik):
if self.stolik is None:
@@ -20,4 +21,5 @@ class Klient:
print("Klient ma juz przypisany stolik.")
def __str__(self):
- return f"Klient: {self.imie} {self.nazwisko} {self.wiek}"
+ return f"Klient: {self.imie} {self.nazwisko} {self.wiek}, ulubione Danie: {self.ulubiony_posilek}"
+
diff --git a/database/clients.xml b/database/clients.xml
index 429312e..d51e8c8 100644
--- a/database/clients.xml
+++ b/database/clients.xml
@@ -3,20 +3,24 @@
David
Bowie
21
+ Tatar
Kamil
Stop
17
+ Pomidorowa z Makaronem
Jon
Snow
23
+ Grochówka
Andrzej
Kowalski
44
+ Spaghetti Bolognese
-
\ No newline at end of file
+