Skip to content
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

Fixed sorting in views with TableView instances with no implemented sort #3319

Closed
wants to merge 4 commits into from
Closed

Fixed sorting in views with TableView instances with no implemented sort #3319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c1a9cce
Fixed sorting in views with TableView instances with no implemented
niyid Sep 24, 2019
e705186
Reorder to fix conflict.
niyid Sep 24, 2019
fe75046
Rearrangement to resolve conflict.
niyid Sep 24, 2019
0cd9b50
Should be adding column to sort order.
niyid Nov 1, 2019
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
5 changes: 4 additions & 1 deletion desktop/src/main/java/bisq/desktop/main/dao/bonding/bonds/BondsView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,8 +185,11 @@ public void updateItem(final BondListItem item, boolean empty) {
};
}
});

tableView.getColumns().add(column);
column.setComparator(Comparator.comparing(BondListItem::getAmount));
column.setSortType(TableColumn.SortType.ASCENDING);
tableView.getSortOrder().add(column);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't change the default sort order to amount. Atm it is sorted by lockup date and it should stay like that. And all this doesn't work at all as desired as you have applied sorting to a string value which is the default behavior.


column = new AutoTooltipTableColumn<>(Res.get("dao.bond.table.column.lockTime"));
column.setMinWidth(40);
column.setCellValueFactory((item) -> new ReadOnlyObjectWrapper<>(item.getValue()));
Expand Down
3 changes: 3 additions & 0 deletions desktop/src/main/java/bisq/desktop/main/dao/bonding/reputation/MyReputationView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,9 @@ public void updateItem(final MyReputationListItem item, boolean empty) {
}
});
tableView.getColumns().add(column);
column.setComparator(Comparator.comparing(MyReputationListItem::getAmount));
column.setSortType(TableColumn.SortType.ASCENDING);
tableView.getSortOrder().add(column);
Comment on lines +315 to +317
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Again pointless defining a string to be sorted for as it is the default behavior.


column = new AutoTooltipTableColumn<>(Res.get("dao.bond.table.column.lockTime"));
column.setMinWidth(60);
Expand Down
3 changes: 3 additions & 0 deletions desktop/src/main/java/bisq/desktop/main/dao/bonding/roles/RolesView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,9 @@ public void updateItem(final RolesListItem item, boolean empty) {
};
}
});
column.setComparator(Comparator.comparing(RolesListItem::getLockupDate).reversed());
column.setSortType(TableColumn.SortType.ASCENDING);
tableView.getSortOrder().add(column);
Comment on lines +160 to +162
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are you sorting this based on lockup date if the name is displayed without any date information displayed. This just makes it confusing for the user.

tableView.getColumns().add(column);

column = new AutoTooltipTableColumn<>(Res.get("dao.bond.table.column.link"));
Expand Down
4 changes: 4 additions & 0 deletions desktop/src/main/java/bisq/desktop/main/market/offerbook/OfferBookChartView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -609,6 +609,10 @@ public void updateItem(final OfferListItem newItem, boolean empty) {
});

tableView.getColumns().add(volumeColumn);
volumeColumn.setComparator(Comparator.comparing(item -> item.offer.getPrice()));
volumeColumn.setSortType(TableColumn.SortType.ASCENDING);
tableView.getSortOrder().add(volumeColumn);

Comment on lines +612 to +615
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The list in the offer book chart view is just a teaser and the the volume column is set to sortable false which will make this code not working. So just revert the changes at this place.

tableView.getColumns().add(amountColumn);
tableView.getColumns().add(priceColumn);
tableView.getColumns().add(avatarColumn);
Expand Down
5 changes: 5 additions & 0 deletions desktop/src/main/java/bisq/desktop/main/overlays/windows/ProposalResultsWindow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,8 @@

import static bisq.desktop.util.FormBuilder.addButtonAfterGroup;

import java.util.Comparator;

@Slf4j
public class ProposalResultsWindow extends TabbedOverlay<ProposalResultsWindow> {

Expand Down Expand Up @@ -249,6 +251,9 @@ public void updateItem(final VoteListItem item, boolean empty) {
};
}
});
column.setComparator(Comparator.comparing(VoteListItem::getBlindVoteDate));
column.setSortType(TableColumn.SortType.DESCENDING);
votesTableView.getSortOrder().add(column);
votesTableView.getColumns().add(column);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This has no effect as the columns are not sortable right now.


column = new AutoTooltipTableColumn<>(Res.get("shared.blindVoteTxId"));
Expand Down