From 7222aded816333e813a5263805cffe6994e7e627 Mon Sep 17 00:00:00 2001 From: tsabin2023 <148308137+tsabin2023@users.noreply.github.com> Date: Fri, 17 Nov 2023 10:25:39 -0800 Subject: [PATCH 1/3] Update main.py --- main.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/main.py b/main.py index 67fb91b..1c7ee8c 100644 --- a/main.py +++ b/main.py @@ -36,13 +36,13 @@ def root(): # Show last product added cur.execute('SELECT productId, name, price, description, image, stock FROM products ORDER BY productId DESC LIMIT 1 ') # Show all items - #cur.execute('SELECT productId, name, price, description, image, stock FROM products LIMIT 1') + cur.execute('SELECT productId, name, price, description, image, stock FROM products LIMIT 1') # hashtag in front of line removed by Tyler Sabin 11/16/2023 item_data = cur.fetchall() # Show an error instead of the categories category_data = [(-1,"Error")] # Show all categories - #cur.execute('SELECT categoryId, name FROM categories') - #category_data = cur.fetchall() + cur.execute('SELECT categoryId, name FROM categories') # hashtag in front of line removed by Tyler Sabin 11/16/2023 + category_data = cur.fetchall() # hashtag in front of line removed by Tyler Sabin 11/16/2023 item_data = parse(item_data) return render_template('home.html', itemData=item_data, loggedIn=logged_in, firstName=first_name, noOfItems=no_of_items, categoryData=category_data) From c4a6e489de0ff9e71fea14924af2174ee8649ed4 Mon Sep 17 00:00:00 2001 From: tsabin2023 <148308137+tsabin2023@users.noreply.github.com> Date: Sat, 18 Nov 2023 10:19:32 -0800 Subject: [PATCH 2/3] Category and Fiction list debugged. This is the debugged category list and category is now showing. Also, debugged the Fiction list to now inform user that there are no books currently in fiction. --- __pycache__/main.cpython-312.pyc | Bin 0 -> 22541 bytes main.py | 9 ++++++--- 2 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 __pycache__/main.cpython-312.pyc diff --git a/__pycache__/main.cpython-312.pyc b/__pycache__/main.cpython-312.pyc new file mode 100644 index 0000000000000000000000000000000000000000..ea81de31702002b54de3701e13c6a3e127d4436e GIT binary patch literal 22541 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 literal 0 HcmV?d00001 diff --git a/main.py b/main.py index 1c7ee8c..7505120 100644 --- a/main.py +++ b/main.py @@ -39,7 +39,7 @@ def root(): cur.execute('SELECT productId, name, price, description, image, stock FROM products LIMIT 1') # hashtag in front of line removed by Tyler Sabin 11/16/2023 item_data = cur.fetchall() # Show an error instead of the categories - category_data = [(-1,"Error")] + # category_data = [(-1,"Error")] hashtag added variable was being rewritten by another line, so thin line nolonger needed Tyler Sabin 11/17/2023 # Show all categories cur.execute('SELECT categoryId, name FROM categories') # hashtag in front of line removed by Tyler Sabin 11/16/2023 category_data = cur.fetchall() # hashtag in front of line removed by Tyler Sabin 11/16/2023 @@ -93,8 +93,11 @@ def displayCategory(): "SELECT products.productId, products.name, products.price, products.image, categories.name FROM products, categories WHERE products.categoryId = categories.categoryId AND categories.categoryId = " + category_id) data = cur.fetchall() conn.close() - category_name = data[0][4] - data = parse(data) + if data: # Tyler Sabin 11/18/2023 + category_name = data[0][4] # line moved by Tyler Sabin 11/18/2023 + else: # Tyler Sabin 11/18/2023 + category_name = " Sorry, there are no books in this category at this time" # Tyler Sabin 11/18/2023 + data = parse(data) # line moved by Tyler Sabin 11/18/2023 return render_template('displayCategory.html', data=data, loggedIn=logged_in, firstName=first_name, noOfItems=no_of_items, categoryName=category_name) From 1b8904f3de7bbf63aa41c0c16af884ae8b477aa4 Mon Sep 17 00:00:00 2001 From: tsabin2023 <148308137+tsabin2023@users.noreply.github.com> Date: Tue, 21 Nov 2023 20:53:30 -0800 Subject: [PATCH 3/3] Update main.py Zak's Orders to put error back in fiction category. Please check and merge with main. --- main.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/main.py b/main.py index 7505120..1c7ee8c 100644 --- a/main.py +++ b/main.py @@ -39,7 +39,7 @@ def root(): cur.execute('SELECT productId, name, price, description, image, stock FROM products LIMIT 1') # hashtag in front of line removed by Tyler Sabin 11/16/2023 item_data = cur.fetchall() # Show an error instead of the categories - # category_data = [(-1,"Error")] hashtag added variable was being rewritten by another line, so thin line nolonger needed Tyler Sabin 11/17/2023 + category_data = [(-1,"Error")] # Show all categories cur.execute('SELECT categoryId, name FROM categories') # hashtag in front of line removed by Tyler Sabin 11/16/2023 category_data = cur.fetchall() # hashtag in front of line removed by Tyler Sabin 11/16/2023 @@ -93,11 +93,8 @@ def displayCategory(): "SELECT products.productId, products.name, products.price, products.image, categories.name FROM products, categories WHERE products.categoryId = categories.categoryId AND categories.categoryId = " + category_id) data = cur.fetchall() conn.close() - if data: # Tyler Sabin 11/18/2023 - category_name = data[0][4] # line moved by Tyler Sabin 11/18/2023 - else: # Tyler Sabin 11/18/2023 - category_name = " Sorry, there are no books in this category at this time" # Tyler Sabin 11/18/2023 - data = parse(data) # line moved by Tyler Sabin 11/18/2023 + category_name = data[0][4] + data = parse(data) return render_template('displayCategory.html', data=data, loggedIn=logged_in, firstName=first_name, noOfItems=no_of_items, categoryName=category_name)