diff --git a/src/cutecoin/gui/transactions_tab.py b/src/cutecoin/gui/transactions_tab.py index 7b30731b3d231019bf2365bcb504700df01610ca..352b8f4d2c8e558081d8bc64cbb9bc6d7d032b32 100644 --- a/src/cutecoin/gui/transactions_tab.py +++ b/src/cutecoin/gui/transactions_tab.py @@ -1,6 +1,6 @@ from PyQt5.QtWidgets import QWidget, QAbstractItemView, QHeaderView, QDialog, \ QMenu, QAction, QApplication, QMessageBox -from PyQt5.QtCore import Qt, QDateTime, QModelIndex +from PyQt5.QtCore import Qt, QDateTime, QModelIndex, QTime from PyQt5.QtGui import QCursor from ..gen_resources.transactions_tab_uic import Ui_transactionsTabWidget from ..models.txhistory import HistoryTableModel, TxFilterProxyModel @@ -130,8 +130,12 @@ QMessageBox.Ok | QMessageBox.Cancel) def dates_changed(self): logging.debug("Changed dates") if self.table_history.model(): - ts_from = self.date_from.dateTime().toTime_t() - ts_to = self.date_to.dateTime().toTime_t() + qdate_from = self.date_from + qdate_from.setTime(QTime(0, 0, 0)) + qdate_to = self.date_to + qdate_to.setTime(QTime(0, 0, 0)) + ts_from = qdate_from.dateTime().toTime_t() + ts_to = qdate_to.dateTime().toTime_t() self.table_history.model().set_period(ts_from, ts_to) diff --git a/src/cutecoin/models/txhistory.py b/src/cutecoin/models/txhistory.py index 925f34ab9251a6e569b0c764a2d4bc22520e8b30..a20386f798516826ec2f4347a05edd49af516541 100644 --- a/src/cutecoin/models/txhistory.py +++ b/src/cutecoin/models/txhistory.py @@ -32,7 +32,7 @@ class TxFilterProxyModel(QSortFilterProxyModel): def filterAcceptsRow(self, sourceRow, sourceParent): def in_period(date_ts): - return (date_ts in range(self.ts_from, self.ts_to)) + return date_ts >= self.ts_from and date_ts <= self.ts_to date_col = self.sourceModel().column_types.index('date') source_index = self.sourceModel().index(sourceRow, date_col) date = self.sourceModel().data(source_index, Qt.DisplayRole)