Merge pull request #23 from CodeWithCJ/dev

Updated Transaction rule to include AccountName and Exact/Contains pattern matching.

Author: CodeWithCJ

SparkyBudget/py_db/db_scripts/upgrade/SparkyBudget_Upgrade_v0.20.sql

@@ -0,0 +1,98 @@
+-- SparkyBudget_Upgrade_v0.20.sql
+
+-- Add AccountName column to D_Category_Rule
+ALTER TABLE D_Category_Rule ADD COLUMN AccountName TEXT;
+
+-- Add TransactionAmount column to D_Category_Rule
+ALTER TABLE D_Category_Rule ADD COLUMN TransactionAmount REAL;
+
+-- Add TransactionDate column to D_Category_Rule
+ALTER TABLE D_Category_Rule ADD COLUMN TransactionDate DATE;
+
+-- Set default values for existing rows
+UPDATE D_Category_Rule SET AccountName = 'ALL' WHERE AccountName IS NULL;
+-- Rule_Pattern already exists and defaults to 'Contains' for existing rules, so no change needed here.
+
+
+DROP TRIGGER IF EXISTS tr_insert_stg_transaction;
+
+CREATE TRIGGER tr_insert_stg_transaction
+AFTER INSERT ON stg_transaction
+FOR EACH ROW
+BEGIN
+    -- Insert or replace record in f_transaction
+    INSERT OR REPLACE INTO f_transaction (
+        TransactionKey,
+        AccountID,
+        AccountName,
+        TransactionID,
+        TransactionPosted,
+        TransactionAmount,
+        TransactionDescription,
+        TransactionPayee,
+        TransactionMemo,
+		TransactionPending,
+		SubCategory
+    ) VALUES (
+        (SELECT TransactionKey FROM f_transaction WHERE TransactionID = NEW.TransactionID),
+        NEW.AccountID,
+        NEW.AccountName,
+        NEW.TransactionID,
+        NEW.TransactionPosted,
+        NEW.TransactionAmount,
+        NEW.TransactionDescription,
+        NEW.TransactionPayee,
+        NEW.TransactionMemo,
+		NEW.TransactionPending,
+		(SELECT SubCategory FROM f_transaction WHERE TransactionID = NEW.TransactionID)
+    );
+
+    -- Remove the specific record from stg_transaction after insert
+    DELETE FROM stg_transaction WHERE TransactionID = NEW.TransactionID;
+	
+	 UPDATE F_Transaction
+    SET SubCategory = (
+        SELECT Default_SubCategory FROM (
+            SELECT Default_SubCategory, D_Category_Rule.AccountName
+            FROM D_Category_Rule
+            WHERE
+                (LOWER(NEW.TransactionPayee) LIKE '%' || LOWER(D_Category_Rule.Match_Word) || '%'
+                 OR LOWER(D_Category_Rule.Match_Word) LIKE '%' || LOWER(NEW.TransactionPayee) || '%')
+                AND D_Category_Rule.Rule_Category = 'Payee'
+                AND D_Category_Rule.Rule_Pattern = 'Contains'
+                AND D_Category_Rule.AccountName = NEW.AccountName
+            UNION ALL
+            SELECT Default_SubCategory, D_Category_Rule.AccountName
+            FROM D_Category_Rule
+            WHERE
+                (LOWER(NEW.TransactionPayee) LIKE '%' || LOWER(D_Category_Rule.Match_Word) || '%'
+                 OR LOWER(D_Category_Rule.Match_Word) LIKE '%' || LOWER(NEW.TransactionPayee) || '%')
+                AND D_Category_Rule.Rule_Category = 'Payee'
+                AND D_Category_Rule.Rule_Pattern = 'Contains'
+                AND D_Category_Rule.AccountName = 'ALL'
+        )
+        ORDER BY
+            CASE WHEN AccountName = NEW.AccountName THEN 0 ELSE 1 END,
+            CASE WHEN Rule_Pattern = 'Exact' THEN 0 ELSE 1 END
+        LIMIT 1
+    )
+    WHERE F_Transaction.TransactionID = NEW.TransactionID
+    AND SubCategory IS NULL
+    AND EXISTS (
+        SELECT 1
+        FROM D_Category_Rule
+        WHERE
+            (LOWER(NEW.TransactionPayee) LIKE '%' || LOWER(D_Category_Rule.Match_Word) || '%'
+             OR LOWER(D_Category_Rule.Match_Word) LIKE '%' || LOWER(NEW.TransactionPayee) || '%')
+            AND D_Category_Rule.Rule_Category = 'Payee'
+            AND (D_Category_Rule.Rule_Pattern = 'Contains' OR D_Category_Rule.Rule_Pattern = 'Exact')
+            AND (D_Category_Rule.AccountName = NEW.AccountName OR D_Category_Rule.AccountName = 'ALL')
+    );
+	
+END
+;
+
+-- Update DB_VERSION
+
+-- Update DB_VERSION
+UPDATE D_DB SET DB_VERSION = "v0.20";

SparkyBudget/py_routes/manage_categories.py

@@ -123,8 +123,9 @@ def add_subcategory_rule():
     try:
         # Get form data from the request
         default_subcategory = request.form['subcategoryDropDown']
+        account_name = request.form.get('accountNameDropDown', 'ALL') # Get AccountName, default to 'ALL'
         rule_category = 'Payee'
-        rule_pattern = 'Contains'
+        rule_pattern = request.form.get('rulePatternDropDown', 'Contains') # Get Rule_Pattern, default to 'Contains'
         match_word = request.form['matchword']
 
         # Connect to the SQLite database
@@ -133,12 +134,12 @@ def add_subcategory_rule():
 
         # SQL query to insert the new rule
         insert_query = """
-            INSERT INTO D_Category_Rule (Default_SubCategory, Rule_Category, Rule_Pattern, Match_Word)
-            VALUES (?, ?, ?, ?)
+            INSERT INTO D_Category_Rule (Default_SubCategory, AccountName, Rule_Category, Rule_Pattern, Match_Word)
+            VALUES (?, ?, ?, ?, ?)
         """
 
         # Execute the query with the form data
-        cursor.execute(insert_query, (default_subcategory, rule_category, rule_pattern, match_word))
+        cursor.execute(insert_query, (default_subcategory, account_name, rule_category, rule_pattern, match_word))
         conn.commit()  # Commit the transaction
         conn.close()
 
@@ -250,13 +251,14 @@ def subcategory_rule_data():
             SELECT                
                 RuleKey,
                 Default_SubCategory,
+                AccountName,
                 Rule_Category,
                 Rule_Pattern,
                 Match_Word
             FROM
-                D_Category_Rule            
+                D_Category_Rule
             ORDER BY
-                2,3,4,5 ASC
+                AccountName ASC, Default_SubCategory ASC, Rule_Category ASC, Rule_Pattern ASC, Match_Word ASC
         """
         cursor.execute(subcategory_rule_query)
         subcategory_rule_data = cursor.fetchall()
@@ -267,9 +269,10 @@ def subcategory_rule_data():
             {
                 "RuleKey": row[0],
                 "Default_SubCategory": row[1],
-                "Rule_Category": row[2],
-                "Rule_Pattern": row[3],
-                "Match_Word": row[4],
+                "AccountName": row[2],
+                "Rule_Category": row[3],
+                "Rule_Pattern": row[4],
+                "Match_Word": row[5],
             }
             for row in subcategory_rule_data
         ]
@@ -288,15 +291,17 @@ def update_rule():
     try:
         RuleKey = request.form["RuleKey"]
         Match_Word = request.form["Match_Word"]
+        AccountName = request.form.get("AccountName", "ALL")
+        Rule_Pattern = request.form.get("Rule_Pattern", "Contains")
         conn = sqlite3.connect(current_app.config['DATABASE_PATH'])
         cursor = conn.cursor()
 
         update_rule_query = """
             UPDATE D_Category_Rule
-            SET Match_Word = ?
+            SET Match_Word = ?, AccountName = ?, Rule_Pattern = ?
             WHERE RuleKey = ?
         """
-        update_rule_data = (Match_Word, RuleKey)
+        update_rule_data = (Match_Word, AccountName, Rule_Pattern, RuleKey)
 
         cursor.execute(update_rule_query, update_rule_data)
         conn.commit()
@@ -333,6 +338,36 @@ def delete_rule(RuleKey):
         return jsonify({"error": str(e)}), 500
 
 
+@manage_categories_bp.route('/getAccountNames')
+@login_required
+def account_names_data():
+    try:
+        conn = sqlite3.connect(current_app.config['DATABASE_PATH'])
+        cursor = conn.cursor()
+
+        account_names_query = """
+            SELECT DISTINCT
+                COALESCE(DisplayAccountName, AccountName)
+            FROM
+                F_Balance
+            ORDER BY
+                1 ASC
+        """
+        cursor.execute(account_names_query)
+        account_names = cursor.fetchall()
+        conn.close()
+
+        account_names_list = [{"AccountName": row[0]} for row in account_names]
+        account_names_list.insert(0, {"AccountName": "ALL"}) # Add 'ALL' option
+
+        return jsonify(account_names_list)
+    except Exception as e:
+        logger.error(f"An error occurred: {str(e)}", exc_info=True)
+        return jsonify({"error": str(e)}), 500
+
+
+
+
 @manage_categories_bp.route('/getAccountTypes')
 @login_required
 def account_type_data():
@@ -356,7 +391,7 @@ def account_type_data():
         conn.close()
 
         # Format the fetched data for JSON response
-        account_types_list = [           
+        account_types_list = [
             {"AccountType": row[0], "HideFromBudget": row[1], "SortOrder": row[2]} for row in account_types
         ]  # Assuming 'AccountType', 'HideFromBudget', 'SortOrder' are column names in your table
 

SparkyBudget/static/css/category.css

@@ -137,7 +137,33 @@
 .AddSubCategoryContainer input[type="text"],
 .AddSubCategoryRuleContainer select,
 .AddSubCategoryRuleContainer input[type="text"] {
-    flex-grow: 1; /* Allow inputs and selects to take available space */
+    /* Removed flex-grow: 1 to prevent overriding explicit width settings */
+    background-color: #3c444f !important; /* Dark background for dropdowns and input */
+    color: #eee !important; /* Light text color */
+    border: 1px solid #555 !important; /* Subtle border */
+    border-radius: 4px; /* Rounded corners */
+    padding: 6px 10px !important; /* Adjust padding */
+    -moz-appearance: none; /* Remove default Firefox styles */
+    appearance: none; /* Remove default system styles */
+    min-width: 150px; /* Ensure a minimum width for dropdowns */
+}
+
+.AddSubCategoryRuleContainer input[type="text"]::placeholder {
+    color: #bbb !important; /* Lighter placeholder text color */
+    opacity: 1; /* Ensure placeholder is visible */
+}
+
+.AddSubCategoryRuleContainer select:focus,
+.AddSubCategoryRuleContainer input[type="text"]:focus {
+    border-color: #3399cc !important; /* Highlight border on focus */
+    outline: none !important; /* Remove default outline */
+    box-shadow: 0 0 5px rgba(51, 153, 204, 0.5); /* Subtle glow on focus */
+}
+
+/* Style for dropdown options */
+.AddSubCategoryRuleContainer select option {
+    background-color: #3c444f !important; /* Dark background for options */
+    color: #eee !important; /* Light text color for options */
 }
 
 /* --- Container and Table Widths --- */
@@ -236,6 +262,70 @@ border-radius: 12px;
     background-color: transparent !important; /* Prevent any white background */
 }
 
+/* Select2 adjustments for dark theme and width */
+.select2-container--default .select2-selection--single {
+    background-color: #3c444f !important; /* Dark background for Select2 input */
+    color: #eee !important; /* Light text color for Select2 input */
+    border: 1px solid #555 !important; /* Subtle border */
+    border-radius: 4px; /* Rounded corners */
+    height: 38px; /* Adjust height to match other inputs */
+    display: flex;
+    align-items: center;
+}
+
+.select2-container--default .select2-selection--single .select2-selection__rendered {
+    color: #eee !important; /* Light text color for selected item */
+    line-height: 38px; /* Center text vertically */
+    padding-left: 10px;
+}
+
+.select2-container--default .select2-selection--single .select2-selection__arrow {
+    height: 36px; /* Adjust arrow height */
+    right: 5px;
+}
+
+.select2-container--default .select2-selection--single .select2-selection__arrow b {
+    border-color: #eee transparent transparent transparent !important; /* Light arrow color */
+}
+
+.select2-container--default.select2-container--open .select2-selection--single .select2-selection__arrow b {
+    border-color: transparent transparent #eee transparent !important; /* Light arrow color when open */
+}
+
+.select2-dropdown {
+    background-color: #3c444f !important; /* Dark background for dropdown menu */
+    border: 1px solid #555 !important; /* Subtle border */
+    border-radius: 4px; /* Rounded corners */
+}
+
+.select2-container--default .select2-results__option {
+    color: #eee !important; /* Light text color for options */
+    padding: 8px 10px;
+}
+
+.select2-container--default .select2-results__option--highlighted.select2-results__option--selectable {
+    background-color: #555 !important; /* Highlight background for selected option */
+    color: #fff !important; /* White text for highlighted option */
+}
+
+/* Specific width adjustments for Select2 dropdowns in the Transaction Rules section */
+#subcategoryDropDown + .select2-container,
+#accountNameDropDown + .select2-container,
+#rulePatternDropDown + .select2-container {
+    width: 200px !important;
+}
+
+.select2-container--default .select2-search--dropdown .select2-search__field {
+    background-color: #2E3440 !important; /* Dark background for search input in dropdown */
+    color: #eee !important; /* Light text color for search input */
+    border: 1px solid #555 !important;
+}
+
+/* Ensure width is applied correctly by Select2 */
+.select2-container {
+    width: 200px !important; /* Apply the desired width */
+}
+
 
 @media (max-width: 768px) {
     .mobile-header-logo .nav-icon {