fix admin clients

UI_V2/admin/clients.py

@@ -8,10 +8,19 @@ class Clients:
         self.user_manager = Users()
         self.company_manager = Company()
  
-        self.user_name = ft.TextField(label="Nume si Prenume")
+        self.first_name = ft.TextField(label="Prenume")
+        self.last_name = ft.TextField(label="Nume")
         self.email = ft.TextField(label="E-mail")
         self.phone = ft.TextField(label="Telefon")
-        self.address = ft.TextField(label="Adresa", multiline=True, min_lines=3, max_lines=5)
+        self.address = ft.TextField(
+            label="Strada si numar", 
+            multiline=True, 
+            min_lines=3, 
+            max_lines=5
+        )
+        self.city = ft.TextField(
+            label="Oras"
+        )
         self.company_name = ft.TextField(label="Denumire firma")
         self.vat = ft.TextField(label="CUI")
         self.register_number = ft.TextField(label="Numar registru comert")
@@ -27,10 +36,12 @@ class Clients:
 
         self.client_column = ft.Column(
             [
-                self.user_name,
+                self.first_name,
+                self.last_name,
                 self.email,
                 self.phone,
                 self.address,
+                self.city,
                 ft.Button("Persoana Juridica?", on_click=self.on_is_comopany_btn_click),
                 self.company_placeholder,
                 ft.Button("Adresa de livrare difera de adresa de domiciliu?", on_click=self.on_second_address),
@@ -130,12 +141,37 @@ class Clients:
         self.view_second_address_placeholder.controls.clear()
 
     def on_edit_btn_click(self, item):
+        print(item)
         self.edit_id = item['id']
-        self.user_name.value = item['name']
+        prenume = ''
+        if '~' in item['name']:
+            prenume = item['name'].split('~')[0] 
+        self.first_name.value=prenume
+        
+        nume = ''
+        if '~' in item['name']:
+            nume = item['name'].split('~')[1] 
+        self.last_name.value=nume
+        
+        address = ''
+        if item['address']:
+            if "~" in item['address']:
+                address = item['address'].split("~")[0].split("%")[1]
+            else:
+                address = item['address'].split("%")[1]
+        self.address.value = address
+
+        city = ''
+        if item['address']:
+            if "~" in item['address']:
+                city = item['address'].split("~")[0].split("%")[0]
+            else:
+                city = item['address'].split("%")[0]
+        self.city.value = city
+
         self.email.value = item['email']
         self.email.disabled = True
         self.phone.value = item['phone']
-        self.address.value = item['address'].split("~")[0]
         company = self.company_manager.get_company(item['id'])
         if company:
             self.company_name.value = company['name']
@@ -168,10 +204,10 @@ class Clients:
         self.page.close(self.confirm_delete_alert)
 
     def on_view_btn_click(self, item):
-        self.view_name.value = f"Nume: {item['name']}"
+        self.view_name.value = f"Nume: {item['name'].replace("~", " ")}"
         self.view_email.value = f"E-mail: {item['email']}"
         self.view_phone.value = f"Telefon: {item['phone']}"
-        self.view_address.value = f"Adresa: {item['address'].split("~")[0]}"
+        self.view_address.value = f"Adresa: {item['address'].split("~")[0].replace("%", ", ")}"
         company = self.company_manager.get_company(item['id'])
         if company:
             self.view_company_placeholder.controls.append(ft.Text(""))
@@ -200,7 +236,7 @@ class Clients:
 
                         ft.Column(
                             [
-                                ft.Text(value=item['name'], weight=ft.FontWeight.BOLD),
+                                ft.Text(value=item['name'].replace("~", " "), weight=ft.FontWeight.BOLD),
                                 ft.Text(value=item['email'], size=12)
                             ]
                         ),
@@ -236,7 +272,7 @@ class Clients:
         ]
 
     def on_save_btn_click(self, e):
-        user_name = self.user_name.value
+        user_name = self.first_name.value + "~" + self.last_name.value
         user_email = self.email.value
         user_phone = self.phone.value
         user_address = self.address.value
@@ -279,8 +315,10 @@ class Clients:
         self.clear_fileds()
     
     def clear_fileds(self):
-        self.user_name.value = ''
-        self.user_name.update()
+        self.first_name.value = ''
+        self.first_name.update()
+        self.last_name.value = ''
+        self.last_name.update()
         self.email.value = ''
         self.email.update()
         self.phone.value = ''

UI_V2/admin/fidelity_cards.py

@@ -137,7 +137,7 @@ class FidelityCards:
                                     [
                                         ft.Text(value=f"Id card: {item['card_id']};", size=12),
                                         ft.Text(value=f"Reducere: {item['card_type']}%;", size=12),
-                                        ft.Text(value=f"Telefon: {item['phone_number']}%", size=12)
+                                        ft.Text(value=f"Telefon: {item['phone_number']}", size=12)
                                     ],
                                     spacing=10
                                 )