Merge branch 'main' into computer-algebra

Author: ca20110820

README.md

@@ -57,8 +57,8 @@ def average():
 
 def factorial(num):
     """
-    Function to calculate the factorial of a number. 
-    
+    Function to calculate the factorial of a number.
+
     Takes a number as an argument, calculates the factorial of the number,
     and returns the result.
     """
@@ -71,7 +71,7 @@ def factorial(num):
 def complex_arithmetic():
     """
     Function to execute complex arithmetic operations such as addition, subtraction, multiplication, and division.
-    
+
     Asks the user to choose the operation and input the complex numbers as real and imaginary parts,
     performs the operation, and returns the result.
     """
@@ -132,7 +132,7 @@ def complex_arithmetic():
 def binomial(num):
     """
     Function to calculate the binomial coefficient.
-    
+
     Takes two numbers as arguments, calculates the binomial coefficient using the formula n!/(k!(n-k)!),
     and returns the result.
     """

projects/Calculator/main.py

@@ -43,4 +43,4 @@ def fetch_month():
 year_input = fetch_year()
 month_input = fetch_month()
 
-display_cal(year_input, month_input)
+display_cal(year_input, month_input)

projects/Calendar/displayCalendar.py

@@ -79,7 +79,7 @@ def get_stats(items) -> dict:
             dict: A dictionary containing general statistics for the list of items.
         """
         if len(items) < 1:
-            raise ValueError('The list of items must contain at least one item')
+            raise ValueError("The list of items must contain at least one item")
 
         return {
             "average": statistics.mean(items),
@@ -106,7 +106,9 @@ def get_stats_by_category(self) -> dict:
         category_names = self._items_db.get_category_names()
         out_dict = {}
         for category_name in category_names:
-            items = [item for item in self._items_db.get_items_by_category(category_name)]
+            items = [
+                item for item in self._items_db.get_items_by_category(category_name)
+            ]
             out_dict[category_name] = self.get_stats_expense_and_income(items)
 
         return out_dict
@@ -122,14 +124,21 @@ def get_stats_by_category_with_subcategories(self) -> dict:
         stats_dict = {}
         for category_name in category_names:
             # Case: With Category and Without Subcategory
-            stats_dict[f'{category_name}-NoSubcategory'] = self.get_stats_expense_and_income(
-                self._items_db.get_items_without_subcategory(category_name))
+            stats_dict[f"{category_name}-NoSubcategory"] = (
+                self.get_stats_expense_and_income(
+                    self._items_db.get_items_without_subcategory(category_name)
+                )
+            )
 
             # Case: With Category and With Subcategory
             for subcategory in self._items_db.get_subcategory_names(category_name):
-                stats_dict[f'{category_name}-{subcategory}'] = \
+                stats_dict[f"{category_name}-{subcategory}"] = (
                     self.get_stats_expense_and_income(
-                        self._items_db.get_items_by_category_and_subcategory(category_name, subcategory))
+                        self._items_db.get_items_by_category_and_subcategory(
+                            category_name, subcategory
+                        )
+                    )
+                )
 
         return stats_dict
 
@@ -179,12 +188,12 @@ def to_dataframe(items) -> pd.DataFrame:
         rows = []
         for item in items:
             category = item.category
-            row = {k: v for k, v in item.__dict__.items() if k != 'category'}
+            row = {k: v for k, v in item.__dict__.items() if k != "category"}
 
             if category is not None:
-                row['category'] = category.name
+                row["category"] = category.name
                 if category.subcategory is not None:
-                    row['subcategory'] = category.subcategory
+                    row["subcategory"] = category.subcategory
 
             rows.append(row)
 
@@ -201,35 +210,37 @@ def generate_report(self):
         items = self.items_db.get_all_items()
         df = self.to_dataframe(items)
 
-        with pd.ExcelWriter(self.file_path, engine='xlsxwriter') as writer:
+        with pd.ExcelWriter(self.file_path, engine="xlsxwriter") as writer:
             workbook = writer.book
 
             # Raw Data Tab
             df.to_excel(
                 writer,
-                'Data',  # worksheet name
-                index=False  # index does not contain relevant information
+                "Data",  # worksheet name
+                index=False,  # index does not contain relevant information
             )
-            summary_sheet = writer.sheets['Data']  # Assigning a variable to the sheet allows formatting
+            summary_sheet = writer.sheets[
+                "Data"
+            ]  # Assigning a variable to the sheet allows formatting
 
             # Pivot Table Tab
             pivot_table = df.pivot_table(
-                values='amount',
-                index=['category', 'subcategory'],
+                values="amount",
+                index=["category", "subcategory"],
                 aggfunc={
-                    'amount': ['mean', 'max', 'min'],
-                }
+                    "amount": ["mean", "max", "min"],
+                },
             )
 
             # Flatten the hierarchical column index
-            pivot_table.columns = [f'{agg}_amount' for agg in pivot_table.columns]
+            pivot_table.columns = [f"{agg}_amount" for agg in pivot_table.columns]
 
             pivot_table.to_excel(
                 writer,
-                'Summary By Category',  # worksheet name
-                index=True  # index does not contain relevant information
+                "Summary By Category",  # worksheet name
+                index=True,  # index does not contain relevant information
             )
-            summary_sheet = writer.sheets['Summary By Category']
+            summary_sheet = writer.sheets["Summary By Category"]
 
 
 class PdfReport(Report):
@@ -247,11 +258,11 @@ def generate_report(self):
 
         # Pivot Table Tab
         pivot_table = df.pivot_table(
-            values='amount',
-            index=['category', 'subcategory'],
+            values="amount",
+            index=["category", "subcategory"],
             aggfunc={
-                'amount': ['mean', 'max', 'min'],
-            }
+                "amount": ["mean", "max", "min"],
+            },
         )
         pivot_table = pivot_table.reset_index()
 
@@ -267,13 +278,17 @@ def generate_report(self):
         table = Table(table_data)
 
         # Style the table
-        style = TableStyle([('BACKGROUND', (0, 0), (-1, 0), colors.gray),
-                            ('TEXTCOLOR', (0, 0), (-1, 0), colors.whitesmoke),
-                            ('ALIGN', (0, 0), (-1, -1), 'CENTER'),
-                            ('FONTNAME', (0, 0), (-1, 0), 'Helvetica-Bold'),
-                            ('BOTTOMPADDING', (0, 0), (-1, 0), 12),
-                            ('BACKGROUND', (0, 1), (-1, -1), colors.beige),
-                            ('GRID', (0, 0), (-1, -1), 1, colors.black)])
+        style = TableStyle(
+            [
+                ("BACKGROUND", (0, 0), (-1, 0), colors.gray),
+                ("TEXTCOLOR", (0, 0), (-1, 0), colors.whitesmoke),
+                ("ALIGN", (0, 0), (-1, -1), "CENTER"),
+                ("FONTNAME", (0, 0), (-1, 0), "Helvetica-Bold"),
+                ("BOTTOMPADDING", (0, 0), (-1, 0), 12),
+                ("BACKGROUND", (0, 1), (-1, -1), colors.beige),
+                ("GRID", (0, 0), (-1, -1), 1, colors.black),
+            ]
+        )
 
         table.setStyle(style)
 

projects/Expense-Tracker/app.py

@@ -14,13 +14,13 @@ class ItemsTable(ttk.Treeview):
     """
 
     _COLUMN_PAIRS = [
-        ('#0', 'ID'),
-        ('name', 'Name'),
-        ('amount', 'Amount'),
-        ('description', 'Description'),
-        ('date', 'Date'),
-        ('category', 'Category'),
-        ('subcategory', 'Subcategory'),
+        ("#0", "ID"),
+        ("name", "Name"),
+        ("amount", "Amount"),
+        ("description", "Description"),
+        ("date", "Date"),
+        ("category", "Category"),
+        ("subcategory", "Subcategory"),
     ]
 
     def __init__(self, parent, items_db: ItemsDB, *args, **kwargs):
@@ -34,7 +34,12 @@ def __init__(self, parent, items_db: ItemsDB, *args, **kwargs):
             **kwargs: Additional keyword arguments for `ttk.Treeview`.
         """
 
-        super().__init__(parent, *args, columns=tuple(col for col, _ in self._COLUMN_PAIRS if '#' not in col), **kwargs)
+        super().__init__(
+            parent,
+            *args,
+            columns=tuple(col for col, _ in self._COLUMN_PAIRS if "#" not in col),
+            **kwargs,
+        )
 
         for i, j in self._COLUMN_PAIRS:
             self.heading(i, text=j)
@@ -124,11 +129,7 @@ def load_items(self):
             else:
                 values += (None, None)
 
-            self.insert('',
-                        idx,
-                        text=f'{item.item_id}',
-                        values=values
-                        )
+            self.insert("", idx, text=f"{item.item_id}", values=values)
 
 
 class SummaryByCategoryPivotTable:
@@ -145,7 +146,7 @@ def __init__(self, parent):
         self.parent = parent
 
         db_path = Path(__file__).resolve().parent
-        self.stats = ExpenseIncomeStats(str(db_path / 'items.json'))
+        self.stats = ExpenseIncomeStats(str(db_path / "items.json"))
         self.tree = None
 
     def update_pivot_table(self):
@@ -176,7 +177,7 @@ def update_pivot_table(self):
         for category in data.keys():
             self.tree.heading(category, text=category)
 
-        self.tree['show'] = 'headings'
+        self.tree["show"] = "headings"
 
         def clean_string(input_string):
             cleaned_string = input_string.replace("_", " ").title()