Skip to content

Commit

Permalink
Ekstrakcja ContactList i AddContactWindow, drobne poprawki po merge, …
Browse files Browse the repository at this point in the history 
…email regex fix, zmiana Contact w bazie - imie nazwisko nie jest nullable
  • Loading branch information
@ikarmus2001
ikarmus2001 committed May 6, 2024
1 parent beed952 commit eb07d4e
Show file tree
Hide file tree
Showing 3 changed files with 118 additions and 116 deletions.
2 changes: 2 additions & 0 deletions group_controller.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ def add_contact(self, g: Group, c: Contact) -> None:
if g._add_contact(c):
gc = GroupContacts(group_id=g.id, contact_id=c.email)
self.dbh.Save(gc)

# TODO delete contact binding?

def get_contacts(self, g: Group) -> list[Contact]:
return self.dbh.GetData(GroupContacts, group_id=g.id)
222 changes: 111 additions & 111 deletions interface.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
from tkinter import Menu, simpledialog, ttk, Listbox, Tk, Text, Button, Frame, Label, Entry, Scrollbar, Toplevel, Misc, messagebox, Menubutton, RAISED, VERTICAL, Canvas
from tkinter.ttk import Combobox
from tkinter.constants import NORMAL, DISABLED, BOTH, RIDGE, END, LEFT, RIGHT, TOP, X, Y, INSERT, SEL, WORD
from group_controller import GroupController\\\\\\
from models import Contact, IModel, Template, Group
from tkhtmlview import HTMLLabel

Expand Down Expand Up @@ -376,160 +377,159 @@ def show_placeholder_menu(event):
start_index = end_index

class GroupEditor(Toplevel):
def __init__(self, parent: AppUI, groupName: str | None = None, edited: Group | None = None):
def __init__(self, parent: AppUI, edited: Group | None = None):
super().__init__(parent.root)
self.parent = parent
self.currentGroup = edited

def prepareInterface(self):
self.title("Dodaj grupę")

name_label = Label(self, text="Nazwa grupy:", bg="lightblue")
name_label.grid(row=0, column=0, padx=5, pady=5)

self.name_entry = Entry(self, bg="white", fg="black")
self.name_entry.grid(row=0, column=1, padx=5, pady=5, sticky="ew")

email_label = Label(self, text="Adresy email:", bg="lightblue")
email_label.grid(row=1, column=0, padx=5, pady=5)

self.email_text = Text(self, bg="lightblue", fg="black", wrap=WORD)
btn_add_list_contact = Button(self, text="Dodaj z listy", bg="lightblue", fg="black", command=self.add_contact_from_list_window)
btn_save = Button(self, text="Zapisz", bg="lightblue", fg="black", command=self.__save_group_clicked)

name_label.grid(row=0, column=0, padx=5, pady=5)
self.name_entry.grid(row=0, column=1, padx=5, pady=5, sticky="ew")
email_label.grid(row=1, column=0, padx=5, pady=5)
self.email_text.grid(row=1, column=1, padx=5, pady=5, sticky="nsew")

btn_add_list_contact.grid(row=2, column=0, padx=5, pady=5, sticky="ew")
# btn_add_manual_contact.grid(row=2, column=1, padx=5, pady=5, sticky="ew")
btn_save.grid(row=3, column=0, columnspan=2, padx=5, pady=5, sticky="ew")

if self.currentGroup:
self.title(f"Edytuj grupę {self.currentGroup.name}")
self.name_entry.insert(INSERT, self.currentGroup.name)
[self.add_contact(c) for c in self.currentGroup.contacts]
else:
self.title("Dodaj grupę")

btn_add_list_contact = Button(self, text="Dodaj z listy", bg="lightblue", fg="black", command=self.add_contact_from_list_window)
btn_add_list_contact.grid(row=2, column=0, padx=5, pady=5, sticky="ew")

btn_add_manual_contact = Button(self, text="Dodaj ręcznie", bg="lightblue", fg="black", command=self.add_manual_contact_window)
btn_add_manual_contact.grid(row=2, column=1, padx=5, pady=5, sticky="ew")
def add_contact(self, c: Contact):
self.email_text.insert(INSERT, str(c.email) + "\n")

btn_save = Button(self, text="Zapisz", bg="lightblue", fg="black", command=self.__save_group_clicked)
btn_save.grid(row=3, column=0, columnspan=2, padx=5, pady=5, sticky="ew")
def add_contact_from_list_window(self):
contact_list_window = ContactList(self, self.currentGroup)
contact_list_window.prepareInterface()
# TODO: Odebrać info o dodawanych kontaktach, wywoływać add_contact

def add_contact(self, c: 'Contact'):
self.email_text.insert(INSERT, str(c.email) + "\n")
def __save_group_clicked(self) -> None:
if not self.currentGroup:
self.currentGroup = Group(_name = self.name_entry.get())
else:
self.currentGroup.name = self.name_entry.get()

email_addresses = self.email_text.get(1.0, END)
for mail in email_addresses.replace("\n", "").split(","):
try:
self.currentGroup._add_contact(Contact(_email=mail))
except AttributeError as e:
raise e
self.parent.add_group(self.currentGroup)
self.destroy()

def add_contact_from_list_window(self):
def search_contact():
search_criteria = search_entry.get().strip().lower()
for widget in contact_inner_frame.winfo_children():
widget.destroy()
for idx, (email, name, surname) in enumerate(fake_data):
if search_criteria in name.lower() or search_criteria in surname.lower() or search_criteria in email.lower():
Label(contact_inner_frame, text=f"Mail {idx+1}:").grid(row=idx, column=0, padx=5, pady=5)
Label(contact_inner_frame, text=f"{email} - {name} {surname}").grid(row=idx, column=1, padx=5, pady=5)
Button(contact_inner_frame, text="Dodaj kontakt", bg="lightblue", fg="black", command=lambda email=email: add_contact_from_list(email)).grid(row=idx, column=2, padx=5, pady=5)
class ContactList(Toplevel):
def __init__(self, parent: Toplevel, group: Group | None = None) -> None:
super().__init__(parent)
self.group = group
self.parent = parent

contact_window = Toplevel(self)
contact_window.title("Dodaj kontakt z listy")
def prepareInterface(self):
self.title("Dodaj kontakt z listy")

group_editor_geometry = self.winfo_geometry()
group_editor_geometry = self.parent.winfo_geometry()
self.geometry(group_editor_geometry)

contact_frame = Frame(self)
search_frame = Frame(contact_frame, bg="lightblue")
search_label = Label(search_frame, text="Wyszukaj:", bg="lightblue")
self.search_entry = Entry(search_frame, bg="white", fg="black")
search_button = Button(search_frame, text="Szukaj", bg="lightblue", fg="black", command=self.search_contact)
add_contact_button = Button(search_frame, text="Dodaj nowy kontakt", bg="lightblue", fg="black", command=self.add_manual_contact_window)
scrollbar = Scrollbar(contact_frame, orient=VERTICAL)
self.contact_canvas = Canvas(contact_frame, yscrollcommand=scrollbar.set)
self.contact_inner_frame = Frame(self.contact_canvas)

contact_window.geometry(group_editor_geometry)
scrollbar.config(command=self.contact_canvas.yview)

contact_frame = Frame(contact_window)
contact_frame.pack(fill=BOTH, expand=True)

search_frame = Frame(contact_frame, bg="lightblue")
search_frame.pack(fill=X, padx=5, pady=5)

search_label = Label(search_frame, text="Wyszukaj:", bg="lightblue")
search_label.pack(side=LEFT, padx=5, pady=5)

search_entry = Entry(search_frame, bg="white", fg="black")
search_entry.pack(side=LEFT, padx=5, pady=5, expand=True, fill=X)

search_button = Button(search_frame, text="Szukaj", bg="lightblue", fg="black", command=search_contact)
self.search_entry.pack(side=LEFT, padx=5, pady=5, expand=True, fill=X)
search_button.pack(side=LEFT, padx=5, pady=5)

scrollbar = Scrollbar(contact_frame, orient=VERTICAL)
add_contact_button.pack(side=LEFT, padx=5, pady=5)
scrollbar.pack(side=RIGHT, fill=Y)
self.contact_canvas.pack(side=LEFT, fill=BOTH, expand=True)
self.contact_canvas.create_window((0, 0), window=self.contact_inner_frame, anchor='nw')

# TODO Scroll - chyba popsułem ale idk, mało istotne teraz
self.contact_canvas.configure(scrollregion=self.contact_canvas.bbox("all"))
self.populateWindow()

contact_canvas = Canvas(contact_frame, yscrollcommand=scrollbar.set)
contact_canvas.pack(side=LEFT, fill=BOTH, expand=True)

scrollbar.config(command=contact_canvas.yview)

contact_inner_frame = Frame(contact_canvas)
contact_canvas.create_window((0, 0), window=contact_inner_frame, anchor='nw')

fake_data = [("[email protected]", "John", "Doe"),
("[email protected]", "Jane", "Smith"),
("[email protected]", "Michael", "Johnson"),
("[email protected]", "Emily", "Brown"),
("[email protected]", "William", "Jones"),
("[email protected]", "Olivia", "Taylor"),
("[email protected]", "David", "Anderson"),
("[email protected]", "Sophia", "Thomas"),
("[email protected]", "James", "Jackson"),
("[email protected]", "Emma", "White"),
("[email protected]", "Benjamin", "Harris"),
("[email protected]", "Isabella", "Martin"),
("[email protected]", "Daniel", "Thompson"),
("[email protected]", "Ava", "Garcia"),
("[email protected]", "Alexander", "Martinez"),
("[email protected]", "TEST", "16"),
("[email protected]", "TEST", "17")]

def add_contact_from_list(email):
self.email_text.insert(END, email + "\n")

for idx, (email, name, surname) in enumerate(fake_data):
Label(contact_inner_frame, text=f"Mail {idx+1}:").grid(row=idx, column=0, padx=5, pady=5)
Label(contact_inner_frame, text=f"{email} - {name} {surname}").grid(row=idx, column=1, padx=5, pady=5)
Button(contact_inner_frame, text="Dodaj kontakt", bg="lightblue", fg="black", command=lambda email=email: add_contact_from_list(email)).grid(row=idx, column=2, padx=5, pady=5)

def on_frame_configure(event):
contact_canvas.configure(scrollregion=contact_canvas.bbox("all"))

contact_inner_frame.bind("<Configure>", on_frame_configure)


def populateWindow(self):
# TODO: Sortowanie powinno być od elementów w grupie, a później wszystkie pozostałe z bazy
for idx, c in enumerate(Contact.all_instances):
self.create_contact_widget(c, idx)

# if self.group:
# for idx, c in enumerate(GroupController.get_contacts(self.group)):
# # TODO: Oznaczanie checkboxami który kontakt jest już dodany do grupy
# continue

def create_contact_widget(self, c: Contact, idx: int):
Label(self.contact_inner_frame, text=f"Mail {idx+1}:").grid(row=idx, column=0, padx=5, pady=5)
Label(self.contact_inner_frame, text=f"{c.email} - {c.first_name} {c.last_name}").grid(row=idx, column=1, padx=5, pady=5)
Button(self.contact_inner_frame, text="Dodaj kontakt", bg="lightblue", fg="black").grid(row=idx, column=2, padx=5, pady=5)
# command=GroupController.add_contact(self.group, c) - brak odniesienia do obiektu GroupController
# TODO: Tutaj pewnie braknie update parenta przy naciśnięciu przycisku

def search_contact(self):
search_criteria = self.search_entry.get().strip()
for widget in self.contact_inner_frame.winfo_children():
widget.destroy()

# TODO: Tutaj trzeba przemyśleć kiedy pojawiają się wszystkie kontakty, kiedy tylko te grupy, dodać wyszarzanie itd
for idx, c in enumerate(Contact.all_instances):
if search_criteria in c.first_name or search_criteria in c.last_name or search_criteria in c.email:
self.create_contact_widget(c, idx)

def add_manual_contact_window(self):
acw = AddContactWindow(self)
acw.prepareInterface()
# TODO: Odebrać sygnał od acw, create_contact_widget, powiadomić parent


class AddContactWindow(Toplevel):
def __init__(self, parent: Toplevel) -> None:
super().__init__(parent)

def prepareInterface(self):
contact_window = Toplevel(self)
contact_window.title("Dodaj kontakt ręcznie")

email_label = Label(contact_window, text="Adres email:", bg="lightblue")
email_label.grid(row=0, column=0, padx=5, pady=5)
self.email_entry = Entry(contact_window, bg="white", fg="black")
self.email_entry.grid(row=0, column=1, padx=5, pady=5)

name_label = Label(contact_window, text="Imię:", bg="lightblue")
name_label.grid(row=1, column=0, padx=5, pady=5)
self.name_entry = Entry(contact_window, bg="white", fg="black")
self.name_entry.grid(row=1, column=1, padx=5, pady=5)

surname_label = Label(contact_window, text="Nazwisko:", bg="lightblue")
surname_label.grid(row=2, column=0, padx=5, pady=5)
self.surname_entry = Entry(contact_window, bg="white", fg="black")
self.surname_entry.grid(row=2, column=1, padx=5, pady=5)

btn_add_contact = Button(contact_window, text="Dodaj kontakt", bg="lightblue", fg="black", command=self.add_manual_contact)

email_label.grid(row=0, column=0, padx=5, pady=5)
self.email_entry.grid(row=0, column=1, padx=5, pady=5)
name_label.grid(row=1, column=0, padx=5, pady=5)
self.name_entry.grid(row=1, column=1, padx=5, pady=5)
surname_label.grid(row=2, column=0, padx=5, pady=5)
self.surname_entry.grid(row=2, column=1, padx=5, pady=5)
btn_add_contact.grid(row=3, column=0, columnspan=2, padx=5, pady=5, sticky="ew")

def add_manual_contact(self):
email = self.email_entry.get()
name = self.name_entry.get()
surname = self.surname_entry.get()
if email:
self.email_text.insert(END, f"{email}\n")
newContact = Contact(email=email, first_name=name, last_name=surname)
# TODO: Jakiś sygnał do parenta żeby się zaktualizował?
else:
messagebox.showerror("Błąd", "Podaj adres e-mail")

def __save_group_clicked(self) -> None:
if not self.currentGroup:
self.currentGroup = Group(_name = self.name_entry.get())
else:
self.currentGroup.name = self.name_entry.get()

email_addresses = self.email_text.get(1.0, END)
for mail in email_addresses.replace("\n", "").split(","):
try:
self.currentGroup._add_contact(Contact(_email=mail))
except AttributeError as e:
# print(e)
raise e
self.parent.add_group(self.currentGroup)
self.destroy()
messagebox.showerror("Błąd", "Podaj adres e-mail")
10 changes: 5 additions & 5 deletions models.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,8 @@ class Contact(IModel):
__tablename__ = "Contacts"

_email = Column("email", String(100), primary_key=True)
_first_name = Column("first_name", String(50), nullable=True)
_last_name = Column("last_name", String(50), nullable=True)
_first_name = Column("first_name", String(50))
_last_name = Column("last_name", String(50))

def __init__(self, **kwargs) -> None:
"""Creates instance and adds it to all_instances
Expand All @@ -116,8 +116,8 @@ def __init__(self, **kwargs) -> None:
AttributeError: when email doesn't match standard pattern
"""
self.email = kwargs.pop("_email", None)
self.first_name = kwargs.pop("_first_name", None)
self.last_name = kwargs.pop("_last_name", None)
self.first_name = kwargs.pop("_first_name", "")
self.last_name = kwargs.pop("_last_name", "")
Contact.all_instances.append(self)
IModel.queueSave(child=self)

Expand All @@ -138,7 +138,7 @@ def get_by_id(cls, searched_id: int) -> Contact | None:

@staticmethod
def isEmail(candidate: str) -> bool:
if re.match(r"[^@]+@[^@]+\.[^@]+", candidate):
if re.match(r"^(?!.*@.*@.*$)[^@]+@[^@]+\.[^@]+$", candidate):
return True
return False

Expand Down

0 comments on commit eb07d4e

Please sign in to comment.