-rw-r--r-- | libkcal/todo.cpp | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/libkcal/todo.cpp b/libkcal/todo.cpp index 5260051..4ada2d8 100644 --- a/libkcal/todo.cpp +++ b/libkcal/todo.cpp | |||
@@ -492,98 +492,112 @@ void Todo::setCompleted(const QDateTime &completed) | |||
492 | mPercentComplete = 100; | 492 | mPercentComplete = 100; |
493 | mCompleted = getEvenTime(completed); | 493 | mCompleted = getEvenTime(completed); |
494 | updated(); | 494 | updated(); |
495 | } | 495 | } |
496 | 496 | ||
497 | bool Todo::hasCompletedDate() const | 497 | bool Todo::hasCompletedDate() const |
498 | { | 498 | { |
499 | return mHasCompletedDate; | 499 | return mHasCompletedDate; |
500 | } | 500 | } |
501 | 501 | ||
502 | int Todo::percentComplete() const | 502 | int Todo::percentComplete() const |
503 | { | 503 | { |
504 | return mPercentComplete; | 504 | return mPercentComplete; |
505 | } | 505 | } |
506 | bool Todo::setRecurDates() | 506 | bool Todo::setRecurDates() |
507 | { | 507 | { |
508 | if ( !mHasRecurrenceID ) | 508 | if ( !mHasRecurrenceID ) |
509 | return true; | 509 | return true; |
510 | int secs = mDtStart.secsTo( dtDue() ); | 510 | int secs = mDtStart.secsTo( dtDue() ); |
511 | bool ok; | 511 | bool ok; |
512 | qDebug("T:setRecurDates() "); | 512 | qDebug("T:setRecurDates() "); |
513 | //qDebug("%s %s %s ",mDtStart.toString().latin1(), dtDue().toString().latin1(),mRecurrenceID.toString().latin1() ); | 513 | //qDebug("%s %s %s ",mDtStart.toString().latin1(), dtDue().toString().latin1(),mRecurrenceID.toString().latin1() ); |
514 | QDateTime next = getNextOccurence( mRecurrenceID, &ok ); | 514 | QDateTime next = getNextOccurence( mRecurrenceID, &ok ); |
515 | if ( ok ) { | 515 | if ( ok ) { |
516 | mRecurrenceID = next; | 516 | mRecurrenceID = next; |
517 | mDtStart = next; | 517 | mDtStart = next; |
518 | setDtDue( next.addSecs( secs ) ); | 518 | setDtDue( next.addSecs( secs ) ); |
519 | if ( QDateTime::currentDateTime() > next) | 519 | if ( QDateTime::currentDateTime() > next) |
520 | return false; | 520 | return false; |
521 | } else { | 521 | } else { |
522 | setHasRecurrenceID( false ); | 522 | setHasRecurrenceID( false ); |
523 | recurrence()->unsetRecurs(); | 523 | recurrence()->unsetRecurs(); |
524 | } | 524 | } |
525 | return true; | 525 | return true; |
526 | } | 526 | } |
527 | void Todo::setPercentComplete(int v) | 527 | void Todo::setPercentComplete(int v) |
528 | { | 528 | { |
529 | if ( mHasRecurrenceID && v == 100 && mPercentComplete != 100 ) { | 529 | if ( mHasRecurrenceID && v == 100 && mPercentComplete != 100 ) { |
530 | if ( !setRecurDates() ) | 530 | if ( !setRecurDates() ) |
531 | v = 0; | 531 | v = 0; |
532 | } | 532 | } |
533 | mPercentComplete = v; | 533 | mPercentComplete = v; |
534 | if ( v != 100 ) | 534 | if ( v != 100 ) |
535 | mHasCompletedDate = false; | 535 | mHasCompletedDate = false; |
536 | updated(); | 536 | updated(); |
537 | } | 537 | } |
538 | QDateTime Todo::getNextAlarmDateTime( bool * ok, int * offset, QDateTime start_dt ) const | 538 | QDateTime Todo::getNextAlarmDateTime( bool * ok, int * offset, QDateTime start_dt ) const |
539 | { | 539 | { |
540 | if ( isCompleted() || ! hasDueDate() || cancelled() || !alarmEnabled() ) { | ||
541 | *ok = false; | 540 | *ok = false; |
541 | if ( ! hasDueDate() || cancelled() || !alarmEnabled() ) { | ||
542 | return QDateTime (); | ||
543 | } | ||
544 | // if the recurring todo is set to complete and requested time < start time of todo | ||
545 | // we want to get the alarm. | ||
546 | bool iscompleted = isCompleted(); | ||
547 | if ( iscompleted && doesRecur() ) { | ||
548 | Todo * to = (Todo*) this; | ||
549 | to->checkSetCompletedFalse(); | ||
550 | iscompleted = isCompleted(); | ||
551 | if ( hasStartDate() && start_dt < dtStart() ){ | ||
552 | iscompleted = false; | ||
553 | } | ||
554 | } | ||
555 | if ( iscompleted ) { | ||
542 | return QDateTime (); | 556 | return QDateTime (); |
543 | } | 557 | } |
544 | QDateTime incidenceStart; | 558 | QDateTime incidenceStart; |
545 | incidenceStart = dtDue(); | 559 | incidenceStart = dtDue(); |
546 | bool enabled = false; | 560 | bool enabled = false; |
547 | Alarm* alarm; | 561 | Alarm* alarm; |
548 | int off = 0; | 562 | int off = 0; |
549 | QDateTime alarmStart = QDateTime::currentDateTime().addDays( 3650 );; | 563 | QDateTime alarmStart = QDateTime::currentDateTime().addDays( 3650 );; |
550 | // if ( QDateTime::currentDateTime() > incidenceStart ){ | 564 | // if ( QDateTime::currentDateTime() > incidenceStart ){ |
551 | // *ok = false; | 565 | // *ok = false; |
552 | // return incidenceStart; | 566 | // return incidenceStart; |
553 | // } | 567 | // } |
554 | for (QPtrListIterator<Alarm> it(mAlarms); (alarm = it.current()) != 0; ++it) { | 568 | for (QPtrListIterator<Alarm> it(mAlarms); (alarm = it.current()) != 0; ++it) { |
555 | if (alarm->enabled()) { | 569 | if (alarm->enabled()) { |
556 | if ( alarm->hasTime () ) { | 570 | if ( alarm->hasTime () ) { |
557 | if ( alarm->time() < alarmStart ) { | 571 | if ( alarm->time() < alarmStart ) { |
558 | alarmStart = alarm->time(); | 572 | alarmStart = alarm->time(); |
559 | enabled = true; | 573 | enabled = true; |
560 | off = alarmStart.secsTo( incidenceStart ); | 574 | off = alarmStart.secsTo( incidenceStart ); |
561 | } | 575 | } |
562 | 576 | ||
563 | } else { | 577 | } else { |
564 | int secs = alarm->startOffset().asSeconds(); | 578 | int secs = alarm->startOffset().asSeconds(); |
565 | if ( incidenceStart.addSecs( secs ) < alarmStart ) { | 579 | if ( incidenceStart.addSecs( secs ) < alarmStart ) { |
566 | alarmStart = incidenceStart.addSecs( secs ); | 580 | alarmStart = incidenceStart.addSecs( secs ); |
567 | enabled = true; | 581 | enabled = true; |
568 | off = -secs; | 582 | off = -secs; |
569 | } | 583 | } |
570 | } | 584 | } |
571 | } | 585 | } |
572 | } | 586 | } |
573 | if ( enabled ) { | 587 | if ( enabled ) { |
574 | if ( alarmStart > start_dt ) { | 588 | if ( alarmStart > start_dt ) { |
575 | *ok = true; | 589 | *ok = true; |
576 | * offset = off; | 590 | * offset = off; |
577 | return alarmStart; | 591 | return alarmStart; |
578 | } | 592 | } |
579 | } | 593 | } |
580 | *ok = false; | 594 | *ok = false; |
581 | return QDateTime (); | 595 | return QDateTime (); |
582 | 596 | ||
583 | } | 597 | } |
584 | 598 | ||
585 | void Todo::checkSetCompletedFalse() | 599 | void Todo::checkSetCompletedFalse() |
586 | { | 600 | { |
587 | if ( !mHasRecurrenceID ) { | 601 | if ( !mHasRecurrenceID ) { |
588 | qDebug("ERROR 1 in Todo::checkSetCompletedFalse"); | 602 | qDebug("ERROR 1 in Todo::checkSetCompletedFalse"); |
589 | return; | 603 | return; |