Skip to content
Snippets Groups Projects
Commit 75192da6 authored by Vincent Texier's avatar Vincent Texier
Browse files

Fix bug in minimum datetime transactions filter

Time was the time from the block 0, not 00:00:00.
parent 8e3403ef
No related branches found
No related tags found
No related merge requests found
from PyQt5.QtWidgets import QWidget, QAbstractItemView, QHeaderView, QDialog, \ from PyQt5.QtWidgets import QWidget, QAbstractItemView, QHeaderView, QDialog, \
QMenu, QAction, QApplication, QMessageBox QMenu, QAction, QApplication, QMessageBox
from PyQt5.QtCore import Qt, QDateTime, QModelIndex, QLocale from PyQt5.QtCore import Qt, QDateTime, QTime, QModelIndex, QLocale
from PyQt5.QtGui import QCursor from PyQt5.QtGui import QCursor
from ..gen_resources.transactions_tab_uic import Ui_transactionsTabWidget from ..gen_resources.transactions_tab_uic import Ui_transactionsTabWidget
from ..models.txhistory import HistoryTableModel, TxFilterProxyModel from ..models.txhistory import HistoryTableModel, TxFilterProxyModel
...@@ -11,6 +11,7 @@ from .transfer import TransferMoneyDialog ...@@ -11,6 +11,7 @@ from .transfer import TransferMoneyDialog
import logging import logging
class TransactionsTabWidget(QWidget, Ui_transactionsTabWidget): class TransactionsTabWidget(QWidget, Ui_transactionsTabWidget):
""" """
classdocs classdocs
...@@ -27,7 +28,6 @@ class TransactionsTabWidget(QWidget, Ui_transactionsTabWidget): ...@@ -27,7 +28,6 @@ class TransactionsTabWidget(QWidget, Ui_transactionsTabWidget):
:return: :return:
""" """
super().__init__() super().__init__()
self.setupUi(self) self.setupUi(self)
self.app = app self.app = app
...@@ -37,14 +37,15 @@ class TransactionsTabWidget(QWidget, Ui_transactionsTabWidget): ...@@ -37,14 +37,15 @@ class TransactionsTabWidget(QWidget, Ui_transactionsTabWidget):
self.refresh() self.refresh()
def refresh(self): def refresh(self):
blockchain_init = QDateTime() minimum_datetime = QDateTime()
blockchain_init.setTime_t(self.community.get_block(1).mediantime) minimum_datetime.setTime_t(self.community.get_block(1).mediantime)
minimum_datetime.setTime(QTime(0, 0))
self.date_from.setMinimumDateTime(blockchain_init) self.date_from.setMinimumDateTime(minimum_datetime)
self.date_from.setDateTime(blockchain_init) self.date_from.setDateTime(minimum_datetime)
self.date_from.setMaximumDateTime(QDateTime().currentDateTime()) self.date_from.setMaximumDateTime(QDateTime().currentDateTime())
self.date_to.setMinimumDateTime(blockchain_init) self.date_to.setMinimumDateTime(minimum_datetime)
tomorrow_datetime = QDateTime().currentDateTime().addDays(1) tomorrow_datetime = QDateTime().currentDateTime().addDays(1)
self.date_to.setDateTime(tomorrow_datetime) self.date_to.setDateTime(tomorrow_datetime)
self.date_to.setMaximumDateTime(tomorrow_datetime) self.date_to.setMaximumDateTime(tomorrow_datetime)
......
...@@ -4,12 +4,11 @@ Created on 5 févr. 2014 ...@@ -4,12 +4,11 @@ Created on 5 févr. 2014
@author: inso @author: inso
''' '''
import datetime
import logging import logging
from ..core.transfer import Transfer, Received from ..core.transfer import Transfer, Received
from ..core.person import Person
from ..tools.exceptions import PersonNotFoundError
from PyQt5.QtCore import QAbstractTableModel, Qt, QVariant, QSortFilterProxyModel, \ from PyQt5.QtCore import QAbstractTableModel, Qt, QVariant, QSortFilterProxyModel, \
QDateTime, QLocale, QModelIndex QDateTime, QLocale
from PyQt5.QtGui import QFont, QColor from PyQt5.QtGui import QFont, QColor
...@@ -28,7 +27,10 @@ class TxFilterProxyModel(QSortFilterProxyModel): ...@@ -28,7 +27,10 @@ class TxFilterProxyModel(QSortFilterProxyModel):
""" """
Filter table by given timestamps Filter table by given timestamps
""" """
logging.debug("Filtering from {0} to {1}".format(ts_from, ts_to)) logging.debug("Filtering from {0} to {1}".format(
datetime.datetime.fromtimestamp(ts_from).isoformat(' '),
datetime.datetime.fromtimestamp(ts_to).isoformat(' '))
)
self.ts_from = ts_from self.ts_from = ts_from
self.ts_to = ts_to self.ts_to = ts_to
self.modelReset.emit() self.modelReset.emit()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment