author | zautrix <zautrix> | 2005-03-18 15:11:51 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-03-18 15:11:51 (UTC) |
commit | 66bc0202d4e2306f7029362fe09d0c7ab0e7cc36 (patch) (unidiff) | |
tree | eafee97f377c32339488833065313c2494e1f5a5 /korganizer | |
parent | 414cb038cbe353f2fdb90969bc2531b687acc85f (diff) | |
download | kdepimpi-66bc0202d4e2306f7029362fe09d0c7ab0e7cc36.zip kdepimpi-66bc0202d4e2306f7029362fe09d0c7ab0e7cc36.tar.gz kdepimpi-66bc0202d4e2306f7029362fe09d0c7ab0e7cc36.tar.bz2 |
rec fix
-rw-r--r-- | korganizer/komonthview.cpp | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp index 004ff50..cb69832 100644 --- a/korganizer/komonthview.cpp +++ b/korganizer/komonthview.cpp | |||
@@ -1260,9 +1260,12 @@ void KOMonthView::updateView() | |||
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()); | ||
1263 | QDateTime incidenceStart = event->recurrence()->getPreviousDateTime( QDateTime( mStartDate ) , &last ); | 1265 | QDateTime incidenceStart = event->recurrence()->getPreviousDateTime( QDateTime( mStartDate ) , &last ); |
1264 | QDateTime incidenceEnd; | 1266 | QDateTime incidenceEnd; |
1265 | int eventlen = event->dtStart().date().daysTo ( event->dtEnd().date() ); | 1267 | int eventlen = event->dtStart().date().daysTo ( event->dtEnd().date() ); |
1268 | qDebug("eventlen %d ", eventlen); | ||
1266 | bool invalid = false; | 1269 | bool invalid = false; |
1267 | while( true ) { | 1270 | while( true ) { |
1268 | if ( incidenceStart.isValid() ) { | 1271 | if ( incidenceStart.isValid() ) { |
@@ -1285,18 +1288,24 @@ void KOMonthView::updateView() | |||
1285 | if ( invalid ) | 1288 | if ( invalid ) |
1286 | break; | 1289 | break; |
1287 | invalid = true; | 1290 | invalid = true; |
1288 | //qDebug("invalid %s", event->summary().latin1()); | 1291 | qDebug("invalid %s", event->summary().latin1()); |
1289 | incidenceStart = QDateTime( mStartDate ).addSecs( -2 );; | 1292 | incidenceStart = QDateTime( mStartDate ).addSecs( -2 );; |
1290 | } | 1293 | } |
1291 | if ( last ) | 1294 | if ( last ) |
1292 | break; | 1295 | break; |
1293 | bool ok; | 1296 | bool ok; |
1297 | qDebug("TRY next occurence %s ", incidenceStart.toString().latin1()); | ||
1294 | incidenceStart = event->getNextOccurence( incidenceStart.addSecs( 1 ) ,&ok ); | 1298 | incidenceStart = event->getNextOccurence( incidenceStart.addSecs( 1 ) ,&ok ); |
1295 | if ( ! ok ) | 1299 | if ( ! ok ) { |
1300 | qDebug("NOT OK "); | ||
1296 | break; | 1301 | break; |
1297 | if ( incidenceStart.date() > endDate ) | 1302 | } |
1303 | if ( incidenceStart.date() > endDate ) { | ||
1304 | qDebug("incidenceStart.date() > endDate "); | ||
1298 | break; | 1305 | break; |
1299 | } | 1306 | } |
1307 | qDebug("next occurence %s ", incidenceStart.toString().latin1()); | ||
1308 | } | ||
1300 | } else { // no recur | 1309 | } else { // no recur |
1301 | int st = event->dtStart().date().daysTo( endDate ); | 1310 | int st = event->dtStart().date().daysTo( endDate ); |
1302 | if ( st >= 0 ) { // start before timeend | 1311 | if ( st >= 0 ) { // start before timeend |