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

Updated that Holding.quantity is of type Double, not Int

This commit is contained in:
dankito 2024-10-15 10:13:01 +02:00
parent 02d8d14ede
commit fe853f03e9
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
BankingPersistence/src/commonMain/kotlin/net/codinux/banking/persistence/SqliteBankingRepository.kt
View File

@ -331,7 +331,7 @@ open class SqliteBankingRepository : BankingRepository {
protected open fun getAllHoldings(): List<HoldingEntity> = protected open fun getAllHoldings(): List<HoldingEntity> =
accountTransactionQueries.selectAllHoldings { id, bankId, accountId, name, isin, wkn, quantity, currency, totalBalance, marketValue, performancePercentage, totalCostPrice, averageCostPrice, pricingTime, buyingDate -> accountTransactionQueries.selectAllHoldings { id, bankId, accountId, name, isin, wkn, quantity, currency, totalBalance, marketValue, performancePercentage, totalCostPrice, averageCostPrice, pricingTime, buyingDate ->
HoldingEntity(id, bankId, accountId, name, isin, wkn, mapToInt(quantity), currency, mapToAmount(totalBalance), mapToAmount(marketValue), performancePercentage?.toFloat(), mapToAmount(totalCostPrice), mapToAmount(averageCostPrice), mapToInstant(pricingTime), mapToDate(buyingDate)) HoldingEntity(id, bankId, accountId, name, isin, wkn, quantity, currency, mapToAmount(totalBalance), mapToAmount(marketValue), performancePercentage?.toFloat(), mapToAmount(totalCostPrice), mapToAmount(averageCostPrice), mapToInstant(pricingTime), mapToDate(buyingDate))
}.executeAsList() }.executeAsList()
override suspend fun persistHoldings(bankAccount: BankAccountEntity, holdings: List<Holding>): List<HoldingEntity> = override suspend fun persistHoldings(bankAccount: BankAccountEntity, holdings: List<Holding>): List<HoldingEntity> =
@ -348,10 +348,10 @@ open class SqliteBankingRepository : BankingRepository {
holding.name, holding.isin, holding.wkn, holding.name, holding.isin, holding.wkn,
mapInt(holding.quantity), holding.currency, holding.quantity, holding.currency,
mapAmount(holding.totalBalance), mapAmount(holding.marketValue), mapAmount(holding.totalBalance), mapAmount(holding.marketValue),
holding.performancePercentage?.toDouble(), holding.performancePercentage,
mapAmount(holding.totalCostPrice), mapAmount(holding.averageCostPrice), mapAmount(holding.totalCostPrice), mapAmount(holding.averageCostPrice),
mapInstant(holding.pricingTime), mapDate(holding.buyingDate) mapInstant(holding.pricingTime), mapDate(holding.buyingDate)
@ -365,7 +365,7 @@ open class SqliteBankingRepository : BankingRepository {
holdings.onEach { holding -> holdings.onEach { holding ->
accountTransactionQueries.updateHolding( accountTransactionQueries.updateHolding(
holding.name, holding.isin, holding.wkn, holding.name, holding.isin, holding.wkn,
mapInt(holding.quantity), holding.currency, holding.quantity, holding.currency,
mapAmount(holding.totalBalance), mapAmount(holding.marketValue), mapAmount(holding.totalBalance), mapAmount(holding.marketValue),
holding.performancePercentage?.toDouble(), holding.performancePercentage?.toDouble(),

2
BankingPersistence/src/commonMain/kotlin/net/codinux/banking/persistence/entities/HoldingEntity.kt
View File

@ -15,7 +15,7 @@ class HoldingEntity(
isin: String? = null, isin: String? = null,
wkn: String? = null, wkn: String? = null,
quantity: Int? = null, quantity: Double? = null,
currency: String? = null, currency: String? = null,
totalBalance: Amount? = null, totalBalance: Amount? = null,

2
BankingPersistence/src/commonMain/sqldelight/net/codinux/banking/persistence/AccountTransaction.sq
View File

@ -182,7 +182,7 @@ CREATE TABLE IF NOT EXISTS Holding (
isin TEXT, isin TEXT,
wkn TEXT, wkn TEXT,
quantity INTEGER , quantity REAL,
currency TEXT, currency TEXT,
totalBalance TEXT, totalBalance TEXT,

4
composeApp/src/androidMain/kotlin/net/codinux/banking/ui/composables/transactions/HoldingListItemPreview.kt
View File

@ -10,8 +10,8 @@ import net.codinux.banking.ui.forms.RoundedCornersCard
@Preview @Preview
@Composable @Composable
fun HoldingListItemPreview() { fun HoldingListItemPreview() {
val holding1 = Holding("MUL Amundi MSCI World V", null, null, 1693, "EUR", Amount("18578.04"), Amount("16.888"), -0.35f, Amount("17944.48"), Amount("16.828")) val holding1 = Holding("MUL Amundi MSCI World V", null, null, 1693.0, "EUR", Amount("18578.04"), Amount("16.888"), -0.35f, Amount("17944.48"), Amount("16.828"))
val holding2 = Holding("NVIDIA Corp.", null, null, 214, "EUR", Amount("21455.36"), Amount("100.18"), 8.8f, Amount("19872.04"), Amount("92.04")) val holding2 = Holding("NVIDIA Corp.", null, null, 214.0, "EUR", Amount("21455.36"), Amount("100.18"), 8.8f, Amount("19872.04"), Amount("92.04"))
RoundedCornersCard { RoundedCornersCard {
Column { Column {

2
composeApp/src/commonMain/kotlin/net/codinux/banking/ui/composables/transactions/HoldingListItem.kt
View File

@ -70,7 +70,7 @@ fun HoldingListItem(holding: Holding, isOddItem: Boolean = false, isNotLastItem:
Row(Modifier.weight(1f).padding(end = 6.dp), verticalAlignment = Alignment.CenterVertically) { Row(Modifier.weight(1f).padding(end = 6.dp), verticalAlignment = Alignment.CenterVertically) {
// TODO: set maxLines = 1 and TextOverflow.Ellipsis // TODO: set maxLines = 1 and TextOverflow.Ellipsis
if (holding.quantity != null) { if (holding.quantity != null) {
Text(holding.quantity.toString() + " Stück, ") Text(holding.quantity.toString().replace(".0", "").replace(".", ",") + " Stück, ")
} }
if (holding.averageCostPrice != null) { if (holding.averageCostPrice != null) {