an.tsouchlos/banking-breakdown
1
0
Fork 0
Code Issues 2 Pull Requests 1 Packages Projects Releases Wiki Activity

Clean up MainWindow implementation

Browse Source
This commit is contained in:
Andreas Tsouchlos 2024-01-03 22:32:06 +01:00
parent fb3a54d430
commit c72885258b
6 changed files with 95 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
banking_breakdown/__main__.py
View File

@ -12,6 +12,9 @@ def categorize_func(args):
if args.i is not None: if args.i is not None:
df = get_stripped_statement(args.i) df = get_stripped_statement(args.i)
import signal
signal.signal(signal.SIGINT, signal.SIG_DFL)
ui.show_main_window(df=df) ui.show_main_window(df=df)

10
banking_breakdown/statement_parser.py
View File

@ -82,16 +82,18 @@ import numpy as np
def get_stripped_statement(filename: str) -> pd.DataFrame: def get_stripped_statement(filename: str) -> pd.DataFrame:
df = pd.read_csv(filename, delimiter=';', decimal=",") # df = pd.read_csv(filename, delimiter=';', decimal=",")
df["Valutadatum"] = pd.to_datetime(df["Valutadatum"], format='%d.%m.%Y') df = pd.read_csv(filename, delimiter=';')
df["Valutadatum"] = (pd.to_datetime(df["Valutadatum"], format='%d.%m.%Y')
.dt.strftime('%Y-%m-%d'))
result = pd.DataFrame({'t': df["Valutadatum"], result = pd.DataFrame({'t': df["Valutadatum"],
'other party': df["Name Zahlungsbeteiligter"], 'other party': df["Name Zahlungsbeteiligter"],
'value': df["Betrag"], 'value': df["Betrag"],
'balance afterwards': df["Saldo nach Buchung"], 'balance': df["Saldo nach Buchung"],
'category': [''] * len(df["Valutadatum"]),
'description': df["Buchungstext"], 'description': df["Buchungstext"],
'purpose': df["Verwendungszweck"] 'purpose': df["Verwendungszweck"]
}) })
result['category'] = [''] * len(result.index)
return result return result

18
banking_breakdown/ui/__init__.py
View File

@ -18,15 +18,15 @@ def show_main_window(categories: typing.Sequence[str] = None,
if df is not None: if df is not None:
window.set_statement_data(df) window.set_statement_data(df)
window.add_warning_text("The column 't' does not exist. Please rename the" # window.add_warning_text("The column 't' does not exist. Please rename the"
" column containing the dates of the transactions" # " column containing the dates of the transactions"
" to 't'.") # " to 't'.")
window.add_warning_text("The column 'balance' does not exist. Please" # window.add_warning_text("The column 'balance' does not exist. Please"
" rename the column containing the balance after" # " rename the column containing the balance after"
" each transaction to 'balance'") # " each transaction to 'balance'")
window.add_warning_text("The column 'value' does not exist. Please rename" # window.add_warning_text("The column 'value' does not exist. Please rename"
" the column containing the values of the" # " the column containing the values of the"
" transactions to 'value'.") # " transactions to 'value'.")
window.show() window.show()
app.exec() app.exec()

31
banking_breakdown/ui/generated_wrapper.py
View File

@ -2,10 +2,11 @@ import typing
from functools import partial from functools import partial
import pandas as pd import pandas as pd
from PyQt6.QtGui import QPixmap from PyQt6.QtGui import QPixmap, QAction
from PyQt6.QtWidgets import QMainWindow, QTableView, QHBoxLayout, QLabel from PyQt6.QtWidgets import QMainWindow, QTableView, QHBoxLayout, QLabel, \
from PyQt6 import uic, QtGui, QtCore QMenu, QHeaderView, QLineEdit
from PyQt6.QtCore import Qt from PyQt6 import uic, QtGui, QtCore, QtWidgets
from PyQt6.QtCore import Qt, QSortFilterProxyModel
from banking_breakdown.ui.main_window import Ui_MainWindow from banking_breakdown.ui.main_window import Ui_MainWindow
@ -69,11 +70,6 @@ class GeneratedWindowWrapper(QMainWindow):
self._window = Ui_MainWindow() self._window = Ui_MainWindow()
self._window.setupUi(self) self._window.setupUi(self)
# Set window behavior
self._window.statementTableView.setSelectionBehavior(
QTableView.SelectionBehavior.SelectRows)
# Populate categories # Populate categories
self._category_model = QtGui.QStandardItemModel() self._category_model = QtGui.QStandardItemModel()
@ -84,6 +80,17 @@ class GeneratedWindowWrapper(QMainWindow):
self._window.createCategoryButton.clicked.connect( self._window.createCategoryButton.clicked.connect(
self._handle_create_click) self._handle_create_click)
header = self._window.transactionTableView.horizontalHeader()
header.setContextMenuPolicy(Qt.ContextMenuPolicy.CustomContextMenu)
header.customContextMenuRequested.connect(self._header_right_clicked)
def _header_right_clicked(self, pos):
context = QMenu(self)
context.addAction(QAction("test 1", self))
context.addAction(QAction("test 2", self))
context.addAction(QAction("test 3", self))
context.exec(self.sender().mapToGlobal(pos))
def add_categories(self, categories: typing.Sequence[str]): def add_categories(self, categories: typing.Sequence[str]):
for category in categories: for category in categories:
item = QtGui.QStandardItem(category) item = QtGui.QStandardItem(category)
@ -91,7 +98,11 @@ class GeneratedWindowWrapper(QMainWindow):
def set_statement_data(self, df: pd.DataFrame): def set_statement_data(self, df: pd.DataFrame):
model = PandasModel(df) model = PandasModel(df)
self._window.statementTableView.setModel(model) proxyModel = QSortFilterProxyModel(self)
proxyModel.setSourceModel(model)
self._window.transactionTableView.setModel(proxyModel)
self._window.transactionTableView.resizeColumnsToContents()
def _handle_create_click(self): def _handle_create_click(self):
self.add_categories(['asdf']) self.add_categories(['asdf'])

55
banking_breakdown/ui/main_window.py
View File

@ -12,22 +12,21 @@ from PyQt6 import QtCore, QtGui, QtWidgets
class Ui_MainWindow(object): class Ui_MainWindow(object):
def setupUi(self, MainWindow): def setupUi(self, MainWindow):
MainWindow.setObjectName("MainWindow") MainWindow.setObjectName("MainWindow")
MainWindow.resize(800, 600) MainWindow.resize(1300, 731)
self.centralwidget = QtWidgets.QWidget(parent=MainWindow) self.centralwidget = QtWidgets.QWidget(parent=MainWindow)
self.centralwidget.setObjectName("centralwidget") self.centralwidget.setObjectName("centralwidget")
self.verticalLayout_5 = QtWidgets.QVBoxLayout(self.centralwidget) self.verticalLayout_4 = QtWidgets.QVBoxLayout(self.centralwidget)
self.verticalLayout_5.setSpacing(0) self.verticalLayout_4.setSpacing(0)
self.verticalLayout_5.setObjectName("verticalLayout_5") self.verticalLayout_4.setObjectName("verticalLayout_4")
self.horizontalLayout_5 = QtWidgets.QHBoxLayout() self.horizontalLayout_6 = QtWidgets.QHBoxLayout()
self.horizontalLayout_5.setObjectName("horizontalLayout_5") self.horizontalLayout_6.setObjectName("horizontalLayout_6")
self.warningWidget = QtWidgets.QWidget(parent=self.centralwidget) self.widget = QtWidgets.QWidget(parent=self.centralwidget)
self.warningWidget.setMaximumSize(QtCore.QSize(600, 16777215)) self.widget.setObjectName("widget")
self.warningWidget.setObjectName("warningWidget") self.warningLayout = QtWidgets.QVBoxLayout(self.widget)
self.warningLayout = QtWidgets.QVBoxLayout(self.warningWidget) self.warningLayout.setContentsMargins(-1, 0, -1, 0)
self.warningLayout.setContentsMargins(-1, 0, -1, 9)
self.warningLayout.setObjectName("warningLayout") self.warningLayout.setObjectName("warningLayout")
self.horizontalLayout_5.addWidget(self.warningWidget) self.horizontalLayout_6.addWidget(self.widget)
self.verticalLayout_5.addLayout(self.horizontalLayout_5) self.verticalLayout_4.addLayout(self.horizontalLayout_6)
self.horizontalLayout_3 = QtWidgets.QHBoxLayout() self.horizontalLayout_3 = QtWidgets.QHBoxLayout()
self.horizontalLayout_3.setObjectName("horizontalLayout_3") self.horizontalLayout_3.setObjectName("horizontalLayout_3")
self.groupBox = QtWidgets.QGroupBox(parent=self.centralwidget) self.groupBox = QtWidgets.QGroupBox(parent=self.centralwidget)
@ -37,7 +36,6 @@ class Ui_MainWindow(object):
self.horizontalLayout = QtWidgets.QHBoxLayout() self.horizontalLayout = QtWidgets.QHBoxLayout()
self.horizontalLayout.setObjectName("horizontalLayout") self.horizontalLayout.setObjectName("horizontalLayout")
self.createCategoryButton = QtWidgets.QPushButton(parent=self.groupBox) self.createCategoryButton = QtWidgets.QPushButton(parent=self.groupBox)
self.createCategoryButton.setStatusTip("")
self.createCategoryButton.setObjectName("createCategoryButton") self.createCategoryButton.setObjectName("createCategoryButton")
self.horizontalLayout.addWidget(self.createCategoryButton) self.horizontalLayout.addWidget(self.createCategoryButton)
self.deleteCategoryButton = QtWidgets.QPushButton(parent=self.groupBox) self.deleteCategoryButton = QtWidgets.QPushButton(parent=self.groupBox)
@ -61,23 +59,28 @@ class Ui_MainWindow(object):
self.groupBox_2.setObjectName("groupBox_2") self.groupBox_2.setObjectName("groupBox_2")
self.verticalLayout = QtWidgets.QVBoxLayout(self.groupBox_2) self.verticalLayout = QtWidgets.QVBoxLayout(self.groupBox_2)
self.verticalLayout.setObjectName("verticalLayout") self.verticalLayout.setObjectName("verticalLayout")
self.statementTableView = QtWidgets.QTableView(parent=self.groupBox_2) self.transactionTableView = QtWidgets.QTableView(parent=self.groupBox_2)
self.statementTableView.setSortingEnabled(False) self.transactionTableView.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectionBehavior.SelectRows)
self.statementTableView.setWordWrap(True) self.transactionTableView.setObjectName("transactionTableView")
self.statementTableView.setObjectName("statementTableView") self.transactionTableView.horizontalHeader().setStretchLastSection(True)
self.statementTableView.horizontalHeader().setSortIndicatorShown(False) self.verticalLayout.addWidget(self.transactionTableView)
self.verticalLayout.addWidget(self.statementTableView)
self.horizontalLayout_3.addWidget(self.groupBox_2) self.horizontalLayout_3.addWidget(self.groupBox_2)
self.horizontalLayout_3.setStretch(1, 1) self.horizontalLayout_3.setStretch(1, 1)
self.verticalLayout_5.addLayout(self.horizontalLayout_3) self.verticalLayout_4.addLayout(self.horizontalLayout_3)
MainWindow.setCentralWidget(self.centralwidget) MainWindow.setCentralWidget(self.centralwidget)
self.menubar = QtWidgets.QMenuBar(parent=MainWindow) self.menubar = QtWidgets.QMenuBar(parent=MainWindow)
self.menubar.setGeometry(QtCore.QRect(0, 0, 800, 23)) self.menubar.setGeometry(QtCore.QRect(0, 0, 1300, 23))
self.menubar.setObjectName("menubar") self.menubar.setObjectName("menubar")
self.menuFile = QtWidgets.QMenu(parent=self.menubar)
self.menuFile.setObjectName("menuFile")
MainWindow.setMenuBar(self.menubar) MainWindow.setMenuBar(self.menubar)
self.statusbar = QtWidgets.QStatusBar(parent=MainWindow) self.statusbar = QtWidgets.QStatusBar(parent=MainWindow)
self.statusbar.setObjectName("statusbar") self.statusbar.setObjectName("statusbar")
MainWindow.setStatusBar(self.statusbar) MainWindow.setStatusBar(self.statusbar)
self.actionSave = QtGui.QAction(parent=MainWindow)
self.actionSave.setObjectName("actionSave")
self.menuFile.addAction(self.actionSave)
self.menubar.addAction(self.menuFile.menuAction())
self.retranslateUi(MainWindow) self.retranslateUi(MainWindow)
QtCore.QMetaObject.connectSlotsByName(MainWindow) QtCore.QMetaObject.connectSlotsByName(MainWindow)
@ -86,10 +89,10 @@ class Ui_MainWindow(object):
_translate = QtCore.QCoreApplication.translate _translate = QtCore.QCoreApplication.translate
MainWindow.setWindowTitle(_translate("MainWindow", "MainWindow")) MainWindow.setWindowTitle(_translate("MainWindow", "MainWindow"))
self.groupBox.setTitle(_translate("MainWindow", "Categories")) self.groupBox.setTitle(_translate("MainWindow", "Categories"))
self.createCategoryButton.setToolTip(_translate("MainWindow", "Create new category"))
self.createCategoryButton.setText(_translate("MainWindow", "Create")) self.createCategoryButton.setText(_translate("MainWindow", "Create"))
self.deleteCategoryButton.setToolTip(_translate("MainWindow", "Delete selected category"))
self.deleteCategoryButton.setText(_translate("MainWindow", "Delete")) self.deleteCategoryButton.setText(_translate("MainWindow", "Delete"))
self.applyCategoryButton.setToolTip(_translate("MainWindow", "Apply selected category to selected transactions"))
self.applyCategoryButton.setText(_translate("MainWindow", "Apply")) self.applyCategoryButton.setText(_translate("MainWindow", "Apply"))
self.groupBox_2.setTitle(_translate("MainWindow", "Bank statement")) self.groupBox_2.setTitle(_translate("MainWindow", "Transactions"))
self.menuFile.setTitle(_translate("MainWindow", "File"))
self.actionSave.setText(_translate("MainWindow", "Save"))
self.actionSave.setShortcut(_translate("MainWindow", "Ctrl+S"))

60
res/main_window.ui
View File

@ -6,34 +6,28 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>800</width> <width>1300</width>
<height>600</height> <height>731</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>MainWindow</string> <string>MainWindow</string>
</property> </property>
<widget class="QWidget" name="centralwidget"> <widget class="QWidget" name="centralwidget">
<layout class="QVBoxLayout" name="verticalLayout_5"> <layout class="QVBoxLayout" name="verticalLayout_4">
<property name="spacing"> <property name="spacing">
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_5"> <layout class="QHBoxLayout" name="horizontalLayout_6">
<item> <item>
<widget class="QWidget" name="warningWidget" native="true"> <widget class="QWidget" name="widget" native="true">
<property name="maximumSize">
<size>
<width>600</width>
<height>16777215</height>
</size>
</property>
<layout class="QVBoxLayout" name="warningLayout"> <layout class="QVBoxLayout" name="warningLayout">
<property name="topMargin"> <property name="topMargin">
<number>0</number> <number>0</number>
</property> </property>
<property name="bottomMargin"> <property name="bottomMargin">
<number>9</number> <number>0</number>
</property> </property>
</layout> </layout>
</widget> </widget>
@ -52,12 +46,6 @@
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<item> <item>
<widget class="QPushButton" name="createCategoryButton"> <widget class="QPushButton" name="createCategoryButton">
<property name="toolTip">
<string>Create new category</string>
</property>
<property name="statusTip">
<string/>
</property>
<property name="text"> <property name="text">
<string>Create</string> <string>Create</string>
</property> </property>
@ -65,9 +53,6 @@
</item> </item>
<item> <item>
<widget class="QPushButton" name="deleteCategoryButton"> <widget class="QPushButton" name="deleteCategoryButton">
<property name="toolTip">
<string>Delete selected category</string>
</property>
<property name="text"> <property name="text">
<string>Delete</string> <string>Delete</string>
</property> </property>
@ -99,9 +84,6 @@
</item> </item>
<item> <item>
<widget class="QPushButton" name="applyCategoryButton"> <widget class="QPushButton" name="applyCategoryButton">
<property name="toolTip">
<string>Apply selected category to selected transactions</string>
</property>
<property name="text"> <property name="text">
<string>Apply</string> <string>Apply</string>
</property> </property>
@ -115,19 +97,16 @@
<item> <item>
<widget class="QGroupBox" name="groupBox_2"> <widget class="QGroupBox" name="groupBox_2">
<property name="title"> <property name="title">
<string>Bank statement</string> <string>Transactions</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item> <item>
<widget class="QTableView" name="statementTableView"> <widget class="QTableView" name="transactionTableView">
<property name="sortingEnabled"> <property name="selectionBehavior">
<bool>false</bool> <enum>QAbstractItemView::SelectRows</enum>
</property> </property>
<property name="wordWrap"> <attribute name="horizontalHeaderStretchLastSection">
<bool>true</bool> <bool>true</bool>
</property>
<attribute name="horizontalHeaderShowSortIndicator" stdset="0">
<bool>false</bool>
</attribute> </attribute>
</widget> </widget>
</item> </item>
@ -143,12 +122,27 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>800</width> <width>1300</width>
<height>23</height> <height>23</height>
</rect> </rect>
</property> </property>
<widget class="QMenu" name="menuFile">
<property name="title">
<string>File</string>
</property>
<addaction name="actionSave"/>
</widget>
<addaction name="menuFile"/>
</widget> </widget>
<widget class="QStatusBar" name="statusbar"/> <widget class="QStatusBar" name="statusbar"/>
<action name="actionSave">
<property name="text">
<string>Save</string>
</property>
<property name="shortcut">
<string>Ctrl+S</string>
</property>
</action>
</widget> </widget>
<resources/> <resources/>
<connections/> <connections/>