codinux
/
Bankmeister
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed that entering text for amount or reference didn't reduce the autocomplete suggestions

This commit is contained in:
dankito 2024-09-26 04:52:46 +02:00
parent ee3faa7de1
commit 5ac65308bb
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
composeApp/src/commonMain/kotlin/net/codinux/banking/ui/dialogs/TransferMoneyDialog.kt
View File

@ -210,7 +210,7 @@ fun TransferMoneyDialog(
paymentReference = it.reference paymentReference = it.reference
} }
}, },
fetchSuggestions = { recipientFinder.findPaymentDataForIban(recipientAccountIdentifier) } fetchSuggestions = { query -> recipientFinder.findAmountPaymentDataForIban(recipientAccountIdentifier, query) }
) { paymentDataSuggestion -> ) { paymentDataSuggestion ->
Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) { Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) {
Text(formatUtil.formatAmount(paymentDataSuggestion.amount, paymentDataSuggestion.currency), Modifier.widthIn(min = 60.dp), textAlign = TextAlign.End) Text(formatUtil.formatAmount(paymentDataSuggestion.amount, paymentDataSuggestion.currency), Modifier.widthIn(min = 60.dp), textAlign = TextAlign.End)
@ -230,7 +230,7 @@ fun TransferMoneyDialog(
getItemTitle = { suggestion -> suggestion.reference }, getItemTitle = { suggestion -> suggestion.reference },
onEnteredTextChanged = { paymentReference = it }, onEnteredTextChanged = { paymentReference = it },
onSelectedItemChanged = { paymentReference = it?.reference ?: "" }, onSelectedItemChanged = { paymentReference = it?.reference ?: "" },
fetchSuggestions = { recipientFinder.findPaymentDataForIban(recipientAccountIdentifier) } fetchSuggestions = { query -> recipientFinder.findReferencePaymentDataForIban(recipientAccountIdentifier, query) }
) { paymentDataSuggestion -> ) { paymentDataSuggestion ->
Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) { Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) {
Text(formatUtil.formatAmount(paymentDataSuggestion.amount, paymentDataSuggestion.currency), Modifier.widthIn(min = 60.dp), textAlign = TextAlign.End) Text(formatUtil.formatAmount(paymentDataSuggestion.amount, paymentDataSuggestion.currency), Modifier.widthIn(min = 60.dp), textAlign = TextAlign.End)

12
composeApp/src/commonMain/kotlin/net/codinux/banking/ui/service/RecipientFinder.kt
View File

@ -30,6 +30,15 @@ class RecipientFinder(private val bankFinder: BankFinder) {
} }
} }
fun findAmountPaymentDataForIban(iban: String, query: String): Collection<PaymentDataSuggestion> =
transactionsByIban[iban].orEmpty()
.filter { it.amount.toString().contains(query, true) }
fun findReferencePaymentDataForIban(iban: String, query: String): Collection<PaymentDataSuggestion> =
transactionsByIban[iban].orEmpty()
.filter { it.reference.contains(query, true) }
suspend fun updateData(transactions: List<AccountTransaction>) { suspend fun updateData(transactions: List<AccountTransaction>) {
availableRecipients = transactions.mapNotNull { availableRecipients = transactions.mapNotNull {
// TODO: also regard userSetOtherPartyName? // TODO: also regard userSetOtherPartyName?
@ -51,7 +60,4 @@ class RecipientFinder(private val bankFinder: BankFinder) {
}.toSet().sortedByDescending { it.valueDate } } }.toSet().sortedByDescending { it.valueDate } }
} }
fun findPaymentDataForIban(iban: String): Collection<PaymentDataSuggestion> =
transactionsByIban[iban] ?: emptySet()
} }