julian/fahrtenbuch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

proper handling of currency values

Browse source
This commit is contained in:
Julian 2025-07-12 15:13:18 +02:00
parent 060eb86c59
commit a24c5e2c89
4 changed files with 36 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/scala/fahrtenbuch/Database.scala
View file

@ -19,7 +19,7 @@ import scala.util.Success
object DexieDB {
private val schemaVersion = 1.1
private val schemaVersion = 1.3
private val dexieDB: Dexie = new Dexie.^("fahrtenbuch")
dexieDB

18
src/main/scala/fahrtenbuch/components/EntryComponent.scala
View file

@ -111,13 +111,21 @@ class EntryComponent(
)
else
tr(
td(new Date(entry.date.payload).toISOString()),
td(new Date(entry.date.payload).toDateString()),
td(entry.driver.payload),
td(entry.startKm.payload),
td(entry.endKm.payload),
td(
entry.startKm.payload
.setScale(0, BigDecimal.RoundingMode.HALF_UP)
.toString()
),
td(
entry.endKm.payload
.setScale(0, BigDecimal.RoundingMode.HALF_UP)
.toString()
),
td(entry.animal.payload),
td(s"${entry.costWear}€"),
td(s"${entry.costTotal}€"),
td(s"${entry.costWear.setScale(2, BigDecimal.RoundingMode.HALF_UP)}€"),
td(s"${entry.costTotal.setScale(2, BigDecimal.RoundingMode.HALF_UP)}€"),
td(if entry.paid.payload then "Ja" else "Nein"),
td(
button(

5
src/main/scala/fahrtenbuch/components/NewEntryInput.scala
View file

@ -77,8 +77,9 @@ class NewEntryInput(showNewEntryField: Var[Boolean]):
onClick --> {
val id = EntryId.gen()
val driver = LastWriterWins.now(newEntryDriver.ref.value)
val startKm = LastWriterWins.now(newEntryStartKm.ref.value.toDouble)
val endKm = LastWriterWins.now(newEntryEndKm.ref.value.toDouble)
val startKm =
LastWriterWins.now(BigDecimal(newEntryStartKm.ref.value))
val endKm = LastWriterWins.now(BigDecimal(newEntryEndKm.ref.value))
val animal = LastWriterWins.now(newEntryAnimal.ref.value)
val paid = LastWriterWins.now(newEntryPaid.ref.checked)
entryEditBus.emit(

28
src/main/scala/fahrtenbuch/model/Entry.scala
View file

@ -26,27 +26,37 @@ object EntryId:
case class Entry(
id: EntryId,
startKm: LastWriterWins[Double],
endKm: LastWriterWins[Double],
startKm: LastWriterWins[BigDecimal],
endKm: LastWriterWins[BigDecimal],
animal: LastWriterWins[String],
paid: LastWriterWins[Boolean],
driver: LastWriterWins[String],
date: LastWriterWins[Double]
date: LastWriterWins[Double],
gasPricePerKm: LastWriterWins[BigDecimal] = LastWriterWins.now(0.13),
wearPricePerKm: LastWriterWins[BigDecimal] = LastWriterWins.now(0.05)
) derives NativeConverter:
val distance = endKm.payload - startKm.payload
// 13 cent pro km, 5 cent Abnutzung
def costGas: Double = distance * 0.13
def costWear: Double = distance * 0.05
def costTotal: Double = costGas + costWear
// initial 13 cent pro km, 5 cent Abnutzung
def costGas: BigDecimal = distance * gasPricePerKm.payload
def costWear: BigDecimal = distance * wearPricePerKm.payload
def costTotal: BigDecimal = costGas + costWear
object Entry:
given Lattice[Entry] = Lattice.derived
given NativeConverter[BigDecimal] with {
extension (a: BigDecimal)
override def toNative: js.Any =
a.toString()
override def fromNative(ps: ParseState): BigDecimal =
BigDecimal(ps.json.asInstanceOf[String])
}
def apply(
id: EntryId,
startKm: LastWriterWins[Double],
endKm: LastWriterWins[Double],
startKm: LastWriterWins[BigDecimal],
endKm: LastWriterWins[BigDecimal],
animal: LastWriterWins[String],
paid: LastWriterWins[Boolean],
driver: LastWriterWins[String]