-rw-r--r-- | korganizer/komonthview.cpp | 15 | ||||
-rw-r--r-- | libkcal/recurrence.cpp | 26 |
2 files changed, 10 insertions, 31 deletions
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp index cb69832..004ff50 100644 --- a/korganizer/komonthview.cpp +++ b/korganizer/komonthview.cpp | |||
@@ -1251,70 +1251,61 @@ void KOMonthView::updateView() | |||
1251 | for( i = 0; i < timeSpan + 1; ++i ) { | 1251 | for( i = 0; i < timeSpan + 1; ++i ) { |
1252 | (*cells)[i]->startUpdateCell(); | 1252 | (*cells)[i]->startUpdateCell(); |
1253 | } | 1253 | } |
1254 | 1254 | ||
1255 | QPtrList<Event> events = calendar()->events(); | 1255 | QPtrList<Event> events = calendar()->events(); |
1256 | Event *event; | 1256 | Event *event; |
1257 | QDateTime dt; | 1257 | QDateTime dt; |
1258 | bool ok; | 1258 | bool ok; |
1259 | QDate endDate = mStartDate.addDays( timeSpan ); | 1259 | QDate endDate = mStartDate.addDays( timeSpan ); |
1260 | for( event = events.first(); event; event = events.next() ) { // for event | 1260 | for( event = events.first(); event; event = events.next() ) { // for event |
1261 | if ( event->doesRecur() ) { | 1261 | if ( event->doesRecur() ) { |
1262 | bool last; | 1262 | bool last; |
1263 | qDebug("********************************************** "); | ||
1264 | qDebug("Event summary: %s ", event->summary().latin1()); | ||
1265 | QDateTime incidenceStart = event->recurrence()->getPreviousDateTime( QDateTime( mStartDate ) , &last ); | 1263 | QDateTime incidenceStart = event->recurrence()->getPreviousDateTime( QDateTime( mStartDate ) , &last ); |
1266 | QDateTime incidenceEnd; | 1264 | QDateTime incidenceEnd; |
1267 | int eventlen = event->dtStart().date().daysTo ( event->dtEnd().date() ); | 1265 | int eventlen = event->dtStart().date().daysTo ( event->dtEnd().date() ); |
1268 | qDebug("eventlen %d ", eventlen); | ||
1269 | bool invalid = false; | 1266 | bool invalid = false; |
1270 | while( true ) { | 1267 | while( true ) { |
1271 | if ( incidenceStart.isValid() ) { | 1268 | if ( incidenceStart.isValid() ) { |
1272 | incidenceEnd = incidenceStart.addDays( eventlen ); | 1269 | incidenceEnd = incidenceStart.addDays( eventlen ); |
1273 | int st = incidenceStart.date().daysTo( endDate ); | 1270 | int st = incidenceStart.date().daysTo( endDate ); |
1274 | if ( st >= 0 ) { // start before timeend | 1271 | if ( st >= 0 ) { // start before timeend |
1275 | int end = mStartDate.daysTo( incidenceEnd.date() ); | 1272 | int end = mStartDate.daysTo( incidenceEnd.date() ); |
1276 | if ( end >= 0 ) { // end after timestart --- got one! | 1273 | if ( end >= 0 ) { // end after timestart --- got one! |
1277 | //normalize | 1274 | //normalize |
1278 | st = timeSpan - st; | 1275 | st = timeSpan - st; |
1279 | if ( st < 0 ) st = 0; | 1276 | if ( st < 0 ) st = 0; |
1280 | if ( end > timeSpan ) end = timeSpan; | 1277 | if ( end > timeSpan ) end = timeSpan; |
1281 | int iii; | 1278 | int iii; |
1282 | //qDebug("found %s %d %d ",event->summary().latin1(), st, end ); | 1279 | //qDebug("found %s %d %d ",event->summary().latin1(), st, end ); |
1283 | for ( iii = st;iii<= end;++iii) | 1280 | for ( iii = st;iii<= end;++iii) |
1284 | (*cells)[iii]->insertEvent( event ); | 1281 | (*cells)[iii]->insertEvent( event ); |
1285 | } | 1282 | } |
1286 | } | 1283 | } |
1287 | } else { | 1284 | } else { |
1288 | if ( invalid ) | 1285 | if ( invalid ) |
1289 | break; | 1286 | break; |
1290 | invalid = true; | 1287 | invalid = true; |
1291 | qDebug("invalid %s", event->summary().latin1()); | 1288 | //qDebug("invalid %s", event->summary().latin1()); |
1292 | incidenceStart = QDateTime( mStartDate ).addSecs( -2 );; | 1289 | incidenceStart = QDateTime( mStartDate ).addSecs( -2 );; |
1293 | } | 1290 | } |
1294 | if ( last ) | 1291 | if ( last ) |
1295 | break; | 1292 | break; |
1296 | bool ok; | 1293 | bool ok; |
1297 | qDebug("TRY next occurence %s ", incidenceStart.toString().latin1()); | ||
1298 | incidenceStart = event->getNextOccurence( incidenceStart.addSecs( 1 ) ,&ok ); | 1294 | incidenceStart = event->getNextOccurence( incidenceStart.addSecs( 1 ) ,&ok ); |
1299 | if ( ! ok ) { | 1295 | if ( ! ok ) |
1300 | qDebug("NOT OK "); | ||
1301 | break; | 1296 | break; |
1302 | } | 1297 | if ( incidenceStart.date() > endDate ) |
1303 | if ( incidenceStart.date() > endDate ) { | ||
1304 | qDebug("incidenceStart.date() > endDate "); | ||
1305 | break; | 1298 | break; |
1306 | } | 1299 | } |
1307 | qDebug("next occurence %s ", incidenceStart.toString().latin1()); | ||
1308 | } | ||
1309 | } else { // no recur | 1300 | } else { // no recur |
1310 | int st = event->dtStart().date().daysTo( endDate ); | 1301 | int st = event->dtStart().date().daysTo( endDate ); |
1311 | if ( st >= 0 ) { // start before timeend | 1302 | if ( st >= 0 ) { // start before timeend |
1312 | int end = mStartDate.daysTo( event->dtEnd().date() ); | 1303 | int end = mStartDate.daysTo( event->dtEnd().date() ); |
1313 | if ( end >= 0 ) { // end after timestart --- got one! | 1304 | if ( end >= 0 ) { // end after timestart --- got one! |
1314 | //normalize | 1305 | //normalize |
1315 | st = timeSpan - st; | 1306 | st = timeSpan - st; |
1316 | if ( st < 0 ) st = 0; | 1307 | if ( st < 0 ) st = 0; |
1317 | if ( end > timeSpan ) end = timeSpan; | 1308 | if ( end > timeSpan ) end = timeSpan; |
1318 | int iii; | 1309 | int iii; |
1319 | for ( iii = st;iii<= end;++iii) | 1310 | for ( iii = st;iii<= end;++iii) |
1320 | (*cells)[iii]->insertEvent( event ); | 1311 | (*cells)[iii]->insertEvent( event ); |
diff --git a/libkcal/recurrence.cpp b/libkcal/recurrence.cpp index 8a175c9..6ee5499 100644 --- a/libkcal/recurrence.cpp +++ b/libkcal/recurrence.cpp | |||
@@ -967,25 +967,25 @@ QDate Recurrence::getPreviousDate(const QDate &afterDate, bool *last) const | |||
967 | 967 | ||
968 | /***************************** PROTECTED FUNCTIONS ***************************/ | 968 | /***************************** PROTECTED FUNCTIONS ***************************/ |
969 | 969 | ||
970 | bool Recurrence::recursSecondly(const QDate &qd, int secondFreq) const | 970 | bool Recurrence::recursSecondly(const QDate &qd, int secondFreq) const |
971 | { | 971 | { |
972 | if ((qd >= mRecurStart.date()) && | 972 | if ((qd >= mRecurStart.date()) && |
973 | ((rDuration > 0) && (qd <= endDate()) || | 973 | ((rDuration > 0) && (qd <= endDate()) || |
974 | ((rDuration == 0) && (qd <= rEndDateTime.date())) || | 974 | ((rDuration == 0) && (qd <= rEndDateTime.date())) || |
975 | (rDuration == -1))) { | 975 | (rDuration == -1))) { |
976 | // The date queried falls within the range of the event. | 976 | // The date queried falls within the range of the event. |
977 | if (secondFreq < 24*3600) | 977 | if (secondFreq < 24*3600) |
978 | return true; // the event recurs at least once each day | 978 | return true; // the event recurs at least once each day |
979 | int after = mRecurStart.secsTo(QDateTime(qd)); | 979 | int after = mRecurStart.secsTo(QDateTime(qd)) - 1; |
980 | if (after / secondFreq != (after + 24*3600) / secondFreq) | 980 | if (after / secondFreq != (after + 24*3600) / secondFreq) |
981 | return true; | 981 | return true; |
982 | } | 982 | } |
983 | return false; | 983 | return false; |
984 | } | 984 | } |
985 | 985 | ||
986 | bool Recurrence::recursMinutelyAt(const QDateTime &dt, int minuteFreq) const | 986 | bool Recurrence::recursMinutelyAt(const QDateTime &dt, int minuteFreq) const |
987 | { | 987 | { |
988 | if ((dt >= mRecurStart) && | 988 | if ((dt >= mRecurStart) && |
989 | ((rDuration > 0) && (dt <= endDateTime()) || | 989 | ((rDuration > 0) && (dt <= endDateTime()) || |
990 | ((rDuration == 0) && (dt <= rEndDateTime)) || | 990 | ((rDuration == 0) && (dt <= rEndDateTime)) || |
991 | (rDuration == -1))) { | 991 | (rDuration == -1))) { |
@@ -1179,52 +1179,51 @@ QDate Recurrence::getNextDateNoTime(const QDate &preDate, bool *last) const | |||
1179 | QDate dStart = mRecurStart.date(); | 1179 | QDate dStart = mRecurStart.date(); |
1180 | if (preDate < dStart) | 1180 | if (preDate < dStart) |
1181 | return dStart; | 1181 | return dStart; |
1182 | QDate earliestDate = preDate.addDays(1); | 1182 | QDate earliestDate = preDate.addDays(1); |
1183 | QDate nextDate; | 1183 | QDate nextDate; |
1184 | 1184 | ||
1185 | switch (recurs) { | 1185 | switch (recurs) { |
1186 | case rDaily: | 1186 | case rDaily: |
1187 | nextDate = dStart.addDays((dStart.daysTo(preDate)/rFreq + 1) * rFreq); | 1187 | nextDate = dStart.addDays((dStart.daysTo(preDate)/rFreq + 1) * rFreq); |
1188 | break; | 1188 | break; |
1189 | 1189 | ||
1190 | case rWeekly: { | 1190 | case rWeekly: { |
1191 | QDate start = dStart.addDays(1 - dStart.dayOfWeek()); // start of week for dStart | 1191 | QDate start = dStart.addDays(-((dStart.dayOfWeek() - rWeekStart + 7)%7)); // start of week for dStart |
1192 | int earliestDayOfWeek = earliestDate.dayOfWeek(); | 1192 | int earliestDayOfWeek = earliestDate.dayOfWeek(); |
1193 | int weeksAhead = start.daysTo(earliestDate) / 7; | 1193 | int weeksAhead = start.daysTo(earliestDate) / 7; |
1194 | int notThisWeek = weeksAhead % rFreq; // zero if this week is a recurring week | 1194 | int notThisWeek = weeksAhead % rFreq; // zero if this week is a recurring week |
1195 | weeksAhead -= notThisWeek; // latest week which recurred | 1195 | weeksAhead -= notThisWeek; // latest week which recurred |
1196 | int weekday = 0; | 1196 | int weekday = 0; |
1197 | // First check for any remaining day this week, if this week is a recurring week | 1197 | // First check for any remaining day this week, if this week is a recurring week |
1198 | if (!notThisWeek) | 1198 | if (!notThisWeek) |
1199 | weekday = getFirstDayInWeek(earliestDayOfWeek); | 1199 | weekday = getFirstDayInWeek(earliestDayOfWeek); |
1200 | // Check for a day in the next scheduled week | 1200 | // Check for a day in the next scheduled week |
1201 | if (!weekday && earliestDayOfWeek > 1) | 1201 | if (!weekday ) |
1202 | weekday = getFirstDayInWeek(rWeekStart) + rFreq*7; | 1202 | weekday = getFirstDayInWeek(rWeekStart) + rFreq*7; |
1203 | if (weekday) | ||
1204 | nextDate = start.addDays(weeksAhead*7 + weekday - 1); | 1203 | nextDate = start.addDays(weeksAhead*7 + weekday - 1); |
1205 | break; | 1204 | break; |
1206 | } | 1205 | } |
1207 | case rMonthlyDay: | 1206 | case rMonthlyDay: |
1208 | case rMonthlyPos: { | 1207 | case rMonthlyPos: { |
1209 | int startYear = dStart.year(); | 1208 | int startYear = dStart.year(); |
1210 | int startMonth = dStart.month(); // 1..12 | 1209 | int startMonth = dStart.month(); // 1..12 |
1211 | int earliestYear = earliestDate.year(); | 1210 | int earliestYear = earliestDate.year(); |
1212 | int monthsAhead = (earliestYear - startYear)*12 + earliestDate.month() - startMonth; | 1211 | int monthsAhead = (earliestYear - startYear)*12 + earliestDate.month() - startMonth; |
1213 | int notThisMonth = monthsAhead % rFreq; // zero if this month is a recurring month | 1212 | int notThisMonth = monthsAhead % rFreq; // zero if this month is a recurring month |
1214 | monthsAhead -= notThisMonth; // latest month which recurred | 1213 | monthsAhead -= notThisMonth; // latest month which recurred |
1215 | // Check for the first later day in the current month | 1214 | // Check for the first later day in the current month |
1216 | if (!notThisMonth) | 1215 | if (!notThisMonth) |
1217 | nextDate = getFirstDateInMonth(earliestDate); | 1216 | nextDate = getFirstDateInMonth(earliestDate); |
1218 | if (!nextDate.isValid() && earliestDate.day() > 1) { | 1217 | if (!nextDate.isValid() ) { |
1219 | // Check for a day in the next scheduled month | 1218 | // Check for a day in the next scheduled month |
1220 | int months = startMonth - 1 + monthsAhead + rFreq; | 1219 | int months = startMonth - 1 + monthsAhead + rFreq; |
1221 | nextDate = getFirstDateInMonth(QDate(startYear + months/12, months%12 + 1, 1)); | 1220 | nextDate = getFirstDateInMonth(QDate(startYear + months/12, months%12 + 1, 1)); |
1222 | } | 1221 | } |
1223 | break; | 1222 | break; |
1224 | } | 1223 | } |
1225 | case rYearlyMonth: | 1224 | case rYearlyMonth: |
1226 | case rYearlyPos: | 1225 | case rYearlyPos: |
1227 | case rYearlyDay: { | 1226 | case rYearlyDay: { |
1228 | int startYear = dStart.year(); | 1227 | int startYear = dStart.year(); |
1229 | int yearsAhead = earliestDate.year() - startYear; | 1228 | int yearsAhead = earliestDate.year() - startYear; |
1230 | int notThisYear = yearsAhead % rFreq; // zero if this year is a recurring year | 1229 | int notThisYear = yearsAhead % rFreq; // zero if this year is a recurring year |
@@ -1263,42 +1262,40 @@ QDate Recurrence::getPreviousDateNoTime(const QDate &afterDate, bool *last) cons | |||
1263 | QDate dStart = mRecurStart.date(); | 1262 | QDate dStart = mRecurStart.date(); |
1264 | QDate latestDate = afterDate.addDays(-1); | 1263 | QDate latestDate = afterDate.addDays(-1); |
1265 | if (latestDate < dStart) | 1264 | if (latestDate < dStart) |
1266 | return QDate(); | 1265 | return QDate(); |
1267 | QDate prevDate; | 1266 | QDate prevDate; |
1268 | 1267 | ||
1269 | switch (recurs) { | 1268 | switch (recurs) { |
1270 | case rDaily: | 1269 | case rDaily: |
1271 | prevDate = dStart.addDays((dStart.daysTo(latestDate) / rFreq) * rFreq); | 1270 | prevDate = dStart.addDays((dStart.daysTo(latestDate) / rFreq) * rFreq); |
1272 | break; | 1271 | break; |
1273 | 1272 | ||
1274 | case rWeekly: { | 1273 | case rWeekly: { |
1275 | QDate start = dStart.addDays(1 - dStart.dayOfWeek()); // start of week for dStart | 1274 | QDate start = dStart.addDays(-((dStart.dayOfWeek() - rWeekStart + 7)%7)); // start of week for dStart |
1276 | int latestDayOfWeek = latestDate.dayOfWeek(); | 1275 | int latestDayOfWeek = latestDate.dayOfWeek(); |
1277 | int weeksAhead = start.daysTo(latestDate) / 7; | 1276 | int weeksAhead = start.daysTo(latestDate) / 7; |
1278 | int notThisWeek = weeksAhead % rFreq; // zero if this week is a recurring week | 1277 | int notThisWeek = weeksAhead % rFreq; // zero if this week is a recurring week |
1279 | weeksAhead -= notThisWeek; // latest week which recurred | 1278 | weeksAhead -= notThisWeek; // latest week which recurred |
1280 | int weekday = 0; | 1279 | int weekday = 0; |
1281 | // First check for any previous day this week, if this week is a recurring week | 1280 | // First check for any previous day this week, if this week is a recurring week |
1282 | if (!notThisWeek) | 1281 | if (!notThisWeek) |
1283 | weekday = getLastDayInWeek(latestDayOfWeek); | 1282 | weekday = getLastDayInWeek(latestDayOfWeek); |
1284 | // Check for a day in the previous scheduled week | 1283 | // Check for a day in the previous scheduled week |
1285 | if (!weekday) { | 1284 | if (!weekday) { |
1286 | int weekEnd = (rWeekStart + 5)%7 + 1; | ||
1287 | if (latestDayOfWeek < weekEnd) { | ||
1288 | if (!notThisWeek) | 1285 | if (!notThisWeek) |
1289 | weeksAhead -= rFreq; | 1286 | weeksAhead -= rFreq; |
1287 | int weekEnd = (rWeekStart + 5)%7 + 1; | ||
1290 | weekday = getLastDayInWeek(weekEnd); | 1288 | weekday = getLastDayInWeek(weekEnd); |
1291 | } | 1289 | } |
1292 | } | ||
1293 | if (weekday) | 1290 | if (weekday) |
1294 | prevDate = start.addDays(weeksAhead*7 + weekday - 1); | 1291 | prevDate = start.addDays(weeksAhead*7 + weekday - 1); |
1295 | break; | 1292 | break; |
1296 | } | 1293 | } |
1297 | case rMonthlyDay: | 1294 | case rMonthlyDay: |
1298 | case rMonthlyPos: { | 1295 | case rMonthlyPos: { |
1299 | int startYear = dStart.year(); | 1296 | int startYear = dStart.year(); |
1300 | int startMonth = dStart.month(); // 1..12 | 1297 | int startMonth = dStart.month(); // 1..12 |
1301 | int latestYear = latestDate.year(); | 1298 | int latestYear = latestDate.year(); |
1302 | int monthsAhead = (latestYear - startYear)*12 + latestDate.month() - startMonth; | 1299 | int monthsAhead = (latestYear - startYear)*12 + latestDate.month() - startMonth; |
1303 | int notThisMonth = monthsAhead % rFreq; // zero if this month is a recurring month | 1300 | int notThisMonth = monthsAhead % rFreq; // zero if this month is a recurring month |
1304 | monthsAhead -= notThisMonth; // latest month which recurred | 1301 | monthsAhead -= notThisMonth; // latest month which recurred |
@@ -3391,23 +3388,14 @@ QDate Recurrence::getLastDateInYear(const QDate &latestDate) const | |||
3391 | int day = *it.current(); | 3388 | int day = *it.current(); |
3392 | if (day <= latestDay) | 3389 | if (day <= latestDay) |
3393 | return latestDate.addDays(day - latestDay); | 3390 | return latestDate.addDays(day - latestDay); |
3394 | } | 3391 | } |
3395 | break; | 3392 | break; |
3396 | } | 3393 | } |
3397 | } | 3394 | } |
3398 | return QDate(); | 3395 | return QDate(); |
3399 | } | 3396 | } |
3400 | 3397 | ||
3401 | void Recurrence::dump() const | 3398 | void Recurrence::dump() const |
3402 | { | 3399 | { |
3403 | kdDebug() << "Recurrence::dump():" << endl; | 3400 | ; |
3404 | |||
3405 | kdDebug() << " type: " << recurs << endl; | ||
3406 | |||
3407 | kdDebug() << " rDays: " << endl; | ||
3408 | int i; | ||
3409 | for( i = 0; i < 7; ++i ) { | ||
3410 | kdDebug() << " " << i << ": " | ||
3411 | << ( rDays.testBit( i ) ? "true" : "false" ) << endl; | ||
3412 | } | ||
3413 | } | 3401 | } |