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

improve the repeatition of events repeating by x weeks

This commit is contained in:
tibbi 2017-05-05 20:41:33 +02:00
parent 145680899b
commit 69d0c45a4f
2 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/kotlin/com/simplemobiletools/calendar/extensions/Int.kt
View File

@ -3,7 +3,7 @@ package com.simplemobiletools.calendar.extensions
import com.simplemobiletools.calendar.helpers.Formatter
import com.simplemobiletools.calendar.models.Event
fun Int.isTsOnValidDay(event: Event): Boolean {
fun Int.isTsOnProperDay(event: Event): Boolean {
val dateTime = Formatter.getDateTimeFromTS(this)
val power = Math.pow(2.0, (dateTime.dayOfWeek - 1).toDouble()).toInt()
return event.repeatRule and power != 0

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

@ -391,7 +391,7 @@ class DBHelper private constructor(val context: Context) : SQLiteOpenHelper(cont
while (it.startTS < toTS && (it.repeatLimit == 0 || it.repeatLimit >= it.startTS)) {
if (it.startTS >= fromTS) {
if (it.repeatInterval % WEEK == 0) {
if (it.startTS.isTsOnValidDay(it)) {
if (it.startTS.isTsOnProperDay(it)) {
newEvents.add(it.copy())
}
} else {
@ -406,11 +406,17 @@ class DBHelper private constructor(val context: Context) : SQLiteOpenHelper(cont
// events repeating x times
while (it.repeatLimit < 0 && it.endTS < toTS) {
if (it.repeatInterval != 0 && it.repeatInterval % WEEK == 0) {
if (it.startTS.isTsOnValidDay(it)) {
if (it.startTS >= fromTS && it.startTS < toTS) {
newEvents.add(it.copy())
if (it.startTS.isTsOnProperDay(it)) {
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) {
if (it.startTS >= fromTS && it.startTS < toTS) {
newEvents.add(it.copy())
}
it.repeatLimit++
}
it.repeatLimit++
}
it.addIntervalTime()
} else {
@ -424,21 +430,7 @@ class DBHelper private constructor(val context: Context) : SQLiteOpenHelper(cont
}
}
// check if weekly repeatable events are on the correct day
val filteredEvents = ArrayList<Event>(newEvents.size)
newEvents.forEach {
if (it.repeatInterval != 0 && it.repeatInterval % WEEK == 0) {
val initialWeekOfYear = Formatter.getDateTimeFromTS(startTimes[it.id]).weekOfWeekyear
val currentWeekOfYear = Formatter.getDateTimeFromTS(it.startTS).weekOfWeekyear
if ((currentWeekOfYear - initialWeekOfYear) % (it.repeatInterval / WEEK) == 0) {
filteredEvents.add(it)
}
} else {
filteredEvents.add(it)
}
}
return filteredEvents
return newEvents
}
fun getRunningEvents(): List<Event> {