fenix/Simple-Calendar
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git synced 2025-06-05 21:59:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix displaying of events repeating by x weeks

Browse Source
This commit is contained in:
tibbi
2017-05-07 16:40:08 +02:00
parent 5c01bee1ae
commit eed35834fc
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -392,7 +392,13 @@ class DBHelper private constructor(val context: Context) : SQLiteOpenHelper(cont
if (it.startTS >= fromTS) { if (it.startTS >= fromTS) {
if (it.repeatInterval % WEEK == 0) { if (it.repeatInterval % WEEK == 0) {
if (it.startTS.isTsOnProperDay(it)) { if (it.startTS.isTsOnProperDay(it)) {
newEvents.add(it.copy()) val initialWeekOfYear = Formatter.getDateTimeFromTS(startTimes[it.id]).weekOfWeekyear
val currentWeekOfYear = Formatter.getDateTimeFromTS(it.startTS).weekOfWeekyear
// check if its the proper week, for events repeating by x weeks
if ((currentWeekOfYear - initialWeekOfYear) % (it.repeatInterval / WEEK) == 0) {
newEvents.add(it.copy())
}
} }
} else { } else {
newEvents.add(it.copy()) newEvents.add(it.copy())