From 6968a0105ad521d7b86b15555f8f627094a59725 Mon Sep 17 00:00:00 2001 From: Kostya Date: Wed, 14 Oct 2026 17:52:19 +0300 Subject: ui-fx: list the account's ledger entries on the Users tab Ex3 asks that a user can see every row of their account as it changes, one row per action. The entries already reach the client in LedgerDTO but were only drawn as the balance chart. Add an Account activity table under the trade panel: time, type, details, amount and balance after, newest first. --- .../java/market/guess/ui/desktop/AppState.java | 3 ++ .../ui/desktop/controllers/UsersTabController.java | 46 ++++++++++++++++++++++ .../market/guess/ui/desktop/model/UserData.java | 2 + .../guess/ui/desktop/controllers/users_tab.fxml | 28 +++++++++++++ 4 files changed, 79 insertions(+) (limited to 'ui-fx/src') diff --git a/ui-fx/src/main/java/market/guess/ui/desktop/AppState.java b/ui-fx/src/main/java/market/guess/ui/desktop/AppState.java index b116833..5c73e1f 100644 --- a/ui-fx/src/main/java/market/guess/ui/desktop/AppState.java +++ b/ui-fx/src/main/java/market/guess/ui/desktop/AppState.java @@ -318,6 +318,9 @@ public final class AppState { } UserData u = new UserData(acc.owner(), role, bal, acc.blocked(), isMm); + if (acc.entries() != null) { + u.ledger.addAll(acc.entries()); + } if (acc.entries() != null && !acc.entries().isEmpty()) { var entries = acc.entries(); diff --git a/ui-fx/src/main/java/market/guess/ui/desktop/controllers/UsersTabController.java b/ui-fx/src/main/java/market/guess/ui/desktop/controllers/UsersTabController.java index f5c787b..12b74e6 100644 --- a/ui-fx/src/main/java/market/guess/ui/desktop/controllers/UsersTabController.java +++ b/ui-fx/src/main/java/market/guess/ui/desktop/controllers/UsersTabController.java @@ -7,6 +7,8 @@ import javafx.application.Platform; import javafx.collections.ListChangeListener; import javafx.css.PseudoClass; import javafx.fxml.FXML; +import javafx.geometry.Insets; +import javafx.geometry.Pos; import javafx.scene.Node; import javafx.scene.chart.LineChart; import javafx.scene.chart.NumberAxis; @@ -15,10 +17,12 @@ import javafx.scene.control.Label; import javafx.scene.control.ListView; import javafx.scene.control.TextField; import javafx.scene.layout.HBox; +import javafx.scene.layout.Priority; import javafx.scene.layout.StackPane; import javafx.scene.layout.VBox; import market.guess.model.event.EventStatus; import market.guess.model.event.MechanismType; +import market.guess.model.ledger.LedgerEntryDTO; import market.guess.ui.desktop.AppState; import market.guess.ui.desktop.components.TradeSide; import market.guess.ui.desktop.components.UserEventItemView; @@ -65,6 +69,7 @@ public class UsersTabController { @FXML private HBox blockedBanner; @FXML private LineChart balanceChart; @FXML private VBox participationRowsContainer; + @FXML private VBox ledgerRowsContainer; @FXML private VBox tradePanel; @FXML private Label noTradeEventLabel; @@ -252,6 +257,13 @@ public class UsersTabController { } participationRowsContainer.getChildren().setAll(evRows); + // Account activity, newest first + var ledgerRows = new ArrayList(actor.ledger.size()); + for (var entry : actor.ledger.reversed()) { + ledgerRows.add(buildLedgerRow(entry)); + } + ledgerRowsContainer.getChildren().setAll(ledgerRows); + // Trade Panel refreshTradePanel(actor); } @@ -426,6 +438,40 @@ public class UsersTabController { return valid; } + private static Node buildLedgerRow(LedgerEntryDTO entry) { + var note = ledgerCell(entry.note(), -1, "gm-text-ink"); + note.setMinWidth(0); + note.setMaxWidth(Double.MAX_VALUE); + HBox.setHgrow(note, Priority.ALWAYS); + var amount = ledgerCell(entry.amount(), 90, "gm-font-mono", "gm-text-ink"); + amount.setAlignment(Pos.CENTER_RIGHT); + var balance = ledgerCell(entry.balanceAfter(), 90, "gm-font-mono", "gm-text-ink"); + balance.setAlignment(Pos.CENTER_RIGHT); + var row = + new HBox( + 8, + ledgerCell(entry.at(), 150, "gm-font-mono", "gm-text-ink2"), + ledgerCell(entry.type().name(), 96, "gm-text-ink2"), + note, + amount, + balance); + row.setAlignment(Pos.CENTER_LEFT); + row.setPadding(new Insets(7, 11, 7, 11)); + row.getStyleClass().add("gm-divider-top"); + return row; + } + + private static Label ledgerCell(String text, double width, String... styleClasses) { + var label = new Label(text); + label.getStyleClass().add("gm-text-sm"); + label.getStyleClass().addAll(styleClasses); + if (width > 0) { + label.setMinWidth(width); + label.setPrefWidth(width); + } + return label; + } + private Node buildParticipationRow(UserEventRow ev) { var row = new UserEventItemView(ev); row.setOnMouseClicked( diff --git a/ui-fx/src/main/java/market/guess/ui/desktop/model/UserData.java b/ui-fx/src/main/java/market/guess/ui/desktop/model/UserData.java index 62ad526..d6ec093 100644 --- a/ui-fx/src/main/java/market/guess/ui/desktop/model/UserData.java +++ b/ui-fx/src/main/java/market/guess/ui/desktop/model/UserData.java @@ -3,6 +3,7 @@ package market.guess.ui.desktop.model; import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; +import market.guess.model.ledger.LedgerEntryDTO; public final class UserData { public final String name; @@ -17,6 +18,7 @@ public final class UserData { public final boolean isMm; public final List balanceHistory = new ArrayList<>(); public final List events = new ArrayList<>(); + public final List ledger = new ArrayList<>(); public UserData(String name, String role, double balance, boolean blocked, boolean isMm) { this.name = name; diff --git a/ui-fx/src/main/resources/market/guess/ui/desktop/controllers/users_tab.fxml b/ui-fx/src/main/resources/market/guess/ui/desktop/controllers/users_tab.fxml index abc03e5..fcb1653 100644 --- a/ui-fx/src/main/resources/market/guess/ui/desktop/controllers/users_tab.fxml +++ b/ui-fx/src/main/resources/market/guess/ui/desktop/controllers/users_tab.fxml @@ -231,6 +231,34 @@ + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3