isoron/loop
1
1
Fork 0
mirror of https://github.com/iSoron/uhabits.git synced 2025-12-06 09:08:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

EntryList: Copy notes from original entries

Browse Source 
Fixes #1566
This commit is contained in:
Alinson S. Xavier
2023-01-24 05:58:26 -06:00
parent 1470dcd560
commit 2131fb3a3d
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/EntryList.kt
View File

@@ -204,9 +204,16 @@ open class EntryList {
// Copy original entries // Copy original entries
original.forEach { entry -> original.forEach { entry ->
val offset = entry.timestamp.daysUntil(to) val offset = entry.timestamp.daysUntil(to)
if (result[offset].value == UNKNOWN || entry.value == SKIP || entry.value == YES_MANUAL) { val value = if (
result[offset] = entry 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 return result

4
uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/models/EntryListTest.kt
View File

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