From f1a69e1dd1bf11f5eab93b7328a4791f6bd781ab Mon Sep 17 00:00:00 2001 From: zky2020 <3439415903@qq.comm> Date: Mon, 5 Jun 2023 15:43:21 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=87=8D=E6=96=B0=E8=BF=9E=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main.py b/src/main.py index ddafd47..e96bc01 100644 --- a/src/main.py +++ b/src/main.py @@ -5,4 +5,3 @@ if __name__ == '__main__': mw = MainWindow() mw.show() sys.exit(app.exec()) - From aaac52b2d2de0f6e1cf4e3f38a76eec5f6ab629c Mon Sep 17 00:00:00 2001 From: zky2020 <3439415903@qq.comm> Date: Mon, 5 Jun 2023 16:39:54 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=A1=AB=E5=85=85=E9=94=99=E8=AF=AF2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/budget/_account.py | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/src/budget/_account.py b/src/budget/_account.py index b3737cb..57a5d8f 100644 --- a/src/budget/_account.py +++ b/src/budget/_account.py @@ -14,6 +14,7 @@ class AccountTab(TabPage): def initUI(self): # 创建顶部控件 self.accountComboBox = QComboBox() + self.accountComboBox.currentIndexChanged.connect(self.onAccountIndexChanged) self.accountModifyButton = QPushButton('Modify') self.accountAddButton = QPushButton('Add') @@ -250,29 +251,35 @@ class AccountTab(TabPage): print(e) QMessageBox.critical(self, 'Error', str(e)) - self.pg.execute("SELECT t_id, a_id, c_id, s_id, time, translate(amount::varchar,'$','￥'), meta->>'description' FROM transaction ORDER BY time DESC") + def onAccountIndexChanged(self, index): + # 获取comboBox中的a_id + a_id = self.rows[index][0] + + self.pg.execute("SELECT t_id, a_id, c_id, s_id, time, translate(amount::varchar,'$','￥'),\ + meta->>'description' FROM transaction \ + WHERE a_id = %s ORDER BY time DESC", (a_id,)) self.transData = self.pg.fetchall() self.pg.execute("SELECT a_id, meta ->> 'name' FROM account ORDER BY a_id") self.accountData = self.pg.fetchall() self.pg.execute("SELECT c_id, meta ->> 'name' FROM category ORDER BY c_id") self.categoryData = self.pg.fetchall() - # 初始化表格 self.accountTable.clear() - self.accountTable.setRowCount(len(self.accountData)) - self.accountTable.setColumnCount(3) # 账户名 账户平衡 备注 - self.accountTable.setHorizontalHeaderLabels(['Account Name', 'Account Balance', 'Description']) + self.accountTable.setRowCount(len(self.transData)) + self.accountTable.setColumnCount(4) # 时间 账户 金额 描述 + self.accountTable.setHorizontalHeaderLabels(['Time', 'category', 'Amount', 'Description']) # 设置自动调整列宽 self.accountTable.horizontalHeader().setSectionResizeMode(QHeaderView.ResizeMode.Stretch) # 填充表格 - for i in range(len(self.accountData)): - self.accountTable.setItem(i, 0, QTableWidgetItem(self.accountData[self.transData[i][1]-1][1])) - # if self.transData[i][2] is None: - # self.accountTable.setItem(i, 1, QTableWidgetItem("None")) - # else: - # self.accountTable.setItem(i, 1, QTableWidgetItem(self.categoryData[self.transData[i][2]-1][1])) - self.accountTable.setItem(i, 1, QTableWidgetItem(str(self.transData[i][5]))) - self.accountTable.setItem(i, 2, QTableWidgetItem(self.transData[i][6])) + for i in range(len(self.transData)): + self.accountTable.setItem(i, 0, QTableWidgetItem(self.transData[i][4].strftime("%Y-%m-%d %H:%M:%S"))) + #self.accountTable.setItem(i, 1, QTableWidgetItem(self.accountData[self.transData[i][1]-1][1]))#amount 2 + if self.transData[i][2] is None: + self.accountTable.setItem(i, 1, QTableWidgetItem("None"))#category 3 + else: + self.accountTable.setItem(i, 1, QTableWidgetItem(self.categoryData[self.transData[i][2]-1][1])) + self.accountTable.setItem(i, 2, QTableWidgetItem(str(self.transData[i][5]))) + self.accountTable.setItem(i, 3, QTableWidgetItem(self.transData[i][6]))