fix name not show issue
This commit is contained in:
@@ -9,26 +9,46 @@ class ProfilePage:
|
|||||||
self.company_manager = Company()
|
self.company_manager = Company()
|
||||||
self.user = self.page.session.get("user")
|
self.user = self.page.session.get("user")
|
||||||
self.company = self.company_manager.get_company(self.user['id'])
|
self.company = self.company_manager.get_company(self.user['id'])
|
||||||
|
prenume = ''
|
||||||
|
if "@default.com" not in self.user['email']:
|
||||||
|
if '~' in self.user['name']:
|
||||||
|
prenume = self.user['name'].split('~')[0]
|
||||||
self.first_name = ft.TextField(
|
self.first_name = ft.TextField(
|
||||||
label="Prenume",
|
label="Prenume",
|
||||||
value=self.user['name'].split('~')[0] if "@default.com" not in self.user['email'] and '~' in self.user['email'] else None
|
value=prenume
|
||||||
)
|
)
|
||||||
|
nume = ''
|
||||||
|
if "@default.com" not in self.user['email']:
|
||||||
|
if '~' in self.user['name']:
|
||||||
|
nume = self.user['name'].split('~')[1]
|
||||||
self.last_name = ft.TextField(
|
self.last_name = ft.TextField(
|
||||||
label="Nume",
|
label="Nume",
|
||||||
value=self.user['name'].split('~')[1] if "@default.com" not in self.user['email'] and '~' in self.user['email'] else None
|
value=nume
|
||||||
)
|
)
|
||||||
self.email = ft.TextField(label="E-mail", value=self.user['email'], read_only=True)
|
self.email = ft.TextField(label="E-mail", value=self.user['email'], read_only=True)
|
||||||
self.phone = ft.TextField(label="Telefon", value=self.user['phone'])
|
self.phone = ft.TextField(label="Telefon", value=self.user['phone'])
|
||||||
|
address = ''
|
||||||
|
if self.user['address']:
|
||||||
|
if "~" in self.user['address']:
|
||||||
|
address = self.user['address'].split("~")[0].split("%")[1]
|
||||||
|
else:
|
||||||
|
address = self.user['address'].split("%")[1]
|
||||||
self.address = ft.TextField(
|
self.address = ft.TextField(
|
||||||
label="Strada si numar",
|
label="Strada si numar",
|
||||||
multiline=True,
|
multiline=True,
|
||||||
min_lines=3,
|
min_lines=3,
|
||||||
max_lines=5,
|
max_lines=5,
|
||||||
value = self.user['address'].split("~")[0].split("%")[1] if self.user['address'] and "~" in self.user['address'] else ''
|
value = address
|
||||||
)
|
)
|
||||||
|
city = ''
|
||||||
|
if self.user['address']:
|
||||||
|
if "~" in self.user['address']:
|
||||||
|
city = self.user['address'].split("~")[0].split("%")[0]
|
||||||
|
else:
|
||||||
|
city = self.user['address'].split("%")[0]
|
||||||
self.city = ft.TextField(
|
self.city = ft.TextField(
|
||||||
label="Oras",
|
label="Oras",
|
||||||
value = self.user['address'].split("~")[0].split('%')[0] if self.user['address'] and "~" in self.user['address'] else ''
|
value = city
|
||||||
)
|
)
|
||||||
self.company_name = ft.TextField(
|
self.company_name = ft.TextField(
|
||||||
label="Denumire firma",
|
label="Denumire firma",
|
||||||
|
|||||||
@@ -86,13 +86,21 @@ class Cart:
|
|||||||
)
|
)
|
||||||
self.user = self.page.session.get("user")
|
self.user = self.page.session.get("user")
|
||||||
self.company = self.company_manager.get_company(self.user['id'])
|
self.company = self.company_manager.get_company(self.user['id'])
|
||||||
|
prenume = ''
|
||||||
|
if "@default.com" not in self.user['email']:
|
||||||
|
if '~' in self.user['name']:
|
||||||
|
prenume = self.user['name'].split('~')[0]
|
||||||
self.first_name = ft.TextField(
|
self.first_name = ft.TextField(
|
||||||
label="Prenume",
|
label="Prenume",
|
||||||
value=self.user['name'].split('~')[0] if "@default.com" not in self.user['email'] and '~' in self.user['email'] else None
|
value=prenume
|
||||||
)
|
)
|
||||||
|
nume = ''
|
||||||
|
if "@default.com" not in self.user['email']:
|
||||||
|
if '~' in self.user['name']:
|
||||||
|
nume = self.user['name'].split('~')[1]
|
||||||
self.last_name = ft.TextField(
|
self.last_name = ft.TextField(
|
||||||
label="Nume",
|
label="Nume",
|
||||||
value=self.user['name'].split('~')[1] if "@default.com" not in self.user['email'] and '~' in self.user['email'] else None
|
value=nume
|
||||||
)
|
)
|
||||||
|
|
||||||
self.email = ft.TextField(
|
self.email = ft.TextField(
|
||||||
@@ -104,16 +112,28 @@ class Cart:
|
|||||||
label="Telefon",
|
label="Telefon",
|
||||||
value=self.user['phone'] if "@default.com" not in self.user['email'] else None
|
value=self.user['phone'] if "@default.com" not in self.user['email'] else None
|
||||||
)
|
)
|
||||||
|
address = ''
|
||||||
|
if self.user['address']:
|
||||||
|
if "~" in self.user['address']:
|
||||||
|
address = self.user['address'].split("~")[0].split("%")[1]
|
||||||
|
else:
|
||||||
|
address = self.user['address'].split("%")[1]
|
||||||
self.address = ft.TextField(
|
self.address = ft.TextField(
|
||||||
label="Strada si numar",
|
label="Strada si numar",
|
||||||
multiline=True,
|
multiline=True,
|
||||||
min_lines=3,
|
min_lines=3,
|
||||||
max_lines=5,
|
max_lines=5,
|
||||||
value = self.user['address'].split("~")[0].split("%")[1] if self.user['address'] and "~" in self.user['address'] else ''
|
value = address
|
||||||
)
|
)
|
||||||
|
city = ''
|
||||||
|
if self.user['address']:
|
||||||
|
if "~" in self.user['address']:
|
||||||
|
city = self.user['address'].split("~")[0].split("%")[0]
|
||||||
|
else:
|
||||||
|
city = self.user['address'].split("%")[0]
|
||||||
self.city = ft.TextField(
|
self.city = ft.TextField(
|
||||||
label="Oras",
|
label="Oras",
|
||||||
value = self.user['address'].split("~")[0].split('%')[0] if self.user['address'] and "~" in self.user['address'] else ''
|
value = city
|
||||||
)
|
)
|
||||||
|
|
||||||
self.company_name = ft.TextField(
|
self.company_name = ft.TextField(
|
||||||
|
|||||||
Reference in New Issue
Block a user