todo rec fixes

2 files changed, 68 insertions, 1 deletions

diff --git a/korganizer/kotodoeditor.cpp b/korganizer/kotodoeditor.cpp
index 069dda8..9232e09 100644
--- a/korganizer/kotodoeditor.cpp
+++ b/korganizer/kotodoeditor.cpp
@@ -318,12 +318,14 @@ void KOTodoEditor::checkRecurrence()
                 to = QDateTime( mGeneral->mDueDateEdit->date(), mGeneral->mDueTimeEdit->getTime() ) ;
                 from = QDateTime( mGeneral->mStartDateEdit->date(),mGeneral->mStartTimeEdit->getTime( )) ;
             } else {
                 to = QDateTime( mGeneral->mDueDateEdit->date(), QTime( 0,0,0) ) ;
                 from = QDateTime( mGeneral->mStartDateEdit->date(),QTime( 0,0,0) ) ;
             }
+            if ( to < from )
+                to = from;
             mRecurrence->setDefaults(from,to,!time);
         }
     } else {
         tabWidget()->setTabEnabled ( mRecurrence->parentWidget(), false );
         mRecurrence->setDefaults(QDateTime::currentDateTime(),QDateTime::currentDateTime().addSecs( 3600 ),true);
     }
@@ -347,12 +349,39 @@ void KOTodoEditor::writeTodo(Todo *event)
   // set related event, i.e. parent to-do in this case.
   if (mRelatedTodo) {
     event->setRelatedTo(mRelatedTodo);
   }  
   if ( mGeneral->mDueCheck->isChecked() && mGeneral->mStartCheck->isChecked()) {
       mRecurrence->writeEvent(event);
+      event->setRecurrenceID( event->dtStart().addSecs(-1) );
+      event->setRecurDates();
+#if 0
+      bool ok;
+      QDateTime next = event->getNextOccurence(  event->dtStart().addSecs(-1), &ok );
+      if ( ok ) { 
+          QDateTime from,to;
+            bool time = mGeneral->mTimeButton->isChecked();
+            if ( time ) {
+                to = QDateTime( mGeneral->mDueDateEdit->date(), mGeneral->mDueTimeEdit->getTime() ) ;
+                from = QDateTime( mGeneral->mStartDateEdit->date(),mGeneral->mStartTimeEdit->getTime( )) ;
+            } else {
+                to = QDateTime( mGeneral->mDueDateEdit->date(), QTime( 0,0,0) ) ;
+                from = QDateTime( mGeneral->mStartDateEdit->date(),QTime( 0,0,0) ) ;
+            }
+            if ( to < from )
+                to = from;
+            int secs = from.secsTo( to );
+            event->setRecurrenceID( next );
+            event->setDtStart( next );
+            event->setDtDue( next.addSecs( secs ) );
+      }
+      else {
+          event->setHasRecurrenceID( false );
+          event->recurrence()->unsetRecurs();
+      }
+#endif
   } else
        event->recurrence()->unsetRecurs();
 }
 
 bool KOTodoEditor::validateInput()
 {
diff --git a/korganizer/kotodoviewitem.cpp b/korganizer/kotodoviewitem.cpp
index 0e847c2..70f00c6 100644
--- a/korganizer/kotodoviewitem.cpp
+++ b/korganizer/kotodoviewitem.cpp
@@ -188,22 +188,30 @@ void KOTodoViewItem::setMyPixmap()
       pPix.fill( Qt::red );
       p.begin( &pixi );
       p. drawPixmap ( 0, pixSize, pPix);
       p.end();
       pixSize += size;
   } 
+  if ( mTodo->doesRecur() ) {
+      pixi.resize(size, pixSize+size);
+      pPix.fill( Qt::blue );
+      p.begin( &pixi );
+      p. drawPixmap ( 0, pixSize, pPix);
+      p.end();
+      pixSize += size;
+  } 
   //   }
   if ( pixi.width() > 1 ) {
       setPixmap ( 0,pixi ) ; 
   } else {
       setPixmap ( 0,QPixmap() ) ; 
   }
 }
 void KOTodoViewItem::stateChange(bool state)
 {
-    // qDebug("KOTodoViewItem::stateChange ");
+    // qDebug("KOTodoViewItem::stateChange %d ", state);
   // do not change setting on startup
   if ( m_init ) return;
   if (isOn()!=state) {
       setOn(state);
       //qDebug("SETON ");
       return;
@@ -212,13 +220,24 @@ void KOTodoViewItem::stateChange(bool state)
       //qDebug("STATECHANGE:nothing to do ");
       return;
   }
   QString keyd = "==";
   QString keyt = "==";
   //qDebug("KOTodoViewItem::stateChange %s ", text(0).latin1());
+  if ( mTodo->doesRecur()  ){
+      QDateTime start = mTodo->dtStart();
   mTodo->setCompleted(state);
+      if ( start != mTodo->dtStart() ) {
+          if ( state  && !mTodo->isCompleted() ) {
+              setOn( false );
+              state = false;
+          }
+      }
+  } else
+      mTodo->setCompleted(state);
+
   if (state) mTodo->setCompleted(QDateTime::currentDateTime());
 
   if (mTodo->hasDueDate()) {
     setText(3, mTodo->dtDueDateStr());
     QDate d = mTodo->dtDue().date();
     keyd.sprintf("%04d%02d%02d",d.year(),d.month(),d.day());
@@ -230,12 +249,31 @@ void KOTodoViewItem::stateChange(bool state)
       setText(4,mTodo->dtDueTimeStr());
       QTime t = mTodo->dtDue().time();
       keyt.sprintf("%02d%02d",t.hour(),t.minute());
       setSortKey(4,keyt);
     }
   }
+ if (mTodo->hasStartDate()) {
+     QString skeyt = "==";
+     QString skeyd = "==";
+     setText(5, mTodo->dtStartDateStr());
+     QDate d = mTodo->dtStart().date();
+     skeyd.sprintf("%04d%02d%02d",d.year(),d.month(),d.day());
+     
+     if (mTodo->doesFloat()) {
+         setText(6,"");
+     }
+     else {
+         setText(6,mTodo->dtStartTimeStr());
+         QTime t = mTodo->dtStart().time();
+         skeyt.sprintf("%02d%02d",t.hour(),t.minute());
+         
+     }
+     setSortKey(5,skeyd);
+     setSortKey(6,skeyt);
+  } 
   if (mTodo->isCompleted()) setSortKey(1,QString::number(9)+keyd+keyt);
   else setSortKey(1,QString::number(mTodo->priority())+keyd+keyt);
   
   setText(2,i18n("%1 %").arg(QString::number(mTodo->percentComplete())));
   if (mTodo->percentComplete()<100) {
     if (mTodo->isCompleted()) setSortKey(2,QString::number(999));