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

some fixes to weekly repeating events repeating x times

This commit is contained in:
tibbi 2017-04-23 19:57:19 +02:00
parent 97e5489f0f
commit 0a24dcbc31
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -404,17 +404,27 @@ class DBHelper private constructor(val context: Context) : SQLiteOpenHelper(cont
} }
} else { } else {
// events repeating x times // events repeating x times
while (it.repeatLimit < 0) { while (it.repeatLimit < 0 && it.endTS < toTS) {
if (it.startTS >= fromTS && it.startTS < toTS) { if (it.repeatInterval != 0 && it.repeatInterval % WEEK == 0) {
newEvents.add(it.copy()) if (it.startTS >= fromTS && it.startTS < toTS) {
if (it.startTS.isTsOnValidDay(it)) {
newEvents.add(it.copy())
it.repeatLimit++
}
}
it.addIntervalTime()
} else {
if (it.startTS >= fromTS && it.startTS < toTS) {
newEvents.add(it.copy())
}
it.addIntervalTime()
it.repeatLimit++
} }
it.addIntervalTime()
it.repeatLimit++
} }
} }
} }
// check if weekly repeatable events are on the current day // check if weekly repeatable events are on the correct day
val filteredEvents = ArrayList<Event>(newEvents.size) val filteredEvents = ArrayList<Event>(newEvents.size)
newEvents.forEach { newEvents.forEach {
if (it.repeatInterval != 0 && it.repeatInterval % WEEK == 0) { if (it.repeatInterval != 0 && it.repeatInterval % WEEK == 0) {