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

add monthly events

This commit is contained in:
tibbi 2016-09-12 21:29:13 +02:00
parent f609f9402a
commit d19a452895
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
app/src/main/java/com/simplemobiletools/calendar/DBHelper.java
View File

@ -192,20 +192,36 @@ public class DBHelper extends SQLiteOpenHelper {
} }
private List<Event> getEventsFor(int ts) { private List<Event> getEventsFor(int ts) {
List<Event> newEvents = new ArrayList<>(); final List<Event> newEvents = new ArrayList<>();
final int dayExclusive = Constants.DAY - 1;
final int dayEnd = ts + dayExclusive;
// get daily and weekly events // get daily and weekly events
final int dayExclusive = Constants.DAY - 1; String selection = "(" + COL_REPEAT_INTERVAL + " = " + Constants.DAY + " OR " + COL_REPEAT_INTERVAL + " = " + Constants.WEEK +
final String selection = "(" + COL_REPEAT_INTERVAL + " = " + Constants.DAY + " OR " + COL_REPEAT_INTERVAL + " = " + Constants.WEEK +
") AND (? - " + COL_REPEAT_START + ") % " + COL_REPEAT_INTERVAL + " BETWEEN 0 AND " + dayExclusive; ") AND (? - " + COL_REPEAT_START + ") % " + COL_REPEAT_INTERVAL + " BETWEEN 0 AND " + dayExclusive;
final String[] selectionArgs = {String.valueOf(ts + 84600)}; String[] selectionArgs = {String.valueOf(dayEnd)};
final Cursor cursor = getEventsCursor(selection, selectionArgs); Cursor cursor = getEventsCursor(selection, selectionArgs);
if (cursor != null) { if (cursor != null) {
newEvents.addAll(fillEvents(cursor)); final List<Event> currEvents = fillEvents(cursor);
for (Event e : newEvents) { for (Event e : currEvents) {
updateEventTimes(e, ts); updateEventTimes(e, ts);
} }
newEvents.addAll(currEvents);
} }
// get monthly events
final DateTime dateTime = Formatter.getDateTimeFromTS(ts);
selection = COL_REPEAT_INTERVAL + " = " + Constants.MONTH + " AND " + COL_REPEAT_DAY + " = " + dateTime.getDayOfMonth() +
" AND " + COL_REPEAT_START + " <= " + dayEnd;
cursor = getEventsCursor(selection, null);
if (cursor != null) {
final List<Event> currEvents = fillEvents(cursor);
for (Event e : currEvents) {
updateEventTimes(e, ts);
}
newEvents.addAll(currEvents);
}
return newEvents; return newEvents;
} }