-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 | |||
@@ -1261,10 +1261,7 @@ void KOMonthView::updateView() | |||
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 ) { |
@@ -1289,5 +1286,5 @@ void KOMonthView::updateView() | |||
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 | } |
@@ -1295,16 +1292,10 @@ void KOMonthView::updateView() | |||
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 ); |
diff --git a/libkcal/recurrence.cpp b/libkcal/recurrence.cpp index 8a175c9..6ee5499 100644 --- a/libkcal/recurrence.cpp +++ b/libkcal/recurrence.cpp | |||
@@ -977,5 +977,5 @@ bool Recurrence::recursSecondly(const QDate &qd, int secondFreq) const | |||
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; |
@@ -1189,5 +1189,5 @@ QDate Recurrence::getNextDateNoTime(const QDate &preDate, bool *last) const | |||
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; |
@@ -1199,7 +1199,6 @@ QDate Recurrence::getNextDateNoTime(const QDate &preDate, bool *last) const | |||
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; |
@@ -1216,5 +1215,5 @@ QDate Recurrence::getNextDateNoTime(const QDate &preDate, bool *last) const | |||
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; |
@@ -1273,5 +1272,5 @@ QDate Recurrence::getPreviousDateNoTime(const QDate &afterDate, bool *last) cons | |||
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; |
@@ -1284,11 +1283,9 @@ QDate Recurrence::getPreviousDateNoTime(const QDate &afterDate, bool *last) cons | |||
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); |
@@ -3401,13 +3398,4 @@ QDate Recurrence::getLastDateInYear(const QDate &latestDate) const | |||
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 | } |