fenix
/
Simple-Calendar
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix #185, properly display weekly all-day events

This commit is contained in:
tibbi 2017-07-04 21:09:30 +02:00
parent dadaec8eb9
commit bfc991ae6e
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -495,10 +495,18 @@ class DBHelper private constructor(val context: Context) : SQLiteOpenHelper(cont
} }
if (event.isAllDay) { if (event.isAllDay) {
val dayCode = Formatter.getDayCodeFromTS(fromTS) if (event.repeatInterval.isXWeeklyRepetition()) {
val endDayCode = Formatter.getDayCodeFromTS(event.endTS) if (event.startTS.isTsOnProperDay(event)) {
if (dayCode == endDayCode) { if (isOnProperWeek(event, startTimes)) {
events.add(event.copy()) events.add(event.copy())
}
}
} else {
val dayCode = Formatter.getDayCodeFromTS(fromTS)
val endDayCode = Formatter.getDayCodeFromTS(event.endTS)
if (dayCode == endDayCode) {
events.add(event.copy())
}
} }
} }
event.addIntervalTime(original) event.addIntervalTime(original)