.

2025-04-08 19:43:50 +01:00
parent c9c287aa8a
commit c0b5e95d98
2 changed files with 30 additions and 33 deletions
@@ -22,27 +22,17 @@ try:
    master_transactions = transactions.join(categories, left_on='category_id', right_on='category_id', suffix='_category')\
                        .join(accounts, left_on='account_id', right_on='account_id', suffix='_account')\
                        .join(payees, left_on='payee_id', right_on='payee_id', suffix='_payee')\
-                        .join(dates, left_on='transaction_date', right_on='date_id', suffix='_date')\
-                        # date filter for callback date range
-                        #.filter(pl.col('transaction_date'))
-    
+                        .join(dates, left_on='transaction_date', right_on='date_id', suffix='_date')
+
 except Exception as e:
    logging.error(f'Error joining DataFrames: {e}')
    sys.exit(ec.BAD_JOIN)

 def update_dates(start_date, end_date):
-    start_year = int(start_date[:4])
-    start_month = int(start_date[5:7])
-    start_day = int(start_date[8:10])
-
-    end_year = int(end_date[:4])
-    end_month = int(end_date[5:7])
-    end_day = int(end_date[8:10])
-
    master_data = master_transactions.filter(
-        (pl.col('year_date') >= start_year ) & (pl.col('year_date') <= end_year) & 
-        (pl.col('month_date') >= start_month ) & (pl.col('month_date') <= end_month) &
-        (pl.col('day_date') >= start_day ) & (pl.col('day_date') <= end_day)
+        (pl.col('year') >= start_date.year ) & (pl.col('year') <= end_date.year) & 
+        (pl.col('month') >= start_date.month ) & (pl.col('month') <= end_date.month) &
+        (pl.col('day') >= start_date.day ) & (pl.col('day') <= end_date.day)
    )
    return master_data

@@ -124,4 +114,10 @@ def update_data(master_data):
        paper_bgcolor='black',
        font_color='white'
    )
-    return spend_per_day_line, spend_per_category_bar, spend_per_payee_bar, total_spend
+
+    data = {"spend_per_day_line": spend_per_day_line,
+            "spend_per_category_bar": spend_per_category_bar,
+            "spend_per_payee_bar": spend_per_payee_bar,
+            "total_spend": total_spend}
+    print(data)
+    return data