aboutsummaryrefslogtreecommitdiffstats
path: root/ui-fx/src/main/java/market/guess/ui
diff options
context:
space:
mode:
authorKostya <mail@sartin.in>2026-10-14 17:52:19 +0300
committerKostya <mail@sartin.in>2026-10-14 17:52:45 +0300
commit6968a0105ad521d7b86b15555f8f627094a59725 (patch)
tree75b6229b1c2dbecf9452e86b453524215a4ac2c0 /ui-fx/src/main/java/market/guess/ui
parent1de283bd86ac1367f4c2c91a0417859c91b676ce (diff)
downloadguess-market-6968a0105ad521d7b86b15555f8f627094a59725.tar.gz
guess-market-6968a0105ad521d7b86b15555f8f627094a59725.tar.xz
guess-market-6968a0105ad521d7b86b15555f8f627094a59725.zip
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.
Diffstat (limited to 'ui-fx/src/main/java/market/guess/ui')
-rw-r--r--ui-fx/src/main/java/market/guess/ui/desktop/AppState.java3
-rw-r--r--ui-fx/src/main/java/market/guess/ui/desktop/controllers/UsersTabController.java46
-rw-r--r--ui-fx/src/main/java/market/guess/ui/desktop/model/UserData.java2
3 files changed, 51 insertions, 0 deletions
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 {
318 } 318 }
319 319
320 UserData u = new UserData(acc.owner(), role, bal, acc.blocked(), isMm); 320 UserData u = new UserData(acc.owner(), role, bal, acc.blocked(), isMm);
321 if (acc.entries() != null) {
322 u.ledger.addAll(acc.entries());
323 }
321 324
322 if (acc.entries() != null && !acc.entries().isEmpty()) { 325 if (acc.entries() != null && !acc.entries().isEmpty()) {
323 var entries = acc.entries(); 326 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;
7import javafx.collections.ListChangeListener; 7import javafx.collections.ListChangeListener;
8import javafx.css.PseudoClass; 8import javafx.css.PseudoClass;
9import javafx.fxml.FXML; 9import javafx.fxml.FXML;
10import javafx.geometry.Insets;
11import javafx.geometry.Pos;
10import javafx.scene.Node; 12import javafx.scene.Node;
11import javafx.scene.chart.LineChart; 13import javafx.scene.chart.LineChart;
12import javafx.scene.chart.NumberAxis; 14import javafx.scene.chart.NumberAxis;
@@ -15,10 +17,12 @@ import javafx.scene.control.Label;
15import javafx.scene.control.ListView; 17import javafx.scene.control.ListView;
16import javafx.scene.control.TextField; 18import javafx.scene.control.TextField;
17import javafx.scene.layout.HBox; 19import javafx.scene.layout.HBox;
20import javafx.scene.layout.Priority;
18import javafx.scene.layout.StackPane; 21import javafx.scene.layout.StackPane;
19import javafx.scene.layout.VBox; 22import javafx.scene.layout.VBox;
20import market.guess.model.event.EventStatus; 23import market.guess.model.event.EventStatus;
21import market.guess.model.event.MechanismType; 24import market.guess.model.event.MechanismType;
25import market.guess.model.ledger.LedgerEntryDTO;
22import market.guess.ui.desktop.AppState; 26import market.guess.ui.desktop.AppState;
23import market.guess.ui.desktop.components.TradeSide; 27import market.guess.ui.desktop.components.TradeSide;
24import market.guess.ui.desktop.components.UserEventItemView; 28import market.guess.ui.desktop.components.UserEventItemView;
@@ -65,6 +69,7 @@ public class UsersTabController {
65 @FXML private HBox blockedBanner; 69 @FXML private HBox blockedBanner;
66 @FXML private LineChart<Number, Number> balanceChart; 70 @FXML private LineChart<Number, Number> balanceChart;
67 @FXML private VBox participationRowsContainer; 71 @FXML private VBox participationRowsContainer;
72 @FXML private VBox ledgerRowsContainer;
68 73
69 @FXML private VBox tradePanel; 74 @FXML private VBox tradePanel;
70 @FXML private Label noTradeEventLabel; 75 @FXML private Label noTradeEventLabel;
@@ -252,6 +257,13 @@ public class UsersTabController {
252 } 257 }
253 participationRowsContainer.getChildren().setAll(evRows); 258 participationRowsContainer.getChildren().setAll(evRows);
254 259
260 // Account activity, newest first
261 var ledgerRows = new ArrayList<Node>(actor.ledger.size());
262 for (var entry : actor.ledger.reversed()) {
263 ledgerRows.add(buildLedgerRow(entry));
264 }
265 ledgerRowsContainer.getChildren().setAll(ledgerRows);
266
255 // Trade Panel 267 // Trade Panel
256 refreshTradePanel(actor); 268 refreshTradePanel(actor);
257 } 269 }
@@ -426,6 +438,40 @@ public class UsersTabController {
426 return valid; 438 return valid;
427 } 439 }
428 440
441 private static Node buildLedgerRow(LedgerEntryDTO entry) {
442 var note = ledgerCell(entry.note(), -1, "gm-text-ink");
443 note.setMinWidth(0);
444 note.setMaxWidth(Double.MAX_VALUE);
445 HBox.setHgrow(note, Priority.ALWAYS);
446 var amount = ledgerCell(entry.amount(), 90, "gm-font-mono", "gm-text-ink");
447 amount.setAlignment(Pos.CENTER_RIGHT);
448 var balance = ledgerCell(entry.balanceAfter(), 90, "gm-font-mono", "gm-text-ink");
449 balance.setAlignment(Pos.CENTER_RIGHT);
450 var row =
451 new HBox(
452 8,
453 ledgerCell(entry.at(), 150, "gm-font-mono", "gm-text-ink2"),
454 ledgerCell(entry.type().name(), 96, "gm-text-ink2"),
455 note,
456 amount,
457 balance);
458 row.setAlignment(Pos.CENTER_LEFT);
459 row.setPadding(new Insets(7, 11, 7, 11));
460 row.getStyleClass().add("gm-divider-top");
461 return row;
462 }
463
464 private static Label ledgerCell(String text, double width, String... styleClasses) {
465 var label = new Label(text);
466 label.getStyleClass().add("gm-text-sm");
467 label.getStyleClass().addAll(styleClasses);
468 if (width > 0) {
469 label.setMinWidth(width);
470 label.setPrefWidth(width);
471 }
472 return label;
473 }
474
429 private Node buildParticipationRow(UserEventRow ev) { 475 private Node buildParticipationRow(UserEventRow ev) {
430 var row = new UserEventItemView(ev); 476 var row = new UserEventItemView(ev);
431 row.setOnMouseClicked( 477 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;
3import java.math.BigDecimal; 3import java.math.BigDecimal;
4import java.util.ArrayList; 4import java.util.ArrayList;
5import java.util.List; 5import java.util.List;
6import market.guess.model.ledger.LedgerEntryDTO;
6 7
7public final class UserData { 8public final class UserData {
8 public final String name; 9 public final String name;
@@ -17,6 +18,7 @@ public final class UserData {
17 public final boolean isMm; 18 public final boolean isMm;
18 public final List<ChartPoint> balanceHistory = new ArrayList<>(); 19 public final List<ChartPoint> balanceHistory = new ArrayList<>();
19 public final List<UserEventRow> events = new ArrayList<>(); 20 public final List<UserEventRow> events = new ArrayList<>();
21 public final List<LedgerEntryDTO> ledger = new ArrayList<>();
20 22
21 public UserData(String name, String role, double balance, boolean blocked, boolean isMm) { 23 public UserData(String name, String role, double balance, boolean blocked, boolean isMm) {
22 this.name = name; 24 this.name = name;