diff --git a/fints4k/src/commonMain/kotlin/net/dankito/banking/fints/FinTsClient.kt b/fints4k/src/commonMain/kotlin/net/dankito/banking/fints/FinTsClient.kt index 51a3b222..099ba746 100644 --- a/fints4k/src/commonMain/kotlin/net/dankito/banking/fints/FinTsClient.kt +++ b/fints4k/src/commonMain/kotlin/net/dankito/banking/fints/FinTsClient.kt @@ -47,7 +47,8 @@ open class FinTsClient( val FindAccountTransactionsStartRegex = Regex("^HIKAZ:\\d:\\d:\\d\\+@\\d+@", RegexOption.MULTILINE) val FindAccountTransactionsEndRegex = Regex("^-'", RegexOption.MULTILINE) - const val NinetyDaysMillis = 90 * 24 * 60 * 60 * 1000L + const val OneDayMillis = 24 * 60 * 60 * 1000L + const val NinetyDaysMillis = 90 * OneDayMillis private val log = LoggerFactory.getLogger(FinTsClient::class) @@ -404,8 +405,12 @@ open class FinTsClient( closeDialog(dialogContext) val successful = response.successful && (parameter.alsoRetrieveBalance == false || balance != null) + val fromDate = parameter.fromDate + ?: dialogContext.bank.countDaysForWhichTransactionsAreKept?.let { Date(Date.today.millisSinceEpoch - it * OneDayMillis) } + ?: bookedTransactions.map { it.valueDate }.sortedBy { it.millisSinceEpoch }.firstOrNull() + val retrievedData = RetrievedAccountData(parameter.account, successful, balance, bookedTransactions, unbookedTransactions, fromDate, parameter.toDate ?: Date.today) - callback(GetTransactionsResponse(response, listOf(RetrievedAccountData(parameter.account, successful, balance, bookedTransactions, unbookedTransactions)), + callback(GetTransactionsResponse(response, listOf(retrievedData), if (parameter.maxCountEntries != null) parameter.isSettingMaxCountEntriesAllowedByBank else null )) } diff --git a/fints4k/src/commonMain/kotlin/net/dankito/banking/fints/model/RetrievedAccountData.kt b/fints4k/src/commonMain/kotlin/net/dankito/banking/fints/model/RetrievedAccountData.kt index 64036227..077617bb 100644 --- a/fints4k/src/commonMain/kotlin/net/dankito/banking/fints/model/RetrievedAccountData.kt +++ b/fints4k/src/commonMain/kotlin/net/dankito/banking/fints/model/RetrievedAccountData.kt @@ -1,18 +1,22 @@ package net.dankito.banking.fints.model +import net.dankito.utils.multiplatform.Date + open class RetrievedAccountData( open val accountData: AccountData, open val successfullyRetrievedData: Boolean, open val balance: Money?, open var bookedTransactions: Collection, - open var unbookedTransactions: Collection + open var unbookedTransactions: Collection, + open val retrievedTransactionsFrom: Date?, + open val retrievedTransactionsTo: Date? ) { companion object { fun unsuccessful(account: AccountData): RetrievedAccountData { - return RetrievedAccountData(account, false, null, listOf(), listOf()) + return RetrievedAccountData(account, false, null, listOf(), listOf(), null, null) } fun unsuccessfulList(account: AccountData): List { diff --git a/persistence/database/RoomBankingPersistence/src/main/java/net/dankito/banking/persistence/model/BankAccount.kt b/persistence/database/RoomBankingPersistence/src/main/java/net/dankito/banking/persistence/model/BankAccount.kt index a68e478b..2237c4cf 100644 --- a/persistence/database/RoomBankingPersistence/src/main/java/net/dankito/banking/persistence/model/BankAccount.kt +++ b/persistence/database/RoomBankingPersistence/src/main/java/net/dankito/banking/persistence/model/BankAccount.kt @@ -24,7 +24,8 @@ open class BankAccount( override var type: BankAccountType = BankAccountType.Girokonto, override var productName: String? = null, override var accountLimit: String? = null, - override var lastRetrievedTransactionsTimestamp: Date? = null, + override var retrievedTransactionsFromOn: Date? = null, + override var retrievedTransactionsUpTo: Date? = null, override var supportsRetrievingAccountTransactions: Boolean = false, override var supportsRetrievingBalance: Boolean = false, diff --git a/persistence/json/BankingPersistenceJson/src/main/kotlin/net/dankito/banking/persistence/model/BankAccountEntity.kt b/persistence/json/BankingPersistenceJson/src/main/kotlin/net/dankito/banking/persistence/model/BankAccountEntity.kt index f69e9a2f..7e17746a 100644 --- a/persistence/json/BankingPersistenceJson/src/main/kotlin/net/dankito/banking/persistence/model/BankAccountEntity.kt +++ b/persistence/json/BankingPersistenceJson/src/main/kotlin/net/dankito/banking/persistence/model/BankAccountEntity.kt @@ -22,7 +22,8 @@ open class BankAccountEntity( override var type: BankAccountType = BankAccountType.Girokonto, override var productName: String? = null, override var accountLimit: String? = null, - override var lastRetrievedTransactionsTimestamp: Date? = null, + override var retrievedTransactionsFromOn: Date? = null, + override var retrievedTransactionsUpTo: Date? = null, override var supportsRetrievingAccountTransactions: Boolean = false, override var supportsRetrievingBalance: Boolean = false, override var supportsTransferringMoney: Boolean = false, diff --git a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/home/HomeFragment.kt b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/home/HomeFragment.kt index 19b0f0ea..929b1dc8 100644 --- a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/home/HomeFragment.kt +++ b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/home/HomeFragment.kt @@ -27,6 +27,7 @@ import net.dankito.banking.ui.presenter.BankingPresenter import net.dankito.utils.android.extensions.asActivity import net.dankito.utils.android.extensions.getDimension import net.dankito.utils.multiplatform.sum +import java.text.DateFormat import javax.inject.Inject @@ -36,6 +37,8 @@ class HomeFragment : Fragment() { val TransactionsCannotBeRetrievedStates = listOf(TransactionsRetrievalState.AccountTypeNotSupported, TransactionsRetrievalState.AccountDoesNotSupportFetchingTransactions) + val RetrievedTransactionsPeriodDateFormat = DateFormat.getDateInstance(DateFormat.MEDIUM) + } @@ -272,14 +275,20 @@ class HomeFragment : Fragment() { btnRetrieveTransactions.visibility = if (TransactionsCannotBeRetrievedStates.contains(transactionsRetrievalState)) View.GONE else View.VISIBLE btnAddAccount.visibility = if (noAccountsAddedYet) View.VISIBLE else View.GONE + var messageArgs = mutableListOf() val transactionsRetrievalStateMessageId = when (transactionsRetrievalState) { TransactionsRetrievalState.AccountTypeNotSupported -> R.string.fragment_home_transactions_retrieval_state_account_type_not_supported TransactionsRetrievalState.AccountDoesNotSupportFetchingTransactions -> R.string.fragment_home_transactions_retrieval_state_account_does_not_support_retrieving_transactions - TransactionsRetrievalState.NoTransactionsInRetrievedPeriod -> R.string.fragment_home_transactions_retrieval_state_no_transactions_in_retrieved_period + TransactionsRetrievalState.NoTransactionsInRetrievedPeriod -> { + val account = presenter.selectedBankAccounts.first() + account.retrievedTransactionsFromOn?.let { messageArgs.add(RetrievedTransactionsPeriodDateFormat.format(it)) } + account.retrievedTransactionsUpTo?.let { messageArgs.add(RetrievedTransactionsPeriodDateFormat.format(it)) } + R.string.fragment_home_transactions_retrieval_state_no_transactions_in_retrieved_period + } TransactionsRetrievalState.NeverRetrievedTransactions -> R.string.fragment_home_transactions_retrieval_state_never_retrieved_transactions else -> null } - txtNoTransactionsFetchedMessage.text = transactionsRetrievalStateMessageId?.let { requireContext().getString(transactionsRetrievalStateMessageId) } ?: "" + txtNoTransactionsFetchedMessage.text = transactionsRetrievalStateMessageId?.let { requireContext().getString(transactionsRetrievalStateMessageId, *messageArgs.toTypedArray()) } ?: "" } private fun setFetchAllTransactionsView() { diff --git a/ui/BankingAndroidApp/src/main/res/values-de/strings.xml b/ui/BankingAndroidApp/src/main/res/values-de/strings.xml index 3f583f4b..28e48422 100644 --- a/ui/BankingAndroidApp/src/main/res/values-de/strings.xml +++ b/ui/BankingAndroidApp/src/main/res/values-de/strings.xml @@ -42,7 +42,7 @@ Kontotyp wird von App nicht unterstützt Konto unterstützt Abrufen von Umsätzen nicht Noch keine Umsätze abgerufen - Empfangener Zeitraum enthielt keine Umsätze + Empfangener Zeitraum vom %1$s - %2$s enthält keine Umsätze Neue Überweisung an %s Neue Überweisung mit gleichen Daten Ältere Umsätze abrufen (erfordert TAN) diff --git a/ui/BankingAndroidApp/src/main/res/values/strings.xml b/ui/BankingAndroidApp/src/main/res/values/strings.xml index 8776d1b0..85371d85 100644 --- a/ui/BankingAndroidApp/src/main/res/values/strings.xml +++ b/ui/BankingAndroidApp/src/main/res/values/strings.xml @@ -42,7 +42,7 @@ Account type not supported by app Account does not support retrieving transactions No transactions fetched yet - There haven\'t been any transactions in retrieved period + There haven\'t been any transactions in retrieved period from %1$s - %2$s Transfer money to %s New transfer with same data Fetch earlier transactions (requires TAN) diff --git a/ui/BankingUiCommon/src/commonMain/kotlin/net/dankito/banking/ui/model/BankAccount.kt b/ui/BankingUiCommon/src/commonMain/kotlin/net/dankito/banking/ui/model/BankAccount.kt index 6a676e6a..ad9e9863 100644 --- a/ui/BankingUiCommon/src/commonMain/kotlin/net/dankito/banking/ui/model/BankAccount.kt +++ b/ui/BankingUiCommon/src/commonMain/kotlin/net/dankito/banking/ui/model/BankAccount.kt @@ -18,7 +18,8 @@ open class BankAccount @JvmOverloads constructor( override var type: BankAccountType = BankAccountType.Girokonto, override var productName: String? = null, override var accountLimit: String? = null, - override var lastRetrievedTransactionsTimestamp: Date? = null, + override var retrievedTransactionsFromOn: Date? = null, + override var retrievedTransactionsUpTo: Date? = null, override var supportsRetrievingAccountTransactions: Boolean = false, override var supportsRetrievingBalance: Boolean = false, override var supportsTransferringMoney: Boolean = false, diff --git a/ui/BankingUiCommon/src/commonMain/kotlin/net/dankito/banking/ui/model/IBankAccount.kt b/ui/BankingUiCommon/src/commonMain/kotlin/net/dankito/banking/ui/model/IBankAccount.kt index 16dbdb3d..c434c354 100644 --- a/ui/BankingUiCommon/src/commonMain/kotlin/net/dankito/banking/ui/model/IBankAccount.kt +++ b/ui/BankingUiCommon/src/commonMain/kotlin/net/dankito/banking/ui/model/IBankAccount.kt @@ -19,7 +19,8 @@ interface IBankAccount : OrderedDisplayable { var type: BankAccountType var productName: String? var accountLimit: String? - var lastRetrievedTransactionsTimestamp: Date? + var retrievedTransactionsFromOn: Date? + var retrievedTransactionsUpTo: Date? var supportsRetrievingAccountTransactions: Boolean var supportsRetrievingBalance: Boolean var supportsTransferringMoney: Boolean diff --git a/ui/BankingUiCommon/src/commonMain/kotlin/net/dankito/banking/ui/model/RetrievedAccountData.kt b/ui/BankingUiCommon/src/commonMain/kotlin/net/dankito/banking/ui/model/RetrievedAccountData.kt index 7260b285..3f3fce79 100644 --- a/ui/BankingUiCommon/src/commonMain/kotlin/net/dankito/banking/ui/model/RetrievedAccountData.kt +++ b/ui/BankingUiCommon/src/commonMain/kotlin/net/dankito/banking/ui/model/RetrievedAccountData.kt @@ -1,6 +1,7 @@ package net.dankito.banking.ui.model import net.dankito.utils.multiplatform.BigDecimal +import net.dankito.utils.multiplatform.Date open class RetrievedAccountData( @@ -8,5 +9,7 @@ open class RetrievedAccountData( open val successfullyRetrievedData: Boolean, open val balance: BigDecimal?, open val bookedTransactions: Collection, - open val unbookedTransactions: List + open val unbookedTransactions: List, + open val retrievedTransactionsFrom: Date?, + open val retrievedTransactionsTo: Date? ) \ No newline at end of file diff --git a/ui/BankingUiCommon/src/commonMain/kotlin/net/dankito/banking/ui/model/responses/GetTransactionsResponse.kt b/ui/BankingUiCommon/src/commonMain/kotlin/net/dankito/banking/ui/model/responses/GetTransactionsResponse.kt index c4ec22e0..4105ab4b 100644 --- a/ui/BankingUiCommon/src/commonMain/kotlin/net/dankito/banking/ui/model/responses/GetTransactionsResponse.kt +++ b/ui/BankingUiCommon/src/commonMain/kotlin/net/dankito/banking/ui/model/responses/GetTransactionsResponse.kt @@ -11,7 +11,7 @@ open class GetTransactionsResponse( open val tanRequiredButWeWereToldToAbortIfSo: Boolean = false ) : BankingClientResponse(true /* any value */, errorToShowToUser, userCancelledAction) { - constructor(account: TypedBankAccount, errorToShowToUser: String) : this(listOf(RetrievedAccountData(account, false, null, listOf(), listOf())), errorToShowToUser) + constructor(account: TypedBankAccount, errorToShowToUser: String) : this(listOf(RetrievedAccountData(account, false, null, listOf(), listOf(), null, null)), errorToShowToUser) constructor(retrievedData: RetrievedAccountData) : this(listOf(retrievedData)) diff --git a/ui/BankingUiCommon/src/commonMain/kotlin/net/dankito/banking/ui/presenter/BankingPresenter.kt b/ui/BankingUiCommon/src/commonMain/kotlin/net/dankito/banking/ui/presenter/BankingPresenter.kt index 0aa9f4d8..0dce6277 100644 --- a/ui/BankingUiCommon/src/commonMain/kotlin/net/dankito/banking/ui/presenter/BankingPresenter.kt +++ b/ui/BankingUiCommon/src/commonMain/kotlin/net/dankito/banking/ui/presenter/BankingPresenter.kt @@ -327,7 +327,7 @@ open class BankingPresenter( } open fun updateBankAccountTransactionsAsync(bankAccount: TypedBankAccount, abortIfTanIsRequired: Boolean = false, callback: ((GetTransactionsResponse) -> Unit)? = null) { - val fromDate = bankAccount.lastRetrievedTransactionsTimestamp?.let { Date(it.millisSinceEpoch - OneDayMillis) } // one day before last received transactions + val fromDate = bankAccount.retrievedTransactionsUpTo?.let { Date(it.millisSinceEpoch - OneDayMillis) } // one day before last received transactions fetchAccountTransactionsAsync(bankAccount, fromDate, abortIfTanIsRequired, callback) } @@ -336,7 +336,10 @@ open class BankingPresenter( if (response.successful) { response.retrievedData.forEach { retrievedData -> val account = retrievedData.account - account.lastRetrievedTransactionsTimestamp = startDate + account.retrievedTransactionsUpTo = startDate + if (account.retrievedTransactionsFromOn == null || retrievedData.retrievedTransactionsFrom?.isBefore(account.retrievedTransactionsFromOn!!) == true) { + account.retrievedTransactionsFromOn = retrievedData.retrievedTransactionsFrom + } if (didFetchAllTransactions || didFetchAllTransactionsStoredOnBankServer(account, retrievedData.bookedTransactions)) { account.haveAllTransactionsBeenFetched = true @@ -368,7 +371,7 @@ open class BankingPresenter( asyncRunner.runAsync { // don't block retrieving next chunk by blocked saving to db / json updateAccountTransactions(bankAccount, accountTransactionsChunk) - callRetrievedAccountTransactionsResponseListener(GetTransactionsResponse(RetrievedAccountData(bankAccount, true, null, accountTransactionsChunk, listOf()))) + callRetrievedAccountTransactionsResponseListener(GetTransactionsResponse(RetrievedAccountData(bankAccount, true, null, accountTransactionsChunk, listOf(), null, null))) } } } @@ -770,7 +773,7 @@ open class BankingPresenter( return TransactionsRetrievalState.RetrievedTransactions } - if (account.lastRetrievedTransactionsTimestamp != null) { + if (account.retrievedTransactionsUpTo != null) { return TransactionsRetrievalState.NoTransactionsInRetrievedPeriod } diff --git a/ui/BankingiOSApp/BankingiOSApp/Base.lproj/Localizable.strings b/ui/BankingiOSApp/BankingiOSApp/Base.lproj/Localizable.strings index dd9936a0..21841d35 100644 --- a/ui/BankingiOSApp/BankingiOSApp/Base.lproj/Localizable.strings +++ b/ui/BankingiOSApp/BankingiOSApp/Base.lproj/Localizable.strings @@ -79,7 +79,7 @@ "Account type not supported by app" = "Account type not supported by app"; "Account does not support retrieving transactions" = "Account does not support retrieving transactions"; "No transactions fetched yet" = "No transactions fetched yet"; -"There haven't been any transactions in retrieved period" = "There haven't been any transactions in retrieved period"; +"There haven't been any transactions in retrieved period from %@ - %@" = "There haven't been any transactions in retrieved period from %@ - %@"; "Transfer money to %@" = "Transfer money to %@"; "New transfer with same data" = "New transfer with same data"; diff --git a/ui/BankingiOSApp/BankingiOSApp/de.lproj/Localizable.strings b/ui/BankingiOSApp/BankingiOSApp/de.lproj/Localizable.strings index a6ffad84..2282a9ba 100644 --- a/ui/BankingiOSApp/BankingiOSApp/de.lproj/Localizable.strings +++ b/ui/BankingiOSApp/BankingiOSApp/de.lproj/Localizable.strings @@ -79,7 +79,7 @@ "Account type not supported by app" = "Kontotyp wird von App nicht unterstützt"; "Account does not support retrieving transactions" = "Konto unterstützt Abrufen von Umsätzen nicht"; "No transactions fetched yet" = "Noch keine Umsätze abgerufen"; -"There haven't been any transactions in retrieved period" = "Empfangener Zeitraum enthielt keine Umsätze"; +"There haven't been any transactions in retrieved period from %@ - %@" = "Empfangener Zeitraum vom %@ - %@ enthält keine Umsätze"; "Transfer money to %@" = "Neue Überweisung an %@"; "New transfer with same data" = "Neue Überweisung mit gleichen Daten"; diff --git a/ui/BankingiOSApp/BankingiOSApp/persistence/Mapper.swift b/ui/BankingiOSApp/BankingiOSApp/persistence/Mapper.swift index b082a74a..f56adb9f 100644 --- a/ui/BankingiOSApp/BankingiOSApp/persistence/Mapper.swift +++ b/ui/BankingiOSApp/BankingiOSApp/persistence/Mapper.swift @@ -58,7 +58,7 @@ class Mapper { } func map(_ customer: ICustomer, _ account: PersistedBankAccount) -> IBankAccount { - let mapped = BankAccount(customer: customer, identifier: map(account.identifier), accountHolderName: map(account.accountHolderName), iban: account.iban, subAccountNumber: account.subAccountNumber, customerId: map(account.customerId), balance: map(account.balance), currency: map(account.currency), type: map(account.type), productName: account.productName, accountLimit: account.accountLimit, lastRetrievedTransactionsTimestamp: map(account.lastRetrievedTransactionsTimestamp), supportsRetrievingAccountTransactions: account.supportsRetrievingAccountTransactions, supportsRetrievingBalance: account.supportsRetrievingBalance, supportsTransferringMoney: account.supportsTransferringMoney, supportsInstantPaymentMoneyTransfer: account.supportsInstantPaymentMoneyTransfer, bookedTransactions: [], unbookedTransactions: []) + let mapped = BankAccount(customer: customer, identifier: map(account.identifier), accountHolderName: map(account.accountHolderName), iban: account.iban, subAccountNumber: account.subAccountNumber, customerId: map(account.customerId), balance: map(account.balance), currency: map(account.currency), type: map(account.type), productName: account.productName, accountLimit: account.accountLimit, retrievedTransactionsFromOn: map(account.retrievedTransactionsFromOn), retrievedTransactionsUpTo: map(account.retrievedTransactionsUpTo), supportsRetrievingAccountTransactions: account.supportsRetrievingAccountTransactions, supportsRetrievingBalance: account.supportsRetrievingBalance, supportsTransferringMoney: account.supportsTransferringMoney, supportsInstantPaymentMoneyTransfer: account.supportsInstantPaymentMoneyTransfer, bookedTransactions: [], unbookedTransactions: []) mapped.haveAllTransactionsBeenFetched = account.haveAllTransactionsBeenFetched mapped.isAccountTypeSupported = account.isAccountTypeSupported @@ -92,7 +92,8 @@ class Mapper { mapped.isAccountTypeSupported = account.isAccountTypeSupported mapped.productName = account.productName mapped.accountLimit = account.accountLimit - mapped.lastRetrievedTransactionsTimestamp = account.lastRetrievedTransactionsTimestamp?.date + mapped.retrievedTransactionsFromOn = account.retrievedTransactionsFromOn?.date + mapped.retrievedTransactionsUpTo = account.retrievedTransactionsUpTo?.date mapped.supportsRetrievingAccountTransactions = account.supportsRetrievingAccountTransactions mapped.supportsRetrievingBalance = account.supportsRetrievingBalance mapped.supportsTransferringMoney = account.supportsTransferringMoney diff --git a/ui/BankingiOSApp/BankingiOSApp/ui/dialogs/AccountTransactionsDialog.swift b/ui/BankingiOSApp/BankingiOSApp/ui/dialogs/AccountTransactionsDialog.swift index 4df4eb22..2f59cb3d 100644 --- a/ui/BankingiOSApp/BankingiOSApp/ui/dialogs/AccountTransactionsDialog.swift +++ b/ui/BankingiOSApp/BankingiOSApp/ui/dialogs/AccountTransactionsDialog.swift @@ -6,6 +6,8 @@ struct AccountTransactionsDialog: View { static private let DoNotShowFetchAllTransactionsOverlayForUserDefaultsKeyPrefix = "DoNotShowFetchAllTransactionsOverlayFor_" + static private let RetrievedTransactionsPeriodDateFormat = DateFormatter() + private let title: String @@ -73,6 +75,8 @@ struct AccountTransactionsDialog: View { self.title = title self.showBankIcons = showBankIcons + + Self.RetrievedTransactionsPeriodDateFormat.dateStyle = .medium } @@ -246,7 +250,8 @@ struct AccountTransactionsDialog: View { return "No transactions fetched yet" } else if state == .notransactionsinretrievedperiod { - return "There haven't been any transactions in retrieved period" + let account = presenter.selectedBankAccounts.first! + return "There haven't been any transactions in retrieved period from \(mapDate(account.retrievedTransactionsFromOn)) - \(mapDate(account.retrievedTransactionsUpTo))" } else if state == .accountdoesnotsupportfetchingtransactions { return "Account does not support retrieving transactions" diff --git a/ui/fints4kBankingClient/src/commonMain/kotlin/net/dankito/banking/mapper/fints4kModelMapper.kt b/ui/fints4kBankingClient/src/commonMain/kotlin/net/dankito/banking/mapper/fints4kModelMapper.kt index da893c23..50465002 100644 --- a/ui/fints4kBankingClient/src/commonMain/kotlin/net/dankito/banking/mapper/fints4kModelMapper.kt +++ b/ui/fints4kBankingClient/src/commonMain/kotlin/net/dankito/banking/mapper/fints4kModelMapper.kt @@ -56,7 +56,9 @@ open class fints4kModelMapper(protected val modelCreator: IModelCreator) { retrievedData.successfullyRetrievedData, retrievedData.balance?.toBigDecimal(), mapTransactions(account, retrievedData.bookedTransactions), - listOf() // TODO: map unbooked transactions + listOf(), // TODO: map unbooked transactions + retrievedData.retrievedTransactionsFrom, + retrievedData.retrievedTransactionsTo ) } diff --git a/ui/hbci4jBankingClient/src/main/kotlin/net/dankito/banking/hbci4jBankingClient.kt b/ui/hbci4jBankingClient/src/main/kotlin/net/dankito/banking/hbci4jBankingClient.kt index 1d017bf4..570a9f20 100644 --- a/ui/hbci4jBankingClient/src/main/kotlin/net/dankito/banking/hbci4jBankingClient.kt +++ b/ui/hbci4jBankingClient/src/main/kotlin/net/dankito/banking/hbci4jBankingClient.kt @@ -102,7 +102,7 @@ open class hbci4jBankingClient( response.retrievedData.first() } else { - RetrievedAccountData(account, false, null, listOf(), listOf()) + RetrievedAccountData(account, false, null, listOf(), listOf(), null) } } @@ -180,7 +180,7 @@ open class hbci4jBankingClient( } return GetTransactionsResponse(RetrievedAccountData(account, true, balance.toBigDecimal(), - accountTransactionMapper.mapAccountTransactions(account, result), listOf())) + accountTransactionMapper.mapAccountTransactions(account, result), listOf(), parameter.fromDate, parameter.toDate)) } catch(e: Exception) { log.error("Could not get accounting details for bank ${credentials.bankCode}", e)