Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Development Progress - week 01 #46

Merged
merged 15 commits into from
Jun 4, 2023
Merged

Development Progress - week 01 #46

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
ac3d5f8
Update subcategories menu
rayapetkova May 29, 2023
bf3b48f
Merge pull request #41 from Stake-And-Rope/raya_development
karastoyanov May 29, 2023
9e05aa7
major main_menu fixes
karastoyanov May 30, 2023
60f714a
Main Menu Update
karastoyanov May 30, 2023
30ffad1
Print Function Updated
karastoyanov May 30, 2023
27e2f8d
Merge pull request #44 from Stake-And-Rope/raya_development
karastoyanov May 30, 2023
37c8e7a
Merge pull request #45 from Stake-And-Rope/alex_development
karastoyanov May 30, 2023
7ad31d2
Update Meeting Notes_week01
karastoyanov May 30, 2023
27fc837
Main Menu major update
karastoyanov May 31, 2023
ffa0991
user settings update
karastoyanov May 31, 2023
e7a13ba
show/hide different groupbox on gridlayout(1,1)
karastoyanov May 31, 2023
c937fae
update user settings menu fix
karastoyanov Jun 1, 2023
30958cd
Update user data - not fully implemented
karastoyanov Jun 3, 2023
03672a6
Fix update_user function preventing re-opening the categoroies
karastoyanov Jun 3, 2023
e07dbe6
Added images and made a few changes in the subcategories_menu
rayapetkova Jun 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
97 changes: 70 additions & 27 deletions pyqt5-gui/main_menu.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@
global subcategory_name
subcategory_name = ''


"""INIT CONNECTION TO THE DATABASE"""
postgres_conn.admin_client()

class MainMenu(QWidget):
def __init__(self):
Expand All @@ -41,8 +42,7 @@ def __init__(self):
self.setMaximumWidth(1500)
self.setMaximumHeight(700)

"""INIT CONNECTION TO THE DATABASE"""
postgres_conn.admin_client()


"""OPEN THE PROPER SUBCATEGORY"""
def open_func(subcat_name):
Expand Down Expand Up @@ -71,7 +71,7 @@ def open_func(subcat_name):
"""LEFT LAYOUT BUTTONS CALL FUNCTION"""
left_layout_buttons_dict = {
'edit_account': lambda: open_update_account(),
'view_my_orders': lambda: print("My Orders"),
'view_my_orders': lambda: open_user_orders(),
'payment_options': lambda: print("Payment Options"),
'back': lambda: print("Go Back to categories"),
}
Expand Down Expand Up @@ -243,42 +243,85 @@ def open_func(subcat_name):
"""OPEN EDIT ACCOUNT LAYOUT/REPLACE CATEGORIES LAYOUT"""
karastoyanov marked this conversation as resolved.
Show resolved Hide resolved
def open_update_account():
# Change to dynamic query in implementation
postgres_conn.POSTGRES_CURSOR.execute(f"SELECT first_name, last_name FROM customers WHERE username = 'pesho'")
postgres_conn.POSTGRES_CURSOR.execute(f"SELECT first_name, last_name, email_address, phone FROM customers WHERE username = 'pesho'")
result = postgres_conn.POSTGRES_CURSOR.fetchone()

update_user_settings_groupbox = QGroupBox("Update Account Settings")
update_user_settings_layout = QVBoxLayout()
update_user_settings_layout.addStretch()
update_user_settings_layout.addSpacing(10)

text_labels = deque(['First Name', 'Last Name', 'Current Email Address', 'Phone Number'])
text_labels_length = len(text_labels)
for i in range(text_labels_length - 1):
if i != 3:
current_text_label = QLabel()
current_text_label.setText(text_labels.popleft())
current_text_label.setFont(QFont(fonts[0], 12))

current_line_edit = QLineEdit()
current_line_edit.setText(result[i])
current_line_edit.setFont(QFont(fonts[0], 12))
current_line_edit.setMaximumWidth(250)
else:
current_text_label = QLabel()
current_text_label.setText("New Email Address")
current_text_label.setFont(QFont(fonts[0], 12))

current_line_edit = QLineEdit()
current_line_edit.setFont(QFont(fonts[0], 12))
current_line_edit.setMaximumWidth(250)


update_user_settings_layout.addWidget(current_text_label)
update_user_settings_layout.addWidget(current_line_edit)


first_name_label = QLabel()
first_name_label.setText("First Name")
first_name_label.setFont(QFont(fonts[0], 12))

first_name_texbox = QLineEdit()
first_name_texbox.setText(result[0])
first_name_texbox.setFont(QFont(fonts[0], 12))

last_name_label = QLabel()
last_name_label.setText("Last Name")
last_name_label.setFont(QFont(fonts[0], 12))

last_name_textbox = QLineEdit()
last_name_textbox.setText(result[1])
last_name_textbox.setFont(QFont(fonts[0], 12))

update_user_settings_layout.addWidget(first_name_label)
update_user_settings_layout.addWidget(first_name_texbox)
update_user_settings_layout.addWidget(last_name_label)
update_user_settings_layout.addWidget(last_name_textbox)

update_user_settings_groupbox.setLayout(update_user_settings_layout)
# first_name_label = QLabel()
# first_name_label.setText("First Name")
# first_name_label.setFont(QFont(fonts[0], 12))
# first_name_textbox = QLineEdit()
# first_name_textbox.setText(result[0])
# first_name_textbox.setMaximumWidth(200)
# first_name_textbox.setFont(QFont(fonts[0], 12))
#
# last_name_label = QLabel()
# last_name_label.setText("Last Name")
# last_name_label.setFont(QFont(fonts[0], 12))
# last_name_textbox = QLineEdit()
# last_name_textbox.setText(result[1])
# last_name_textbox.setMaximumWidth(200)
# last_name_textbox.setFont(QFont(fonts[0], 12))
#
# current_email_address_label = QLabel()
# current_email_address_label.setText("Current Email Address")
# current_email_address_label.setFont(QFont(fonts[0], 12))
# current_email_address_textbox = QLineEdit()
# current_email_address_textbox.setText(result[2])
# current_email_address_textbox.setMaximumWidth(200)
# current_email_address_textbox.setFont(QFont(fonts[0], 12))
#
# update_user_settings_layout.addWidget(first_name_label)
# update_user_settings_layout.addWidget(first_name_textbox)
# update_user_settings_layout.addWidget(last_name_label)
# update_user_settings_layout.addWidget(last_name_textbox)
# update_user_settings_layout.addWidget(current_email_address_label)
# update_user_settings_layout.addWidget(current_email_address_textbox)
update_user_settings_layout.addStretch()
update_user_settings_layout.addSpacing(150)


update_user_settings_groupbox.setLayout(update_user_settings_layout)
update_user_settings_groupbox.setLayout(update_user_settings_layout)

# Remove Categories groupbox and place update user settings in main_layout(1,1)
categories_groupbox.deleteLater()
main_layout.addWidget(update_user_settings_groupbox, 1, 1)

"""OPEN USER ORDERS HISTORY/REPLACE CATEGORIES LAYOUT"""
def open_user_orders():
pass


"""OPEN SUBCATEGORIES WINDOW"""
def open_subcategories():
Expand Down