From 72a6b784dc281bda1b4f78d3fa2bf0ac6ff00210 Mon Sep 17 00:00:00 2001 From: battleofwizards Date: Tue, 13 Aug 2019 21:08:15 +0200 Subject: [PATCH] Render proper column headers and values for CSV exports; fix #3075 When exporting to CSV, both portfolio/trades and funds/transactions were lacking the column headers. Additionally, portfolio/trades colum values were outdated and not matching the intended export. Both issues are fixed. --- .../funds/transactions/TransactionsView.java | 3 +- .../closedtrades/ClosedTradesView.java | 28 +++++++++---------- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/desktop/src/main/java/bisq/desktop/main/funds/transactions/TransactionsView.java b/desktop/src/main/java/bisq/desktop/main/funds/transactions/TransactionsView.java index fe3c3b904bc..cb03b9b2366 100644 --- a/desktop/src/main/java/bisq/desktop/main/funds/transactions/TransactionsView.java +++ b/desktop/src/main/java/bisq/desktop/main/funds/transactions/TransactionsView.java @@ -247,8 +247,7 @@ protected void activate() { CSVEntryConverter headerConverter = transactionsListItem -> { String[] columns = new String[6]; for (int i = 0; i < columns.length; i++) - columns[i] = tableColumns.get(i).getText(); - + columns[i] = ((AutoTooltipLabel) tableColumns.get(i).getGraphic()).getText(); return columns; }; CSVEntryConverter contentConverter = item -> { diff --git a/desktop/src/main/java/bisq/desktop/main/portfolio/closedtrades/ClosedTradesView.java b/desktop/src/main/java/bisq/desktop/main/portfolio/closedtrades/ClosedTradesView.java index a5f20d20366..ebc12ed3893 100644 --- a/desktop/src/main/java/bisq/desktop/main/portfolio/closedtrades/ClosedTradesView.java +++ b/desktop/src/main/java/bisq/desktop/main/portfolio/closedtrades/ClosedTradesView.java @@ -85,7 +85,7 @@ public class ClosedTradesView extends ActivatableViewAndModel tableView; @FXML - TableColumn priceColumn, amountColumn, volumeColumn, txFeeColumn, makerFeeColumn, buyerSecurityDepositColumn, sellerSecurityDepositColumn, + TableColumn priceColumn, amountColumn, volumeColumn, txFeeColumn, makerFeeColumn, buyerSecurityDepositColumn, sellerSecurityDepositColumn, marketColumn, directionColumn, dateColumn, tradeIdColumn, stateColumn, avatarColumn; @FXML HBox footerBox; @@ -272,25 +272,25 @@ protected void activate() { exportButton.setOnAction(event -> { final ObservableList> tableColumns = tableView.getColumns(); CSVEntryConverter headerConverter = transactionsListItem -> { - String[] columns = new String[11]; + String[] columns = new String[12]; for (int i = 0; i < columns.length; i++) - columns[i] = tableColumns.get(i).getText(); - + columns[i] = ((AutoTooltipLabel) tableColumns.get(i).getGraphic()).getText(); return columns; }; CSVEntryConverter contentConverter = item -> { - String[] columns = new String[11]; + String[] columns = new String[12]; columns[0] = model.getTradeId(item); columns[1] = model.getDate(item); - columns[2] = model.getAmount(item); + columns[2] = model.getMarketLabel(item); columns[3] = model.getPrice(item); - columns[4] = model.getVolume(item); - columns[5] = model.getTxFee(item); - columns[6] = model.getMakerFee(item); - columns[7] = model.getBuyerSecurityDeposit(item); - columns[8] = model.getSellerSecurityDeposit(item); - columns[9] = model.getDirectionLabel(item); - columns[10] = model.getState(item); + columns[4] = model.getAmount(item); + columns[5] = model.getVolume(item); + columns[6] = model.getTxFee(item); + columns[7] = model.getMakerFee(item); + columns[8] = model.getBuyerSecurityDeposit(item); + columns[9] = model.getSellerSecurityDeposit(item); + columns[10] = model.getDirectionLabel(item); + columns[11] = model.getState(item); return columns; }; @@ -627,5 +627,5 @@ public void updateItem(final ClosedTradableListItem item, boolean empty) { } }); } - + }