From ff02cc082195536437f66c4d96b352cbe149fa49 Mon Sep 17 00:00:00 2001 From: Ilya Kitaev Date: Sun, 6 Nov 2016 15:29:21 +0300 Subject: [PATCH 1/3] History: default sorting by timestamp, descending --- pages/History.qml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pages/History.qml b/pages/History.qml index a6c216bf..adf7e72f 100644 --- a/pages/History.qml +++ b/pages/History.qml @@ -63,6 +63,16 @@ Rectangle { fromDatePicker.currentDate = model.transactionHistory.firstDateTime toDatePicker.currentDate = model.transactionHistory.lastDateTime selectedAmount.text = getSelectedAmount() + + /* Default sorting by timestamp desc */ + /* Sort indicator on table header */ + /* index of 'sort by blockheight' column */ + header.activeSortColumn = 1 + /* Sorting model */ + + model.sortRole = TransactionHistoryModel.TransactionTimeStampRole + model.sort(0, Qt.DescendingOrder); + // TODO: public interface for 'Header' item that will cause 'sortRequest' signal } } From c89c25c8edd35aec983202b287c02358708180fe Mon Sep 17 00:00:00 2001 From: Ilya Kitaev Date: Sun, 6 Nov 2016 15:33:41 +0300 Subject: [PATCH 2/3] History: keep sorting on page change --- pages/History.qml | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/pages/History.qml b/pages/History.qml index adf7e72f..3d96d1af 100644 --- a/pages/History.qml +++ b/pages/History.qml @@ -40,6 +40,11 @@ Rectangle { id: root property var model + QtObject { + id: d + property bool initialized: false + } + color: "#F0EEEE" function getSelectedAmount() { @@ -59,20 +64,26 @@ Rectangle { onModelChanged: { if (typeof model !== 'undefined') { - // setup date filter scope according to real transactions - fromDatePicker.currentDate = model.transactionHistory.firstDateTime - toDatePicker.currentDate = model.transactionHistory.lastDateTime + selectedAmount.text = getSelectedAmount() - /* Default sorting by timestamp desc */ - /* Sort indicator on table header */ - /* index of 'sort by blockheight' column */ - header.activeSortColumn = 1 - /* Sorting model */ + if (!d.initialized) { + // setup date filter scope according to real transactions + fromDatePicker.currentDate = model.transactionHistory.firstDateTime + toDatePicker.currentDate = model.transactionHistory.lastDateTime + + /* Default sorting by timestamp desc */ + /* Sort indicator on table header */ + /* index of 'sort by blockheight' column */ + header.activeSortColumn = 1 + /* Sorting model */ + + model.sortRole = TransactionHistoryModel.TransactionTimeStampRole + model.sort(0, Qt.DescendingOrder); + d.initialized = true + // TODO: public interface for 'Header' item that will cause 'sortRequest' signal + } - model.sortRole = TransactionHistoryModel.TransactionTimeStampRole - model.sort(0, Qt.DescendingOrder); - // TODO: public interface for 'Header' item that will cause 'sortRequest' signal } } From 10348af88a41a90464817bcdbb1e9f182bddf1be Mon Sep 17 00:00:00 2001 From: Ilya Kitaev Date: Sun, 6 Nov 2016 17:15:55 +0300 Subject: [PATCH 3/3] History: sorting by blockheight instead of timestamp --- pages/History.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pages/History.qml b/pages/History.qml index 3d96d1af..e31473ae 100644 --- a/pages/History.qml +++ b/pages/History.qml @@ -75,10 +75,10 @@ Rectangle { /* Default sorting by timestamp desc */ /* Sort indicator on table header */ /* index of 'sort by blockheight' column */ - header.activeSortColumn = 1 + header.activeSortColumn = 2 /* Sorting model */ - model.sortRole = TransactionHistoryModel.TransactionTimeStampRole + model.sortRole = TransactionHistoryModel.TransactionBlockHeightRole model.sort(0, Qt.DescendingOrder); d.initialized = true // TODO: public interface for 'Header' item that will cause 'sortRequest' signal