Debugged some errors

Author: PyMite6941

CLI/app/cli/cli_app.py

@@ -23,7 +23,7 @@ def __init__(self):
             data = result['data']
             types = ['expenses','income','budget','subscriptions','goals']
             for i in range(len(types)):
-                tracker.check_for_duplicates(data[types[i]])
+                tracker.check_for_duplicates(types[i])
             # Display a description of my project
             console.print(Panel("[bold white]This was my APCSP Project, an expense tracker. I wanted (and have) created a project that doesn't just look good for my GitHub it also works for my APCSP project!\nWho cares what I've learned, I've learned to create a valuable product.",title="[bold cyan]--- Expense Tracker ---[/bold cyan]",border_style='blue'))
             # Get user input from a questionary menu

CLI/app/pages/Add Material.py

@@ -122,8 +122,9 @@
         subscription_name = st.text_area('Subscription Name')
         subscription_price = st.number_input('Subscription Price',min_value=0.0,step=0.01)
         subscription_currency = st.selectbox('Subscription Currency',options=['USD','EUR','JPY','GBP','AUD','CAD','CHF','CNY','SEK','NZD','THB','INR','Other'])
+        subscription_start_date = st.date_input('Start Date')
         if st.form_submit_button('Add Subscription'):
-            results = st.session_state.tracker.add_subscriptions(subscription_name,subscription_price,subscription_currency)
+            results = st.session_state.tracker.add_subscriptions(subscription_name,subscription_price,subscription_currency,str(subscription_start_date))
             if results['success']:
                 st.success(results['message'])
                 sync_data()

CLI/app/pages/Edit Material.py

@@ -72,11 +72,17 @@
 elif choice == 'Subscription':
     # Edit subscription
     with st.form('edit_subscription_form'):
-        subscription_name = st.text_area('Subscription Name')
+        subscription_name = st.text_area('Current Subscription Name')
+        subscription_new_name = st.text_input('New Subscription Name (leave blank to keep)')
         subscription_price = st.number_input('Subscription Price',min_value=0.0,step=0.01)
         subscription_currency = st.selectbox('Subscription Currency',options=['USD','EUR','JPY','GBP','AUD','CAD','CHF','CNY','SEK','NZD','THB','INR','Other'])
         if st.form_submit_button('Edit Subscription'):
-            results = st.session_state.tracker.edit_subscription(subscription_name,price=subscription_price,currency=subscription_currency)
+            results = st.session_state.tracker.edit_subscription(
+                subscription_name,
+                price=subscription_price if subscription_price > 0 else None,
+                name=subscription_new_name if subscription_new_name else None,
+                currency=subscription_currency,
+            )
             if results['success']:
                 st.success(results['message'])
                 sync_data()

CLI/app/pages/View Expenses.py

@@ -34,8 +34,8 @@
 else:
     st.write("No expenses found. Add expenses to get started.")
 # Import / export expenses via .csv
-st.file_uploader("Import expenses from .csv", type=["csv"], key="file_uploader")
-if st.session_state.file_uploader:
+st.file_uploader("Import expenses from .csv", type=["csv"], key="expenses_file_uploader")
+if st.session_state.expenses_file_uploader:
     st.session_state.tracker.import_from_csv("expenses",st.session_state.file_uploader)
     sync_data()
     st.success("Data imported successfully!")

CLI/app/pages/View Income.py

@@ -34,8 +34,8 @@
 else:
     st.write("No income found. Add income to get started.")
 # Import / export income via .csv
-st.file_uploader("Import income from .csv", type=["csv"], key="file_uploader")
-if st.session_state.file_uploader:
+st.file_uploader("Import income from .csv", type=["csv"], key="income_file_uploader")
+if st.session_state.income_file_uploader:
     st.session_state.tracker.import_from_csv("income",st.session_state.file_uploader)
     sync_data()
     st.success("Data imported successfully!")

CLI/app/pages/View Subscriptions.py

@@ -11,10 +11,7 @@
 
 st.title('View Subscriptions')
 search = st.text_input("Search subscriptions ...","")
-# If subscription is empty
-if not st.session_state.subscriptions:
-    st.write("No subscriptions found. Add subscriptions to get started.")
-if search and search != "":
+if search:
     subscriptions = [subscription for subscription in st.session_state.subscriptions if search.lower() in subscription['name'].lower()]
 else:
     subscriptions = st.session_state.subscriptions
@@ -25,12 +22,14 @@
         with col1:
             st.write(f"**{subscription_item['name']}**")
         with col2:
-            st.write(f"**{subscription_item['price']:.2f} {subscription_item['currency'].upper()}**")
-else:
+            st.write(f"**{float(subscription_item['price']):.2f} {subscription_item['currency'].upper()}**")
+elif search:
     st.write(f"No subscriptions found using search term '{search}'.")
+else:
+    st.write("No subscriptions found. Add subscriptions to get started.")
 # Import / export subscriptions via .csv
-st.file_uploader("Import subscriptions from .csv", type=["csv"], key="file_uploader")
-if st.session_state.file_uploader:
+st.file_uploader("Import subscriptions from .csv", type=["csv"], key="subscriptions_file_uploader")
+if st.session_state.subscriptions_file_uploader:
     st.session_state.tracker.import_from_csv("subscriptions",st.session_state.file_uploader)
     sync_data()
     st.success("Data imported successfully!")

CLI/core/core_stuff.py

@@ -760,7 +760,7 @@ def convert_prices_to_currency(self,to_currency:str) -> Dict[str,Any]:
         self.write_file(data)
         return {'success':True,'message':f'Successfully converted to {to_currency.upper()}'}
 
-    def check_for_duplicates(self,array:list) -> Dict[bool,str]:
+    def check_for_duplicates(self,array:str) -> Dict[bool,str]:
         # Define the list to process
         result = self.open_file()
         data = result['data']
@@ -824,4 +824,4 @@ def validate_update(latest_tag):
 def start_update():
     subprocess.run(["git","pull"],check=True)
     subprocess.run([sys.executable,"-m","pip","install","-r","requirements.txt"],check=True)
-    return {'success':True,'messaage':'Close the program to run with the new updates'}
+    return {'success':True,'message':'Close the program to run with the new updates'}