Feat: Quantity Button and fixes

Added functionality for the quantity buttons, and fixed some logic concerning selling/purchasing stocks and synchronizing the view.
Team-40-IDATT2003 · May 15, 2026 · cf09d0f · cf09d0f
1 parent b705e59
commit cf09d0f
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 11 deletions.
diff --git a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/engine/Exchange.java b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/engine/Exchange.java
@@ -227,7 +227,9 @@ public List<Transaction> sell(final BigDecimal amount, final String stockSymbol,
       BigDecimal remainingToSell = amount;
 
       for (Share share : sharesOfStock) {
-        if (remainingToSell.compareTo(BigDecimal.ZERO) <= 0) break;
+        if (remainingToSell.compareTo(BigDecimal.ZERO) <= 0) {
+          break;
+        }
 
         BigDecimal shareQty = share.getQuantity();
 

diff --git a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/model/Player.java b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/model/Player.java
@@ -186,18 +186,20 @@ public PlayerStatus getStatus() {
    * @param transaction the transaction to handle.
    * */
   public void handleTransaction(final Transaction transaction) {
-    if (money.floatValue() > transaction.getCalculator().calculateTotal().floatValue()) {
-      transactionArchive.add(transaction);
-      if (transaction instanceof Purchase purchase) {
+    if (transaction instanceof Purchase purchase) {
+      if (money.floatValue() > transaction.getCalculator().calculateTotal().floatValue()) {
         withdrawMoney(purchase.getCalculator().calculateTotal());
         portfolio.addShare(purchase.getShare());
-      } else if (transaction instanceof Sale sale) {
-        addMoney(sale.getCalculator().calculateTotal());
-        portfolio.removeShare(sale.getShare());
+        transactionArchive.add(transaction);
+        transaction.commit(this);
       }
-      networthAsFloatProp.setValue(getNetWorth().floatValue());
-      moneyAsFloatProp.setValue(money);
+    } else if (transaction instanceof Sale sale) {
+      addMoney(sale.getCalculator().calculateTotal());
+      portfolio.removeShare(sale.getShare());
+      transactionArchive.add(transaction);
       transaction.commit(this);
     }
+    networthAsFloatProp.setValue(getNetWorth().floatValue());
+    moneyAsFloatProp.setValue(money);
   }
 }
diff --git a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardActions.java b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardActions.java
@@ -3,5 +3,8 @@
 public enum DashBoardActions {
   BUY_SHARES,
   SELL_SHARES,
-  SELECT_STOCK;
+  DECREASE_5,
+  DECREASE_1,
+  INCREASE_1,
+  INCREASE_5;
 }
diff --git a/...ain/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardController.java b/...ain/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardController.java
@@ -72,7 +72,10 @@ protected void initInteractions() {
 
     getViewElement().setOnAction(DashBoardActions.SELL_SHARES, () -> {
       if (Validator.NOT_EMPTY.isValid(getViewElement().getQuantityInputField().getText())) {
-        List<Transaction> transactions = exchange.sell(new BigDecimal(getViewElement().getQuantityInputField().getText()), getViewElement().getCurrentStock().getSymbol(), player);
+        List<Transaction> transactions = exchange.sell(
+                new BigDecimal(getViewElement().getQuantityInputField().getText()),
+                getViewElement().getCurrentStock().getSymbol(),
+                player);
 
         for (Transaction t : transactions) {
           if(t.isCommited()) {
@@ -82,6 +85,27 @@ protected void initInteractions() {
       }
     });
 
+    getViewElement().setOnAction(DashBoardActions.DECREASE_5, () -> {
+      getViewElement().getQuantityInputField().setText(
+              new BigDecimal(getViewElement().getQuantityInputField().getText())
+                      .subtract(new BigDecimal("5")).toString());
+    });
+    getViewElement().setOnAction(DashBoardActions.DECREASE_1, () -> {
+      getViewElement().getQuantityInputField().setText(
+              new BigDecimal(getViewElement().getQuantityInputField().getText())
+                      .subtract(new BigDecimal("1")).toString());
+    });
+    getViewElement().setOnAction(DashBoardActions.INCREASE_1, () -> {
+      getViewElement().getQuantityInputField().setText(
+              new BigDecimal(getViewElement().getQuantityInputField().getText())
+                      .add(new BigDecimal("1")).toString());
+    });
+    getViewElement().setOnAction(DashBoardActions.INCREASE_5, () -> {
+      getViewElement().getQuantityInputField().setText(
+              new BigDecimal(getViewElement().getQuantityInputField().getText())
+                      .add(new BigDecimal("5")).toString());
+    });
+
     exchange.weekProperty().addListener((observable,o,n) -> {
       getViewElement().updateGraph();
     });

diff --git a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardView.java b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardView.java
@@ -194,6 +194,10 @@ protected void initLayout() {
 
     registerButton(DashBoardActions.BUY_SHARES, buyBtn);
     registerButton(DashBoardActions.SELL_SHARES, sellBtn);
+    registerButton(DashBoardActions.DECREASE_5, m5QtyBtn);
+    registerButton(DashBoardActions.DECREASE_1, m1QtyBtn);
+    registerButton(DashBoardActions.INCREASE_1, p1QtyBtn);
+    registerButton(DashBoardActions.INCREASE_5, p5QtyBtn);
   }
 
   private ColumnConstraints makeCol(final float w) {