diff --git a/src/main/java/edu/ntnu/idi/idatt/view/components/elements/StockComponent.java b/src/main/java/edu/ntnu/idi/idatt/view/components/elements/StockComponent.java index 2edb0c8..fe29fdc 100644 --- a/src/main/java/edu/ntnu/idi/idatt/view/components/elements/StockComponent.java +++ b/src/main/java/edu/ntnu/idi/idatt/view/components/elements/StockComponent.java @@ -24,7 +24,7 @@ public StockComponent(Stock stock) { this.setStyle("-fx-background-color: #404950;"); - Label title = new Label(String.format("%s (%s)", stock.getCompany(), stock.getSymbol())); + Label title = new Label(stock.toString()); Label latestText = new Label("Latest"); Label latestValue = new Label(String.format("%.2f USD", stock.getSalesPrice())); diff --git a/src/main/java/edu/ntnu/idi/idatt/view/components/elements/TransactionComponent.java b/src/main/java/edu/ntnu/idi/idatt/view/components/elements/TransactionComponent.java index 1864b15..26fd7d1 100644 --- a/src/main/java/edu/ntnu/idi/idatt/view/components/elements/TransactionComponent.java +++ b/src/main/java/edu/ntnu/idi/idatt/view/components/elements/TransactionComponent.java @@ -20,20 +20,23 @@ public class TransactionComponent extends VBox { public TransactionComponent(Transaction transaction) { Stock stock = transaction.getShare().getStock(); + TransactionCalculator calculator = transaction.getCalculator(); Label title; - Label name = new Label(stock.getCompany() + " (" + stock.getSymbol() + ")"); + Label name = new Label(stock.toString()); Label totalValue; Label taxComissionValue; Label grossValue; Label amountOfShares; Label saleProfit; - TransactionCalculator calculator = transaction.getCalculator(); totalValue = new Label(String.format("Total: %.2f USD", calculator.calculateTotal())); + taxComissionValue = new Label(String.format( "Tax & Comission: %.2f USD", calculator.calculateTax().add(calculator.calculateCommision()))); + grossValue = new Label(String.format("Gross: %.2f USD", calculator.calculateGross())); + amountOfShares = new Label( String.format("Shares: %.2f [%s]", transaction.getShare().getQuantity(), stock.getSymbol()));