Fix: Fixed visual bug regarding precision error when calculating owne…

…d shares
Team-40-IDATT2003 · May 19, 2026 · 41f1125 · 41f1125
1 parent a860e36
commit 41f1125
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 4 deletions.
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
@@ -129,7 +129,8 @@ protected void initInteractions() {
     getViewElement().setCurrentStock(stockList.getFirst(), 0);
     getViewElement().updateGraph(selectedTimeRange);
     getViewElement().setOnAction(DashBoardActions.BUY_SHARES, () -> {
-      if (Validator.NOT_EMPTY.isValid(getViewElement().getQuantityInputField().getText())) {
+      if (Validator.NOT_EMPTY.isValid(getViewElement().getQuantityInputField().getText())
+          && Float.parseFloat(getViewElement().getQuantityInputField().getText()) > 0) {
         BigDecimal amountToBuy = new BigDecimal(getViewElement().getQuantityInputField().getText());
         Transaction purchase = exchange.buy(
                 getViewElement().getCurrentStock().getSymbol(),
@@ -143,7 +144,8 @@ protected void initInteractions() {
     });
 
     getViewElement().setOnAction(DashBoardActions.SELL_SHARES, () -> {
-      if (Validator.NOT_EMPTY.isValid(getViewElement().getQuantityInputField().getText())) {
+      if (Validator.NOT_EMPTY.isValid(getViewElement().getQuantityInputField().getText())
+          && Float.parseFloat(getViewElement().getQuantityInputField().getText()) > 0) {
         List<Transaction> transactions = exchange.sell(
                 new BigDecimal(getViewElement().getQuantityInputField().getText()),
                 getViewElement().getCurrentStock().getSymbol(),
@@ -190,6 +192,12 @@ protected void initInteractions() {
       return null;
     }));
 
+    getViewElement().getQuantityInputField().focusedProperty().addListener((observable, wasFocused, isNowFocused) -> {
+      if (!isNowFocused && getViewElement().getQuantityInputField().getText().trim().isEmpty()) {
+          getViewElement().getQuantityInputField().setText("1.0");
+        }
+    });
+
     getViewElement().getSideBarSearchField().textProperty().addListener((observable, o, n) -> {
       selectedFilter = n;
       populateStockList(selectedFilter);

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
@@ -382,7 +382,7 @@ public void setCurrentStock(final Stock stock, final float amountOwned) {
     selectedStockLabel.setText(stock.getSymbol());
     stockFullNameLabel.setText(stock.getCompany());
     ownedStocks = amountOwned;
-    ownedQuantityLabel.setText("Owned: " + ownedStocks);
+    ownedQuantityLabel.setText("Owned: " + formatShares(ownedStocks));
   }
 
   /**
@@ -392,7 +392,7 @@ public void setCurrentStock(final Stock stock, final float amountOwned) {
    * */
   public void addOwnedShares(final float val) {
     ownedStocks += val;
-    ownedQuantityLabel.setText("Owned: " + ownedStocks);
+    ownedQuantityLabel.setText("Owned: " + formatShares(ownedStocks));
   }
 
   /**
@@ -553,4 +553,14 @@ public TextField getQuantityInputField() {
   public ComboBox<DashBoardTimeRange> getTimeRangeSelector() {
     return timeRangeSelector;
   }
+
+  /**
+   * Helper method for formatting owned shares (avoid precision showing in UI).
+   *
+   * @param amount the amount of shares to show.
+   * */
+  private String formatShares(final float amount) {
+    String formatted = String.format(java.util.Locale.US, "%.3f", amount);
+    return formatted.replaceAll("0+$", "").replaceAll("\\.$", "");
+  }
 }