Allow shares/commodities to have decimal values

Author: dlmcpaul

src/main/java/com/hz/mymoney/data/models/internal/Account.java

@@ -7,6 +7,7 @@
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.text.DecimalFormat;
 import java.time.LocalDate;
 import java.util.List;
 import java.util.PriorityQueue;
@@ -93,9 +94,9 @@ public boolean hasMovements() {
 	private BigDecimal addMovementAmount(Movement movement) {
 		if (isShareAccount) {
 			if (movement.split()) {
-				return movement.amount().setScale(0, RoundingMode.HALF_UP);
+				return movement.amount().setScale(2, RoundingMode.HALF_UP);
 			}
-			return cachedAmount.add(movement.amount()).setScale(0, RoundingMode.HALF_UP);
+			return cachedAmount.add(movement.amount()).setScale(2, RoundingMode.HALF_UP);
 		}
 		return cachedAmount.add(movement.amount());
 	}
@@ -108,7 +109,7 @@ private BigDecimal addMovementAmount(Movement movement) {
 			for (Movement movement : movements) {
 				sum = movement.split() ? movement.amount() : sum.add(movement.amount());
 			}
-			return sum.setScale(0, RoundingMode.HALF_UP);
+			return sum.setScale(2, RoundingMode.HALF_UP);
 		}
 		return sumBigDecimals(movements.stream()
 				.map(Movement::amount));
@@ -202,7 +203,8 @@ public String getSimpleName() {
 				// Option not share?
 				return getTotalAmount() + " options (" + getCode() + ") for " + getCode().substring(0,3);
 			}
-			return getTotalAmount() + " shares in " + simpleName;
+			;
+			return new DecimalFormat("#.##").format(getTotalAmount()) + " shares in " + simpleName;
 		} else if (isManagedFund()) {
 			return simpleName + " Fund";
 		}

src/main/java/com/hz/mymoney/ui/models/InvestmentSummary.java

@@ -2,11 +2,12 @@
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.text.DecimalFormat;
 import java.time.LocalDate;
 
 public record InvestmentSummary(
 		String code,
-		int count,
+		BigDecimal count,
 		BigDecimal lastPrice,
 		BigDecimal balance,
 		BigDecimal costBase,
@@ -18,6 +19,10 @@ public record InvestmentSummary(
 		String note
 		) {
 
+	public String quantity() {
+		return new DecimalFormat("#,###.##").format(count);
+	}
+
 	public boolean hasNote() {
 		return note != null;
 	}
@@ -27,7 +32,7 @@ public boolean isProfit() {
 	}
 
 	public boolean isClosed() {
-		return count == 0;
+		return count.equals(BigDecimal.ZERO);
 	}
 
 	public BigDecimal yearlyReturn() {

src/main/java/com/hz/mymoney/ui/models/templates/InvestmentsTemplateData.java

@@ -16,7 +16,7 @@ public class InvestmentsTemplateData {
 	public final String mode;
 
 	public List<InvestmentTotal> getInvestmentTotals() {
-		return investmentSummaries.stream().map(investmentSummary -> new InvestmentTotal(investmentSummary.code(), investmentSummary.count())).toList();
+		return investmentSummaries.stream().map(investmentSummary -> new InvestmentTotal(investmentSummary.code(), investmentSummary.count().intValue())).toList();
 	}
 
 	public List<MarketValue> getMarketValues() {

src/main/java/com/hz/mymoney/ui/services/UiModelBuilderService.java

@@ -320,13 +320,13 @@ private InvestmentSummary mapAccountToShareSummary(com.hz.mymoney.data.models.in
 
 		PriorityQueue<Movement> movementsForCode = account.getMovementsForCode(account.getCode());
 		if (movementsForCode.isEmpty()) {
-			return new InvestmentSummary(account.getCode(), account.getTotalAmount().intValue(), shareValue, currentValue, account.getCostBase(), account.getSales(), earnings, netProfitLoss, LocalDate.of(2000,1,1), LocalDate.now(), getNextInvestmentIncomeNote(account.getCode()));
+			return new InvestmentSummary(account.getCode(), account.getTotalAmount(), shareValue, currentValue, account.getCostBase(), account.getSales(), earnings, netProfitLoss, LocalDate.of(2000,1,1), LocalDate.now(), getNextInvestmentIncomeNote(account.getCode()));
 		}
 
 		LocalDate earliestMovementDate = movementsForCode.stream().findFirst().orElseThrow().date();
 		LocalDate lastMovementDate = movementsForCode.stream().toList().getLast().date();
 
-		return new InvestmentSummary(account.getCode(), account.getTotalAmount().intValue(), shareValue, currentValue, account.getCostBase(), account.getSales(), earnings, netProfitLoss, earliestMovementDate, lastMovementDate, getNextInvestmentIncomeNote(account.getCode()));
+		return new InvestmentSummary(account.getCode(), account.getTotalAmount(), shareValue, currentValue, account.getCostBase(), account.getSales(), earnings, netProfitLoss, earliestMovementDate, lastMovementDate, getNextInvestmentIncomeNote(account.getCode()));
 	}
 
 	private NetAssetLiabilityPosition createNetAssetLiabilityPosition(ChartOfAccounts chartOfAccounts, boolean includeNote) {

src/main/resources/templates/fragments/Investment.html

@@ -23,7 +23,7 @@
         th:each="investment : ${investmentsData.investmentSummaries}">
         <td th:text="${investment.code}" th:attr="data-tooltip = ${investment.hasNote()} ? ${investment.note} : _"></td>
         <td th:text="${#temporals.format(investment.firstPurchase, 'dd MMM yyyy')}"></td>
-        <td class="right aligned" th:if="${#strings.contains(header,'Current')}" th:text="${investment.count}"></td>
+        <td class="right aligned" th:if="${#strings.contains(header,'Current')}" th:text="${investment.quantity()}"></td>
         <td class="right aligned" th:if="${#strings.contains(header,'Current')}"
             th:text="${#numbers.formatCurrency(investment.lastPrice)}"></td>
         <td class="right aligned big-screen-table" th:text="${#numbers.formatCurrency(investment.costBase)}"></td>