fenix/Simple-Calendar
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git synced 2025-02-03 20:17:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

display repeating all-day events at event lists properly too

Browse Source
This commit is contained in:
tibbi 2017-06-24 17:12:33 +02:00
parent 0138fb9777
commit 038e1a59c4
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/kotlin/com/simplemobiletools/calendar/helpers/DBHelper.kt
View File

@ -493,6 +493,14 @@ class DBHelper private constructor(val context: Context) : SQLiteOpenHelper(cont
events.add(event.copy()) events.add(event.copy())
} }
} }
if (event.isAllDay) {
val dayCode = Formatter.getDayCodeFromTS(fromTS)
val endDayCode = Formatter.getDayCodeFromTS(event.endTS)
if (dayCode == endDayCode) {
events.add(event.copy())
}
}
event.addIntervalTime(original) event.addIntervalTime(original)
} }
return events return events
@ -514,6 +522,12 @@ class DBHelper private constructor(val context: Context) : SQLiteOpenHelper(cont
} else { } else {
if (event.endTS >= fromTS) { if (event.endTS >= fromTS) {
events.add(event.copy()) events.add(event.copy())
} else if (event.isAllDay) {
val dayCode = Formatter.getDayCodeFromTS(fromTS)
val endDayCode = Formatter.getDayCodeFromTS(event.endTS)
if (dayCode == endDayCode) {
events.add(event.copy())
}
} }
event.repeatLimit++ event.repeatLimit++
} }
@ -528,9 +542,9 @@ class DBHelper private constructor(val context: Context) : SQLiteOpenHelper(cont
if (eventId != -1) if (eventId != -1)
selection += " AND $MAIN_TABLE_NAME.$COL_ID = $eventId" selection += " AND $MAIN_TABLE_NAME.$COL_ID = $eventId"
val todayCode = Formatter.getDayCodeFromTS(fromTS) val dayCode = Formatter.getDayCodeFromTS(fromTS)
val cursor = getEventsCursor(selection) val cursor = getEventsCursor(selection)
events.addAll(fillEvents(cursor).filter { todayCode == Formatter.getDayCodeFromTS(it.startTS) }) events.addAll(fillEvents(cursor).filter { dayCode == Formatter.getDayCodeFromTS(it.startTS) })
return events return events
} }