todo rec fixes

1 files changed, 45 insertions, 2 deletions

diff --git a/libkcal/todo.cpp b/libkcal/todo.cpp
index 9c04a7e..1f54c2f 100644
--- a/libkcal/todo.cpp
+++ b/libkcal/todo.cpp
@@ -282,133 +282,176 @@ QString Todo::statusStr() const
   switch(mStatus) {
   case NEEDS_ACTION:
     return QString("NEEDS ACTION");
     break;
   case ACCEPTED:
     return QString("ACCEPTED");
     break;
   case SENT:
     return QString("SENT");
     break;
   case TENTATIVE:
     return QString("TENTATIVE");
     break;
   case CONFIRMED:
     return QString("CONFIRMED");
     break;
   case DECLINED:
     return QString("DECLINED");
     break;
   case COMPLETED:
     return QString("COMPLETED");
     break;
   case DELEGATED:
     return QString("DELEGATED");
     break;
   }
   return QString("");
 }
 #endif
 
 bool Todo::isCompleted() const
 {
-  if (mPercentComplete == 100) return true;
+    if (mPercentComplete == 100) {
+        return true;
+    }
   else return false;
 }
 
 void Todo::setCompleted(bool completed)
 {
+    if ( mHasRecurrenceID && completed && mPercentComplete != 100 ) {
+        if ( !setRecurDates() )
+            completed = false;
+    }
   if (completed) mPercentComplete = 100;
   else {
       mPercentComplete = 0;
       mHasCompletedDate = false;
   }
   updated();
 }
 
 QDateTime Todo::completed() const
 {
   return mCompleted;
 }
 
 QString Todo::completedStr( bool shortF ) const
 {
     return KGlobal::locale()->formatDateTime(mCompleted, shortF);
 }
 
 void Todo::setCompleted(const QDateTime &completed)
 {
     //qDebug("Todo::setCompleted ");
     if ( mHasCompletedDate ) {
         // qDebug("has completed data - return ");
         return;
     }
   mHasCompletedDate = true;
   mPercentComplete = 100;
   mCompleted = getEvenTime(completed);
   updated();
 }
 
 bool Todo::hasCompletedDate() const
 {
   return mHasCompletedDate;
 }
 
 int Todo::percentComplete() const
 {
   return mPercentComplete;
 }
-
+bool Todo::setRecurDates()
+{
+    if ( !mHasRecurrenceID )
+        return true;
+    int secs = mDtStart.secsTo( dtDue() );   
+    bool ok;
+    qDebug("--------------------setRecurDates() ");
+    //qDebug("%s %s %s ",mDtStart.toString().latin1(), dtDue().toString().latin1(),mRecurrenceID.toString().latin1() );
+    QDateTime next = getNextOccurence(  mRecurrenceID, &ok );
+    if ( ok ) { 
+        mRecurrenceID = next;
+        mDtStart = next;
+        setDtDue( next.addSecs( secs ) );
+        if ( QDateTime::currentDateTime() > next) 
+            return false;
+    } else {
+        setHasRecurrenceID( false );
+        recurrence()->unsetRecurs();
+    }
+    return true;
+}
 void Todo::setPercentComplete(int v)
 {
+    if ( mHasRecurrenceID && v == 100 && mPercentComplete != 100 ) {
+        if ( !setRecurDates() )
+            v = 0;
+    }
   mPercentComplete = v;
   if ( v != 100 )
       mHasCompletedDate = false;
   updated();
 }
 QDateTime Todo::getNextAlarmDateTime( bool * ok, int * offset ) const
 {
     if ( isCompleted() || ! hasDueDate() || cancelled() ) {
          *ok = false;
          return QDateTime ();
      }
      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 >  QDateTime::currentDateTime()  ) {
              *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() );
+        setCompleted( false );
+        qDebug("Todo::checkSetCompletedFalse++++++++++++++++++++++++++++ ");
+    }
+}