EntryList: Copy notes from original entries

Fixes #1566
hotfix/2.1.2
Alinson S. Xavier 3 years ago
parent 1470dcd560
commit 2131fb3a3d
Signed by: isoron
GPG Key ID: 0DA8E4B9E1109DCA

@ -204,9 +204,16 @@ open class EntryList {
// Copy original entries
original.forEach { entry ->
val offset = entry.timestamp.daysUntil(to)
if (result[offset].value == UNKNOWN || entry.value == SKIP || entry.value == YES_MANUAL) {
result[offset] = entry
val value = if (
result[offset].value == UNKNOWN ||
entry.value == SKIP ||
entry.value == YES_MANUAL
) {
entry.value
} else {
YES_AUTO
}
result[offset] = Entry(entry.timestamp, value, entry.notes)
}
return result

@ -217,7 +217,7 @@ class EntryListTest {
fun testAddFromInterval() {
val entries = listOf(
Entry(day(1), YES_MANUAL),
Entry(day(2), NO),
Entry(day(2), NO, "Test"),
Entry(day(4), NO),
Entry(day(5), YES_MANUAL),
Entry(day(10), YES_MANUAL),
@ -230,7 +230,7 @@ class EntryListTest {
)
val expected = listOf(
Entry(day(1), YES_MANUAL),
Entry(day(2), YES_AUTO),
Entry(day(2), YES_AUTO, "Test"),
Entry(day(3), UNKNOWN),
Entry(day(4), YES_AUTO),
Entry(day(5), YES_MANUAL),

Loading…
Cancel
Save