From 1e95d2b6055f94be52c7125d0b2a5addfb7ba8ca Mon Sep 17 00:00:00 2001
From: Lucas Mathews <l.mathews@student.fontys.nl>
Date: Sun, 2 Jun 2024 23:18:46 +0200
Subject: [PATCH] Continue development of new transaction page

---
 .../__pycache__/connection.cpython-312.pyc    | Bin 15136 -> 14945 bytes
 application/account.py                        |   5 --
 application/connection.py                     |   1 -
 application/new_transaction.py                |  60 ++++++++++--------
 application/session_data.json                 |   2 +-
 bank.db                                       | Bin 704512 -> 704512 bytes
 manager.py                                    |   1 -
 7 files changed, 36 insertions(+), 33 deletions(-)

diff --git a/application/__pycache__/connection.cpython-312.pyc b/application/__pycache__/connection.cpython-312.pyc
index 16cfd69a1416a8a82d0750a73fabe8235b42002b..f9bdd65bf62058489a8656f14210ce61e140ffce 100644
GIT binary patch
delta 307
zcmZ2b_OOKaG%qg~0}vd!6O(4Wk=I&!^LzQdjFS~*Ehf*96rDUnwuWgX*W`nu%9Hmh
z2~GBvv*!v0sxAZK;?I*6l$|F(m)p$vd9sv>-R7I}`<Xb4f`L++Y(<fiFDSXO#sE2O
zlckmau@;2^nVTb2HZd_qP3BhbWs3sxi{d8FQ+E(b05Ycmaj_~R149GD2Nt2piDK%T
z#WgaSfr=Zog&89zPt{K1P6lbQ1`$y}eX^6~byQi?fZR2c?WIgM*XlU4u;v1}yEh*-
zaA9MNpKK^6JXzM<hAkhYrC@TrxjQS!;iopQHeb&q5AsJ5$bm(LAR+-ofJ`d_nNd_W
axzb9Ov1;;kt0*=;#!SXf3X{KEX#xPY@Kk*O

delta 742
zcmY+AOH30%7{_P!Ra#nB8w!E4?b1rMEgDU*u_Zp*swC3rL8EQst9HN?wN18bi)1U_
zJegp=10h1vtEon$#sg6j;m8GzA)YiQ9z7UIjNF_lRAn~%-{1F|`R{zyt0mj2&1OM#
zb#10bCtunIoo7B^gr<>Bb!!o9peJaKt8Hg6G9#V;TjdB}<F=y1sDgE|Ss9aHsnabB
zgg(s<j9~GQE23MQO+@UXNTi0ECMZvGq@@v=4V1&rEVb>UD!jpu$?$%Ek3d1B&>gA>
zq}32gxM(6)gEE^dVNL$eyv-1Hn!hK&Th)zQAS3s{rs|CT`_VQ-+}TTHvWx7V<+5A~
z5uqa97te2h%eaij`4lQ+za0c69GKWQG@|Rd{7p5J%@*$Fb(M_hncVH7I$F@0xobHR
zQQ@fa*yOip2dG(i=kUUBCE>ZioYS|+Q#%jPH^IDS9hgtgC)O;{k3#GRXN62h1g2cC
zqQwa9o3h6G(QHRd<rktsipws{R25@>({i7QalaDx@hfI~yq8~bV#d89)hvdpx4k~&
ze#*f{pcB>|ZLp!(@g*4coVKLt-Vd3NUvSnHhtHnZxCp1*$LcfQ1r8@6;d>+{X<fSv
zUwkLTs}!f}d-l%pjz)HnmD-s&m|TSQz>U@n!$u`ZhZMLT>=OyiJ%{7n1NEg~To7;3
z@J(Ghcv8YwU^sM6y2EDjPz?=<I>puc_s|Q@&2C9!7PSHscDlxP(%8JF!(v#$<M1h*
OmSmj6KRs|H;{OBdKdP4i

diff --git a/application/account.py b/application/account.py
index 77430ef..90350e8 100644
--- a/application/account.py
+++ b/application/account.py
@@ -66,11 +66,6 @@ def display_account_info(account_id):
         label_value = customtkinter.CTkLabel(info_frame, text=value, font=("Helvetica", 14))
         label_key.grid(row=0, column=i*2, sticky='w', padx=10)
         label_value.grid(row=0, column=i*2+1, sticky='w', padx=10)
-    notes = get_account(account_id).get('data', {}).get('notes', '')
-    
-    print(f"Account: {account}")  # Debugging
-    print(f"Account: {notes}")  # Debugging
-    
     notes_text.configure(text=account.get('notes', ''))
 
 def on_transaction_double_click(event):
diff --git a/application/connection.py b/application/connection.py
index 429c721..784eb51 100644
--- a/application/connection.py
+++ b/application/connection.py
@@ -117,7 +117,6 @@ def get_transactions(account_id):
 
 def get_account(account_id):
     """Retrieves the account details for the given account_id."""
-    print(f"Getting account details for account_id: {account_id}")
     try:
         with open('application\\session_data.json', 'r') as f:
             session_data = json.load(f)
diff --git a/application/new_transaction.py b/application/new_transaction.py
index 2ea9050..5c3cfa8 100644
--- a/application/new_transaction.py
+++ b/application/new_transaction.py
@@ -24,54 +24,63 @@ else:
 
 def submit_transaction():
     """Submit a new transaction to the server."""
-    global account_id, recipient_id
     account_id = account_combobox.get()
-    recipient_id = recipient_text.get()
-    amount = amount_text.get() if amount_text.get() != "" else None
-    description = description_text.get() if description_text.get() != "" else None
-    if not description or not amount or not recipient_id or not account_id:
+    recipient_id = recipient_text.get("1.0", "end-1c")
+    amount = amount_text.get("1.0", "end-1c")
+    description = description_text.get("1.0", "end-1c")
+
+    if not amount or not recipient_id or not account_id:
         messagebox.showerror("Error", "Please fill in all fields.")
         return
-    account_verification = verify_accounts(account_id, recipient_id)
+
+    # Convert amount to float
+    try:
+        amount = float(amount)
+    except ValueError:
+        messagebox.showerror("Error", "Invalid amount entered.")
+        return
+
+    account_verification = verify_accounts()
     if account_verification is False:
         messagebox.showerror("Error", "Could not verify account IDs.")
         return
+
     response = new_transaction(account_id, description, amount, recipient_id)
     if response is None or "data" not in response:
         messagebox.showerror("Error", "Could not submit transaction.")
         return
+
     transaction_id = response["data"]
     otp = generate_otp(account_id, transaction_id)
     if otp is None or "data" not in otp:
         messagebox.showerror("Error", "Could not generate OTP.")
         return
+
     messagebox.showinfo("Success", f"Transaction submitted successfully. OTP: {otp['data']}")
 
 def verify_accounts():
     """Verify that the account IDs are valid."""
     try:
+        account_id = account_combobox.get()
+        recipient_id = recipient_text.get("1.0", "end-1c")
         account = get_account(account_id)
-        recipient_account = get_account(recipient_id)
-        print(account)
-        print(recipient_account)
+        recipient_id = get_account(recipient_id)
     except requests.exceptions.RequestException as e:
         messagebox.showerror("Error", f"Failed to get account details: {e}")
         return False
-
-    if account is None or recipient_account is None or "data" not in account or "data" not in recipient_account:
+    if account is None or recipient_id is None or "data" not in account or "data" not in recipient_id:
         messagebox.showerror("Error", "Server did not return the expected response.")
         return False
     if "account_id" not in account["data"]:
         messagebox.showerror("Error", "Account ID not found.")
         return False
-    if "account_id" not in recipient_account["data"]:
+    if "account_id" not in recipient_id["data"]:
         messagebox.showerror("Error", "Recipient Account ID not found.")
         return False
-    #check balance
-    if account["data"]["balance"] < float(amount_text.get("1.0", "end-1c")):
+    amount = amount_text.get("1.0", "end-1c")
+    if account["data"]["balance"] < amount: # Check the client has the required balance
         messagebox.showerror("Error", "Insufficient funds.")
         return False
-    submit_button.configure(state=tk.NORMAL)  # Enable the submit button if the accounts are valid
     messagebox.showinfo("Success", "Accounts verified successfully.")
     return True
 
@@ -107,22 +116,23 @@ welcome_label.pack(pady=20)
 close_button = customtkinter.CTkButton(root, text="Cancel and Close", command=root.destroy)
 close_button.pack(side="top", anchor="e", padx=10, pady=10)
 
-# Create the account ID label and combobox
-account_label = customtkinter.CTkLabel(root, text="Account ID:", font=("Helvetica", 14))
+# Create a frame for the account ID combobox
+account_label = customtkinter.CTkLabel(root, text="From Account ID:", font=("Helvetica", 14))
 account_label.pack(pady=5)
-account_combobox = ttk.Combobox(root, height=1, width=250)
-account_combobox.pack(pady=5)
+account_frame = ttk.Frame(root, width=200, height=25)
+account_frame.pack_propagate(0)  # Don't shrink
+account_frame.pack(pady=5)
+
+# Create the account ID combobox inside the frame
+account_combobox = ttk.Combobox(account_frame, height=1)
+account_combobox.pack(fill='both', expand=True)
 
 # Create the recipient ID label and text box
-recipient_label = customtkinter.CTkLabel(root, text="Recipient ID:", font=("Helvetica", 14))
+recipient_label = customtkinter.CTkLabel(root, text="To Recipient ID:", font=("Helvetica", 14))
 recipient_label.pack(pady=5)
 recipient_text = customtkinter.CTkTextbox(root, height=2, width=250)
 recipient_text.pack(pady=5)
 
-# Create the verify buttons
-verify_button = customtkinter.CTkButton(root, text="Verify Accounts", command=verify_accounts)
-verify_button.pack(pady=10)
-
 # Create the transaction description label and text box
 description_label = customtkinter.CTkLabel(root, text="Description:", font=("Helvetica", 14))
 description_label.pack(pady=5)
@@ -146,7 +156,7 @@ otp_text = customtkinter.CTkTextbox(root, height=2, width=250)
 otp_text.pack(pady=5)
 
 # Create the submit button
-submit_button = customtkinter.CTkButton(root, text="Submit", command=submit_transaction, state=tk.DISABLED)
+submit_button = customtkinter.CTkButton(root, text="Submit", command=submit_transaction)
 submit_button.pack(pady=5)
 
 # Populate accounts combobox with the given client_id
diff --git a/application/session_data.json b/application/session_data.json
index 475caa5..63b4f0c 100644
--- a/application/session_data.json
+++ b/application/session_data.json
@@ -1 +1 @@
-{"session_cookie": {"session": "zEUX5N4IojE58Mg8yfVC0XiNC-IcnHaZcBJRMRH9J94"}, "client_id": "9755c18f"}
\ No newline at end of file
+{"session_cookie": {"session": "0vm2PELvoXxLiOtpdLDR6M4-WHJq5xq5BX92b46UTkM"}, "client_id": "9755c18f"}
\ No newline at end of file
diff --git a/bank.db b/bank.db
index 374ded4f644c019a5cb7792bbbcfcf0f5a5000c9..12b90837e19a133e22fdfb12720356a2482cee96 100644
GIT binary patch
delta 114
zcmZo@&~9kZo*>Q0HBrWyk!xeZqWyeI45|#F4E#&@1Nrvw#cUQZ5aMTHU|`UntY)vx
z9mvEfD{E{l3#2CN+B<OgrIst?<(H&3FFD`7<UAt~GXXI(5VHU=D-g2*F*^`*Y+rJo
HGv)&THEt%+

delta 89
zcmZo@&~9kZo*>Q0F;T{ukz-@RqWydw45|#F4E#&@mH77X#cUQZsNiQ|U|^7$++#1%
jyySfQlJkr}%ml>DK+FQftU$~L#Oy%Kv3<#T&X^AXA}Ask

diff --git a/manager.py b/manager.py
index c9dd5f3..55a5303 100644
--- a/manager.py
+++ b/manager.py
@@ -261,7 +261,6 @@ def get_account(account_id:str):
     account = session.query(Account).filter_by(account_id=account_id).one_or_none()
     for account in session.query(Account).all():
         if account.account_id == account_id:
-            print(account.to_dict())
             return format_response(True, "", account.to_dict()), 200
     return format_response(False, "Account not found."), 404