aj/MoneyMap
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Receipts: highlight exact amount matches in green, close (±10%) in yellow; update legend and scroll target preference

Browse Source
This commit is contained in:
AJ
2025-10-19 01:03:26 -04:00
parent cf1266e86d
commit c31e88f07c
2 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
MoneyMap/Pages/Receipts.cshtml
View File

@@ -334,11 +334,11 @@
</thead> </thead>
<tbody> <tbody>
@{ @{
var firstMatchId = matches.FirstOrDefault(t => t.IsAmountMatch)?.Id; var firstMatchId = matches.FirstOrDefault(t => t.IsExactAmount)?.Id ?? matches.FirstOrDefault(t => t.IsCloseAmount)?.Id;
} }
@foreach (var txn in matches) @foreach (var txn in matches)
{ {
var rowClass = txn.IsAmountMatch ? "table-success" : ""; var rowClass = txn.IsExactAmount ? "table-success" : (txn.IsCloseAmount ? "table-warning" : "");
var isFirstMatch = txn.Id == firstMatchId; var isFirstMatch = txn.Id == firstMatchId;
<tr class="@rowClass" <tr class="@rowClass"
id="@(isFirstMatch ? $"firstMatch{r.Id}" : "")" id="@(isFirstMatch ? $"firstMatch{r.Id}" : "")"
@@ -434,3 +434,4 @@

24
MoneyMap/Pages/Receipts.cshtml.cs
View File

@@ -330,7 +330,7 @@ namespace MoneyMap.Pages
// Filter by amount (±10% tolerance) if receipt has a total // Filter by amount (±10% tolerance) if receipt has a total
if (receipt.Total.HasValue) if (receipt.Total.HasValue)
{ {
var receiptTotal = Math.Abs(receipt.Total.Value); var receiptTotal = Math.Round(Math.Abs(receipt.Total.Value), 2);
var tolerance = receiptTotal * 0.10m; // 10% tolerance var tolerance = receiptTotal * 0.10m; // 10% tolerance
var minAmount = receiptTotal - tolerance; var minAmount = receiptTotal - tolerance;
var maxAmount = receiptTotal + tolerance; var maxAmount = receiptTotal + tolerance;
@@ -338,7 +338,7 @@ namespace MoneyMap.Pages
candidates = candidates candidates = candidates
.Where(t => .Where(t =>
{ {
var transactionAmount = Math.Abs(t.Amount); var transactionAmount = Math.Round(Math.Abs(t.Amount), 2);
return transactionAmount >= minAmount && transactionAmount <= maxAmount; return transactionAmount >= minAmount && transactionAmount <= maxAmount;
}) })
.ToList(); .ToList();
@@ -355,16 +355,18 @@ namespace MoneyMap.Pages
Amount = t.Amount, Amount = t.Amount,
MerchantName = t.Merchant?.Name, MerchantName = t.Merchant?.Name,
PaymentMethod = t.PaymentMethodLabel, PaymentMethod = t.PaymentMethodLabel,
IsAmountMatch = false IsExactAmount = false,
IsCloseAmount = false
}; };
// Check if amount matches within tighter tolerance for highlighting (±2%) // Amount matching flags
if (receipt.Total.HasValue) if (receipt.Total.HasValue)
{ {
var receiptTotal = Math.Abs(receipt.Total.Value); var receiptTotal = Math.Round(Math.Abs(receipt.Total.Value), 2);
var transactionAmount = Math.Abs(t.Amount); var transactionAmount = Math.Round(Math.Abs(t.Amount), 2);
var tightTolerance = receiptTotal * 0.02m; // 2% for green highlighting option.IsExactAmount = transactionAmount == receiptTotal;
option.IsAmountMatch = Math.Abs(transactionAmount - receiptTotal) <= tightTolerance; var tolerance = receiptTotal * 0.10m;
option.IsCloseAmount = !option.IsExactAmount && Math.Abs(transactionAmount - receiptTotal) <= tolerance;
} }
return option; return option;
@@ -424,8 +426,12 @@ namespace MoneyMap.Pages
public decimal Amount { get; set; } public decimal Amount { get; set; }
public string? MerchantName { get; set; } public string? MerchantName { get; set; }
public string PaymentMethod { get; set; } = ""; public string PaymentMethod { get; set; } = "";
public bool IsAmountMatch { get; set; } public bool IsExactAmount { get; set; }
public bool IsCloseAmount { get; set; }
} }
} }
} }