From 75192da65b540f46079d4ca78cca0c18eaf1ebb0 Mon Sep 17 00:00:00 2001
From: Vincent Texier <vit@free.fr>
Date: Fri, 1 May 2015 23:22:52 +0200
Subject: [PATCH] Fix bug in minimum datetime transactions filter
Time was the time from the block 0, not 00:00:00.
---
src/cutecoin/gui/transactions_tab.py | 15 ++++++++-------
src/cutecoin/models/txhistory.py | 10 ++++++----
2 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/src/cutecoin/gui/transactions_tab.py b/src/cutecoin/gui/transactions_tab.py
index 14eae683..96f1d0b5 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, QLocale
+from PyQt5.QtCore import Qt, QDateTime, QTime, QModelIndex, QLocale
from PyQt5.QtGui import QCursor
from ..gen_resources.transactions_tab_uic import Ui_transactionsTabWidget
from ..models.txhistory import HistoryTableModel, TxFilterProxyModel
@@ -11,6 +11,7 @@ from .transfer import TransferMoneyDialog
import logging
+
class TransactionsTabWidget(QWidget, Ui_transactionsTabWidget):
"""
classdocs
@@ -27,7 +28,6 @@ class TransactionsTabWidget(QWidget, Ui_transactionsTabWidget):
:return:
"""
-
super().__init__()
self.setupUi(self)
self.app = app
@@ -37,14 +37,15 @@ class TransactionsTabWidget(QWidget, Ui_transactionsTabWidget):
self.refresh()
def refresh(self):
- blockchain_init = QDateTime()
- blockchain_init.setTime_t(self.community.get_block(1).mediantime)
+ minimum_datetime = QDateTime()
+ 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.setDateTime(blockchain_init)
+ self.date_from.setMinimumDateTime(minimum_datetime)
+ self.date_from.setDateTime(minimum_datetime)
self.date_from.setMaximumDateTime(QDateTime().currentDateTime())
- self.date_to.setMinimumDateTime(blockchain_init)
+ self.date_to.setMinimumDateTime(minimum_datetime)
tomorrow_datetime = QDateTime().currentDateTime().addDays(1)
self.date_to.setDateTime(tomorrow_datetime)
self.date_to.setMaximumDateTime(tomorrow_datetime)
diff --git a/src/cutecoin/models/txhistory.py b/src/cutecoin/models/txhistory.py
index e9c4ae1e..a2182fa9 100644
--- a/src/cutecoin/models/txhistory.py
+++ b/src/cutecoin/models/txhistory.py
@@ -4,12 +4,11 @@ Created on 5 févr. 2014
@author: inso
'''
+import datetime
import logging
from ..core.transfer import Transfer, Received
-from ..core.person import Person
-from ..tools.exceptions import PersonNotFoundError
from PyQt5.QtCore import QAbstractTableModel, Qt, QVariant, QSortFilterProxyModel, \
- QDateTime, QLocale, QModelIndex
+ QDateTime, QLocale
from PyQt5.QtGui import QFont, QColor
@@ -28,7 +27,10 @@ class TxFilterProxyModel(QSortFilterProxyModel):
"""
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_to = ts_to
self.modelReset.emit()
--
GitLab