author | zautrix <zautrix> | 2005-03-18 15:12:58 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-03-18 15:12:58 (UTC) |
commit | f9f521c487143641b2cf077d04fe1c475001bce2 (patch) (unidiff) | |
tree | 4ffac6d14ceb3e5d77f7634f2b2a49fd91a9e77a /korganizer | |
parent | 66bc0202d4e2306f7029362fe09d0c7ab0e7cc36 (diff) | |
download | kdepimpi-f9f521c487143641b2cf077d04fe1c475001bce2.zip kdepimpi-f9f521c487143641b2cf077d04fe1c475001bce2.tar.gz kdepimpi-f9f521c487143641b2cf077d04fe1c475001bce2.tar.bz2 |
rec fix
-rw-r--r-- | korganizer/komonthview.cpp | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp index cb69832..004ff50 100644 --- a/korganizer/komonthview.cpp +++ b/korganizer/komonthview.cpp | |||
@@ -1257,18 +1257,15 @@ void KOMonthView::updateView() | |||
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 |
@@ -1285,29 +1282,23 @@ void KOMonthView::updateView() | |||
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 | } | ||
1307 | qDebug("next occurence %s ", incidenceStart.toString().latin1()); | ||
1308 | } | 1299 | } |
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! |