banking_breakdown/ui/main_window.py

@@ -41,10 +41,11 @@ class MainWindow(QMainWindow):
         # Set up QTableView model
 
         self._pandas_model = PandasModel(self)
-        self._proxy_model = QSortFilterProxyModel(self)
+        self._proxyModel = QSortFilterProxyModel(self)
-        self._proxy_model.setSourceModel(self._pandas_model)
+        self._proxyModel.setSourceModel(self._pandas_model)
-        self._table_view.setModel(self._proxy_model)
+        self._table_view.setModel(self._proxyModel)
-        self._proxy_model.setSortRole(Qt.ItemDataRole.EditRole)
+        self._proxyModel.setDynamicSortFilter(True)
+        self._proxyModel.setSortRole(Qt.ItemDataRole.EditRole)
 
         # Set event handlers
 
@@ -109,9 +110,6 @@ class MainWindow(QMainWindow):
     def _update_categories_from_dataframe(self):
         df = self._pandas_model.get_dataframe()
 
-        if 'category' not in df.columns:
-            df['category'] = [' '] * len(df.index)
-
         df_categories = df['category'].unique()
         current_categories = [self._list_widget.item(x).text() for x
                               in range(self._list_widget.count())]
@@ -187,15 +185,10 @@ class MainWindow(QMainWindow):
                                       f"Are you sure you want to delete"
                                       f" category '{selected_item.text()}'?")
 
-        df = self._pandas_model.get_dataframe()
-
-        if 'category' not in df.columns:
-            df['category'] = [' '] * len(df.index)
-
         if button == QMessageBox.StandardButton.Yes:
-            df.loc[df['category'] == selected_item.text(), 'category'] = ' '
             self._list_widget.takeItem(self._list_widget.row(selected_item))
-            self._pandas_model.set_dataframe(df)
+            df = self.get_statement_data()
+            df.loc[df['category'] == selected_item.text(), 'category'] = ' '
 
     def _handle_clear_click(self):
         self._assign_category(' ')
@@ -208,6 +201,7 @@ class MainWindow(QMainWindow):
 
         df = self._pandas_model.get_dataframe()
         df.loc[row_indices, 'category'] = category
+
         self._pandas_model.set_dataframe(df)
 
     def _handle_apply_click(self):

banking_breakdown/ui/pandas_model.py

@@ -1,7 +1,7 @@
 import numpy
 import pandas as pd
 from PyQt6 import QtCore
-from PyQt6.QtCore import Qt, QModelIndex, QSortFilterProxyModel
+from PyQt6.QtCore import Qt, QModelIndex
 
 
 def _get_str_dataframe(df: pd.DataFrame) -> pd.DataFrame:

res/main_window.ui

@@ -129,9 +129,6 @@
            <property name="sortingEnabled">
             <bool>true</bool>
            </property>
-           <attribute name="horizontalHeaderShowSortIndicator" stdset="0">
-            <bool>true</bool>
-           </attribute>
            <attribute name="horizontalHeaderStretchLastSection">
             <bool>true</bool>
            </attribute>