author | zautrix <zautrix> | 2005-06-08 09:15:20 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-06-08 09:15:20 (UTC) |
commit | 39d84e2fc3099bd5d7596e8be5dc6783826cec01 (patch) (side-by-side diff) | |
tree | a811365972a94c65cfd4f78c802ae8e9b09d7d12 | |
parent | 876dca14867d6a47b661c60a9c96ac3a70591d0c (diff) | |
download | kdepimpi-39d84e2fc3099bd5d7596e8be5dc6783826cec01.zip kdepimpi-39d84e2fc3099bd5d7596e8be5dc6783826cec01.tar.gz kdepimpi-39d84e2fc3099bd5d7596e8be5dc6783826cec01.tar.bz2 |
rec todo fix
-rw-r--r-- | libkcal/todo.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libkcal/todo.cpp b/libkcal/todo.cpp index 473247a..38ba2c7 100644 --- a/libkcal/todo.cpp +++ b/libkcal/todo.cpp @@ -524,54 +524,57 @@ QDateTime Todo::getNextAlarmDateTime( bool * ok, int * offset, QDateTime start_d QDateTime incidenceStart; incidenceStart = dtDue(); bool enabled = false; Alarm* alarm; int off = 0; QDateTime alarmStart = QDateTime::currentDateTime().addDays( 3650 );; // if ( QDateTime::currentDateTime() > incidenceStart ){ // *ok = false; // return incidenceStart; // } for (QPtrListIterator<Alarm> it(mAlarms); (alarm = it.current()) != 0; ++it) { if (alarm->enabled()) { if ( alarm->hasTime () ) { if ( alarm->time() < alarmStart ) { alarmStart = alarm->time(); enabled = true; off = alarmStart.secsTo( incidenceStart ); } } else { int secs = alarm->startOffset().asSeconds(); if ( incidenceStart.addSecs( secs ) < alarmStart ) { alarmStart = incidenceStart.addSecs( secs ); enabled = true; off = -secs; } } } } if ( enabled ) { if ( alarmStart > start_dt ) { *ok = true; * offset = off; return alarmStart; } } *ok = false; return QDateTime (); } void Todo::checkSetCompletedFalse() { if ( !hasRecurrenceID() ) { qDebug("ERROR 1 in Todo::checkSetCompletedFalse"); } // qDebug("Todo::checkSetCompletedFalse()"); //qDebug("%s %s %s ",mDtStart.toString().latin1(), dtDue().toString().latin1(),mRecurrenceID.toString().latin1() ); - if ( mPercentComplete == 100 && mDtStart == mRecurrenceID && QDateTime::currentDateTime() > mDtStart) { - qDebug("%s %s %s ",mDtStart.toString().latin1(), dtDue().toString().latin1(),mRecurrenceID.toString().latin1() ); + if ( mPercentComplete == 100 ) { + QDateTime dt = QDateTime::currentDateTime(); + if ( dt > mDtStart && dt > mRecurrenceID ) { + qDebug("start: %s --due: %s --recID: %s ",mDtStart.toString().latin1(), dtDue().toString().latin1(),mRecurrenceID.toString().latin1() ); setCompleted( false ); qDebug("Todo::checkSetCompletedFalse "); } } +} |