From 9af8d0eb1df7ceb23ba36d4c5b6391fda161d480 Mon Sep 17 00:00:00 2001 From: dankito Date: Tue, 17 Sep 2024 15:29:03 +0200 Subject: [PATCH] Split AccountTransaction.userSetDisplayName into userSetReference and userSetOtherPartyName, and added userSetDisplayName to TanMedium, TanMethod and Holding --- .../banking/client/model/AccountTransaction.kt | 3 ++- .../client/model/securitiesaccount/Holding.kt | 2 ++ .../banking/client/model/tan/TanMedium.kt | 17 ++++++++++------- .../banking/client/model/tan/TanMethod.kt | 3 ++- 4 files changed, 16 insertions(+), 9 deletions(-) diff --git a/BankingClientModel/src/commonMain/kotlin/net/codinux/banking/client/model/AccountTransaction.kt b/BankingClientModel/src/commonMain/kotlin/net/codinux/banking/client/model/AccountTransaction.kt index b3253977..318e4dab 100644 --- a/BankingClientModel/src/commonMain/kotlin/net/codinux/banking/client/model/AccountTransaction.kt +++ b/BankingClientModel/src/commonMain/kotlin/net/codinux/banking/client/model/AccountTransaction.kt @@ -124,7 +124,8 @@ open class AccountTransaction( */ val isReversal: Boolean = false, - var userSetDisplayName: String? = null, + var userSetReference: String? = null, + var userSetOtherPartyName: String? = null, var category: String? = null, var notes: String? = null, ) { diff --git a/BankingClientModel/src/commonMain/kotlin/net/codinux/banking/client/model/securitiesaccount/Holding.kt b/BankingClientModel/src/commonMain/kotlin/net/codinux/banking/client/model/securitiesaccount/Holding.kt index 237c6d73..4e3f1b75 100644 --- a/BankingClientModel/src/commonMain/kotlin/net/codinux/banking/client/model/securitiesaccount/Holding.kt +++ b/BankingClientModel/src/commonMain/kotlin/net/codinux/banking/client/model/securitiesaccount/Holding.kt @@ -44,6 +44,8 @@ open class Holding( open var pricingTime: Instant? = null, open var buyingDate: LocalDate? = null, + + var userSetDisplayName: String? = null, ) { open val identifier: String by lazy { "${isin}_$wkn" } diff --git a/BankingClientModel/src/commonMain/kotlin/net/codinux/banking/client/model/tan/TanMedium.kt b/BankingClientModel/src/commonMain/kotlin/net/codinux/banking/client/model/tan/TanMedium.kt index 57c54714..249b25d1 100644 --- a/BankingClientModel/src/commonMain/kotlin/net/codinux/banking/client/model/tan/TanMedium.kt +++ b/BankingClientModel/src/commonMain/kotlin/net/codinux/banking/client/model/tan/TanMedium.kt @@ -14,7 +14,9 @@ open class TanMedium( /** * Only set if [type] is [TanMediumType.MobilePhone]. */ - val mobilePhone: MobilePhoneTanMedium? = null + val mobilePhone: MobilePhoneTanMedium? = null, + + var userSetDisplayName: String? = null ) { /** @@ -52,12 +54,13 @@ open class TanMedium( } val displayName: String by lazy { - identifier + " " + when (status) { - TanMediumStatus.Used -> "Aktiv" - TanMediumStatus.Available -> "Verfügbar" - TanMediumStatus.ActiveFollowUpCard -> " Folgekarte, aktiv bei erster Nutzung" - TanMediumStatus.AvailableFollowUpCard -> " Folgekarte, die erst aktiviert werden muss" - } + userSetDisplayName + ?: (identifier + " " + when (status) { + TanMediumStatus.Used -> "Aktiv" + TanMediumStatus.Available -> "Verfügbar" + TanMediumStatus.ActiveFollowUpCard -> " Folgekarte, aktiv bei erster Nutzung" + TanMediumStatus.AvailableFollowUpCard -> " Folgekarte, die erst aktiviert werden muss" + }) } override fun toString() = "$mediumName $status" diff --git a/BankingClientModel/src/commonMain/kotlin/net/codinux/banking/client/model/tan/TanMethod.kt b/BankingClientModel/src/commonMain/kotlin/net/codinux/banking/client/model/tan/TanMethod.kt index d32ddd70..0aca69ba 100644 --- a/BankingClientModel/src/commonMain/kotlin/net/codinux/banking/client/model/tan/TanMethod.kt +++ b/BankingClientModel/src/commonMain/kotlin/net/codinux/banking/client/model/tan/TanMethod.kt @@ -10,7 +10,8 @@ open class TanMethod( open val type: TanMethodType, open val identifier: String, open val maxTanInputLength: Int? = null, - open val allowedTanFormat: AllowedTanFormat = AllowedTanFormat.Alphanumeric + open val allowedTanFormat: AllowedTanFormat = AllowedTanFormat.Alphanumeric, + open var userSetDisplayName: String? = null ) { @get:JsonIgnore