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

copy excluded repetition child at events, with the parent event id stored

Browse Source
This commit is contained in:
tibbi
2017-06-10 20:39:05 +02:00
parent c5070b8bc4
commit fdf9ba3f41
2 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,11 +51,12 @@ class DBHelper private constructor(val context: Context) : SQLiteOpenHelper(cont
private val COL_OCCURRENCE_TIMESTAMP = "event_occurrence_timestamp" private val COL_OCCURRENCE_TIMESTAMP = "event_occurrence_timestamp"
private val COL_OCCURRENCE_DAYCODE = "event_occurrence_daycode" private val COL_OCCURRENCE_DAYCODE = "event_occurrence_daycode"
private val COL_PARENT_EVENT_ID = "event_parent_id" private val COL_PARENT_EVENT_ID = "event_parent_id"
private val COL_CHILD_EVENT_ID = "event_child_id"
private val mDb: SQLiteDatabase = writableDatabase private val mDb: SQLiteDatabase = writableDatabase
companion object { companion object {
private val DB_VERSION = 12 private val DB_VERSION = 13
val DB_NAME = "events.db" val DB_NAME = "events.db"
val REGULAR_EVENT_TYPE_ID = 1 val REGULAR_EVENT_TYPE_ID = 1
var dbInstance: DBHelper? = null var dbInstance: DBHelper? = null
@ -132,6 +133,10 @@ class DBHelper private constructor(val context: Context) : SQLiteOpenHelper(cont
db.execSQL("ALTER TABLE $MAIN_TABLE_NAME ADD COLUMN $COL_OFFSET TEXT DEFAULT ''") db.execSQL("ALTER TABLE $MAIN_TABLE_NAME ADD COLUMN $COL_OFFSET TEXT DEFAULT ''")
db.execSQL("ALTER TABLE $MAIN_TABLE_NAME ADD COLUMN $COL_IS_DST_INCLUDED INTEGER NOT NULL DEFAULT 0") db.execSQL("ALTER TABLE $MAIN_TABLE_NAME ADD COLUMN $COL_IS_DST_INCLUDED INTEGER NOT NULL DEFAULT 0")
} }
if (oldVersion < 13) {
db.execSQL("ALTER TABLE $EXCEPTIONS_TABLE_NAME ADD COLUMN $COL_CHILD_EVENT_ID INTEGER NOT NULL DEFAULT 0")
}
} }
private fun createMetaTable(db: SQLiteDatabase) { private fun createMetaTable(db: SQLiteDatabase) {
@ -146,7 +151,7 @@ class DBHelper private constructor(val context: Context) : SQLiteOpenHelper(cont
private fun createExceptionsTable(db: SQLiteDatabase) { private fun createExceptionsTable(db: SQLiteDatabase) {
db.execSQL("CREATE TABLE $EXCEPTIONS_TABLE_NAME ($COL_EXCEPTION_ID INTEGER PRIMARY KEY, $COL_PARENT_EVENT_ID INTEGER, $COL_OCCURRENCE_TIMESTAMP INTEGER, " + db.execSQL("CREATE TABLE $EXCEPTIONS_TABLE_NAME ($COL_EXCEPTION_ID INTEGER PRIMARY KEY, $COL_PARENT_EVENT_ID INTEGER, $COL_OCCURRENCE_TIMESTAMP INTEGER, " +
"$COL_OCCURRENCE_DAYCODE INTEGER)") "$COL_OCCURRENCE_DAYCODE INTEGER, $COL_CHILD_EVENT_ID INTEGER)")
} }
private fun addRegularEventType(db: SQLiteDatabase) { private fun addRegularEventType(db: SQLiteDatabase) {
@ -205,7 +210,7 @@ class DBHelper private constructor(val context: Context) : SQLiteOpenHelper(cont
put(COL_IMPORT_ID, event.importId) put(COL_IMPORT_ID, event.importId)
put(COL_FLAGS, event.flags) put(COL_FLAGS, event.flags)
put(COL_EVENT_TYPE, event.eventType) put(COL_EVENT_TYPE, event.eventType)
put(COL_PARENT_EVENT_ID, 0) put(COL_PARENT_EVENT_ID, event.parentId)
put(COL_OFFSET, event.offset) put(COL_OFFSET, event.offset)
put(COL_IS_DST_INCLUDED, if (event.isDstIncluded) 1 else 0) put(COL_IS_DST_INCLUDED, if (event.isDstIncluded) 1 else 0)
} }
@ -247,9 +252,17 @@ class DBHelper private constructor(val context: Context) : SQLiteOpenHelper(cont
} }
private fun fillExceptionValues(parentEventId: Int, occurrenceTS: Int): ContentValues { private fun fillExceptionValues(parentEventId: Int, occurrenceTS: Int): ContentValues {
val childEvent = getEventWithId(parentEventId) ?: return ContentValues()
childEvent.id = 0
childEvent.parentId = parentEventId
childEvent.startTS = 0
childEvent.endTS = 0
val childId = insert(childEvent)
return ContentValues().apply { return ContentValues().apply {
put(COL_PARENT_EVENT_ID, parentEventId) put(COL_PARENT_EVENT_ID, parentEventId)
put(COL_OCCURRENCE_DAYCODE, Formatter.getDayCodeFromTS(occurrenceTS)) put(COL_OCCURRENCE_DAYCODE, Formatter.getDayCodeFromTS(occurrenceTS))
put(COL_CHILD_EVENT_ID, childId)
} }
} }
@ -392,7 +405,7 @@ class DBHelper private constructor(val context: Context) : SQLiteOpenHelper(cont
fun getEventsInBackground(fromTS: Int, toTS: Int, eventId: Int = -1, callback: (events: MutableList<Event>) -> Unit) { fun getEventsInBackground(fromTS: Int, toTS: Int, eventId: Int = -1, callback: (events: MutableList<Event>) -> Unit) {
val events = ArrayList<Event>() val events = ArrayList<Event>()
var selection = "$COL_START_TS <= ? AND $COL_END_TS >= ? AND $COL_REPEAT_INTERVAL IS NULL" var selection = "$COL_START_TS <= ? AND $COL_END_TS >= ? AND $COL_REPEAT_INTERVAL IS NULL AND $COL_PARENT_EVENT_ID == 0"
if (eventId != -1) if (eventId != -1)
selection += " AND $MAIN_TABLE_NAME.$COL_ID = $eventId" selection += " AND $MAIN_TABLE_NAME.$COL_ID = $eventId"
val selectionArgs = arrayOf(toTS.toString(), fromTS.toString()) val selectionArgs = arrayOf(toTS.toString(), fromTS.toString())
@ -409,7 +422,7 @@ class DBHelper private constructor(val context: Context) : SQLiteOpenHelper(cont
val newEvents = ArrayList<Event>() val newEvents = ArrayList<Event>()
// get repeatable events // get repeatable events
var selection = "$COL_REPEAT_INTERVAL != 0 AND $COL_START_TS <= $toTS" var selection = "$COL_REPEAT_INTERVAL != 0 AND $COL_START_TS <= $toTS AND $COL_PARENT_EVENT_ID == 0"
if (eventId != -1) if (eventId != -1)
selection += " AND $MAIN_TABLE_NAME.$COL_ID = $eventId" selection += " AND $MAIN_TABLE_NAME.$COL_ID = $eventId"
val events = getEvents(selection) val events = getEvents(selection)
@ -481,7 +494,7 @@ class DBHelper private constructor(val context: Context) : SQLiteOpenHelper(cont
val events = ArrayList<Event>() val events = ArrayList<Event>()
val ts = (System.currentTimeMillis() / 1000).toInt() val ts = (System.currentTimeMillis() / 1000).toInt()
val selection = "$COL_START_TS <= ? AND $COL_END_TS >= ? AND $COL_REPEAT_INTERVAL IS 0" val selection = "$COL_START_TS <= ? AND $COL_END_TS >= ? AND $COL_REPEAT_INTERVAL IS 0 AND $COL_PARENT_EVENT_ID == 0"
val selectionArgs = arrayOf(ts.toString(), ts.toString()) val selectionArgs = arrayOf(ts.toString(), ts.toString())
val cursor = getEventsCursor(selection, selectionArgs) val cursor = getEventsCursor(selection, selectionArgs)
events.addAll(fillEvents(cursor)) events.addAll(fillEvents(cursor))
@ -513,7 +526,7 @@ class DBHelper private constructor(val context: Context) : SQLiteOpenHelper(cont
} }
fun getEventsAtReboot(): List<Event> { fun getEventsAtReboot(): List<Event> {
val selection = "$COL_REMINDER_MINUTES != -1 AND ($COL_START_TS > ? OR $COL_REPEAT_INTERVAL != 0)" val selection = "$COL_REMINDER_MINUTES != -1 AND ($COL_START_TS > ? OR $COL_REPEAT_INTERVAL != 0) AND $COL_PARENT_EVENT_ID == 0"
val selectionArgs = arrayOf(DateTime.now().seconds().toString()) val selectionArgs = arrayOf(DateTime.now().seconds().toString())
val cursor = getEventsCursor(selection, selectionArgs) val cursor = getEventsCursor(selection, selectionArgs)
return fillEvents(cursor) return fillEvents(cursor)

2
app/src/main/kotlin/com/simplemobiletools/calendar/models/Event.kt
View File

@ -11,7 +11,7 @@ data class Event(var id: Int = 0, var startTS: Int = 0, var endTS: Int = 0, var
var reminder1Minutes: Int = -1, var reminder2Minutes: Int = -1, var reminder3Minutes: Int = -1, var repeatInterval: Int = 0, var reminder1Minutes: Int = -1, var reminder2Minutes: Int = -1, var reminder3Minutes: Int = -1, var repeatInterval: Int = 0,
var importId: String? = "", var flags: Int = 0, var repeatLimit: Int = 0, var repeatRule: Int = 0, var importId: String? = "", var flags: Int = 0, var repeatLimit: Int = 0, var repeatRule: Int = 0,
var eventType: Int = DBHelper.REGULAR_EVENT_TYPE_ID, var ignoreEventOccurrences: ArrayList<Int> = ArrayList(), var eventType: Int = DBHelper.REGULAR_EVENT_TYPE_ID, var ignoreEventOccurrences: ArrayList<Int> = ArrayList(),
var offset: String = "", var isDstIncluded: Boolean = false) : Serializable { var offset: String = "", var isDstIncluded: Boolean = false, var parentId: Int = 0) : Serializable {
companion object { companion object {
private val serialVersionUID = -32456795132345616L private val serialVersionUID = -32456795132345616L