Skip to content

enhancements(orders/history): filter the whole pair now #382

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Milerius merged 1 commit into from
Jul 27, 2020
Merged

enhancements(orders/history): filter the whole pair now #382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/atomic.dex.qt.orders.data.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ namespace atomic_dex
//! eg: MORTY
QString rel_coin;

//! eg: RICK/MORTY
QString ticker_pair;

//! eg: 1
QString base_amount;

Expand Down
10 changes: 9 additions & 1 deletion src/atomic.dex.qt.orders.model.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ namespace atomic_dex
this->m_model_proxy->setSourceModel(this);
this->m_model_proxy->setDynamicSortFilter(true);
this->m_model_proxy->setSortRole(UnixTimestampRole);
this->m_model_proxy->setFilterRole(BaseCoinRole);
this->m_model_proxy->setFilterRole(TickerPairRole);
this->m_model_proxy->sort(0, Qt::DescendingOrder);
}

Expand Down Expand Up @@ -98,6 +98,9 @@ namespace atomic_dex
case RelCoinRole:
item.rel_coin = value.toString();
break;
case TickerPairRole:
item.ticker_pair = value.toString();
break;
case BaseCoinAmountRole:
item.base_amount = value.toString();
break;
Expand Down Expand Up @@ -160,6 +163,8 @@ namespace atomic_dex
return item.base_coin;
case RelCoinRole:
return item.rel_coin;
case TickerPairRole:
return item.ticker_pair;
case BaseCoinAmountRole:
return item.base_amount;
case RelCoinAmountRole:
Expand Down Expand Up @@ -301,6 +306,7 @@ namespace atomic_dex
.is_swap = true,
.is_cancellable = false,
.is_recoverable = contents.funds_recoverable};
data.ticker_pair = data.base_coin + "/" + data.rel_coin;
if (data.order_status == "failed")
{
auto error = extract_error(contents);
Expand Down Expand Up @@ -355,6 +361,7 @@ namespace atomic_dex
.is_swap = false,
.is_cancellable = contents.cancellable,
.is_recoverable = false};
data.ticker_pair = data.base_coin + "/" + data.rel_coin;
this->m_orders_id_registry.emplace(contents.order_id);
this->m_model_data.push_back(std::move(data));
endInsertRows();
Expand Down Expand Up @@ -456,6 +463,7 @@ namespace atomic_dex
return {
{BaseCoinRole, "base_coin"},
{RelCoinRole, "rel_coin"},
{TickerPairRole, "ticker_pair"},
{BaseCoinAmountRole, "base_amount"},
{RelCoinAmountRole, "rel_amount"},
{OrderTypeRole, "type"},
Expand Down
1 change: 1 addition & 0 deletions src/atomic.dex.qt.orders.model.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ namespace atomic_dex
{
BaseCoinRole = Qt::UserRole + 1,
RelCoinRole,
TickerPairRole,
BaseCoinAmountRole,
RelCoinAmountRole,
OrderTypeRole,
Expand Down
2 changes: 2 additions & 0 deletions src/atomic.dex.qt.orders.proxy.model.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ namespace atomic_dex
break;
case orders_model::RelCoinRole:
break;
case orders_model::TickerPairRole:
break;
case orders_model::BaseCoinAmountRole:
break;
case orders_model::RelCoinAmountRole:
Expand Down