5 files changed, 54 insertions, 28 deletions

diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp
index 002234d..7c41cab 100644
--- a/korganizer/koagenda.cpp
+++ b/korganizer/koagenda.cpp
@@ -1419,5 +1419,5 @@ KOAgendaItem * KOAgenda::getItemForTodo ( Todo * todo )
 void KOAgenda::updateTodo( Todo * todo, int days, bool remove) 
 { 
-   
+      // ( todo->hasCompletedDate() && todo->completed().date() == currentDate )||
     KOAgendaItem *item;
     item = getItemForTodo ( todo );
@@ -1458,4 +1458,9 @@ void KOAgenda::updateTodo( Todo * todo, int days, bool remove)
     bool overdue = (!todo->isCompleted()) && (todo->dtDue() < QDate::currentDate())&&  ( KOPrefs::instance()->mShowTodoInAgenda );
     QDate currentDate;
+    QDateTime dt;
+    if ( todo->hasCompletedDate() )
+        dt =  todo->completed();
+    else
+        dt = todo->dtDue();
     if ( overdue ) {
         currentDate = QDate::currentDate();
@@ -1463,5 +1468,5 @@ void KOAgenda::updateTodo( Todo * todo, int days, bool remove)
     }
     else
-        currentDate = todo->dtDue().date();
+        currentDate = dt.date();
     
     if ( todo->doesFloat() || overdue ) {  
@@ -1477,5 +1482,5 @@ void KOAgenda::updateTodo( Todo * todo, int days, bool remove)
         // mAgenda
         globalFlagBlockAgendaItemPaint = 1;
-        int endY = timeToY(todo->dtDue().time()) - 1; 
+        int endY = timeToY(dt.time()) - 1; 
         int hi = 12/KOPrefs::instance()->mHourSize;
         int startY = endY - 1-hi;
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index 1864e22..bbc43e4 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -951,4 +951,5 @@ void KOAgendaView::updateEventDates(KOAgendaItem *item, int type)
         } else {
             // todo
+            qDebug("tooooodoooooo ");
             if (item->lastMultiItem()) {
                 endDt.setTime(mAgenda->gyToTime(item->lastMultiItem()->cellYBottom()+1));
@@ -966,5 +967,5 @@ void KOAgendaView::updateEventDates(KOAgendaItem *item, int type)
     }
 
-
+    qDebug("to888");
     if ( item->incidence()->type() == "Event" ) {
         item->incidence()->setDtStart(startDt);
@@ -1056,5 +1057,5 @@ void KOAgendaView::fillAgenda()
 
     // ToDo items shall be displayed for the day they are due, but only showed today if they are already overdue.
-    // Therefore, get all of them.
+    // Therefore, gtodoset all of them.
     QPtrList<Todo> todos  = calendar()->todos();
 
@@ -1156,7 +1157,11 @@ void KOAgendaView::fillAgenda()
             //if not KOPrefs::instance()->mShowTodoInAgenda, show overdue in agenda
             bool overdue = (!todo->isCompleted()) && (todo->dtDue() < today) && KOPrefs::instance()->mShowTodoInAgenda;
-
-            if ( ((todo->dtDue().date() == currentDate) && !overdue) || ( todo->hasCompletedDate() && todo->completed().date() == currentDate )||
-                 ((currentDate == today) && overdue) ) {
+            bool fillIn = false;
+            if ( todo->hasCompletedDate() && todo->completed().date() == currentDate )
+                fillIn = true;
+            if ( ! fillIn && !todo->hasCompletedDate() ) 
+                fillIn = ((todo->dtDue().date() == currentDate) && !overdue) || ((currentDate == today) && overdue);
+            qDebug("refill todo ");
+            if ( fillIn ) {
                 if ( (todo->doesFloat() || overdue ) && !todo->hasCompletedDate() ) {  // Todo has no due-time set or is already overdue
                     if ( KOPrefs::instance()->mShowTodoInAgenda )
@@ -1504,8 +1509,13 @@ void  KOAgendaView::setStartHour( int h )
 void  KOAgendaView::updateTodo( Todo * t, int )
 { 
-
+ 
     bool remove = false;
     bool removeAD = false;
-    if ( ! t->hasDueDate() ) {
+    QDate da;
+    if ( t->hasCompletedDate() )
+        da = t->completed().date();
+    else 
+        da = t->dtDue().date();
+    if ( ! t->hasDueDate() && !t->hasCompletedDate() ) {
         remove = true;
         removeAD = true;
@@ -1520,15 +1530,16 @@ void  KOAgendaView::updateTodo( Todo * t, int )
         }
         else {
-            if ( t->dtDue().date() < mSelectedDates.first() ||
-                 t->dtDue().date() > mSelectedDates.last() ) {
+            
+            if ( da < mSelectedDates.first() ||
+                 da > mSelectedDates.last() ) {
                 remove = true;
                 removeAD = true;
             } else {
-                remove = t->doesFloat();
+                remove = t->doesFloat() && !t->hasCompletedDate();
                 removeAD = !remove;
             }
         }
     }
-    int days = mSelectedDates.first().daysTo( t->dtDue().date()  );
+    int days = mSelectedDates.first().daysTo( da  );
     // qDebug("daysto %d ", days );
     mAgenda->updateTodo( t , days, remove); 
diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp
index 36a2947..7dc1880 100644
--- a/korganizer/koeventviewer.cpp
+++ b/korganizer/koeventviewer.cpp
@@ -348,4 +348,14 @@ void KOEventViewer::appendTodo(Todo *event, int mode )
     } 
     mMailSubject += i18n( "Todo " )+ event->summary();
+
+     if ( event->percentComplete() == 100 && event->hasCompletedDate() ) {
+        mText +="<font color=\"#B00000\">";
+        addTag("i",  i18n("<p><i>Completed on %1</i></p>").arg( event->completedStr(KOPrefs::instance()->mShortDateInViewer) ) );
+        mText += "</font>";
+    } else {
+        mText.append(i18n("<p><i>%1 % completed</i></p>")
+                     .arg(event->percentComplete()));
+    }
+
     if (event->cancelled ()) {
         mText +="<font color=\"#B00000\">";
@@ -380,12 +390,4 @@ void KOEventViewer::appendTodo(Todo *event, int mode )
                  .arg(QString::number(event->priority())));
 
-    if ( event->percentComplete() == 100 && event->hasCompletedDate() ) {
-    mText.append(i18n("<p><i>Completed on %1</i></p>")
-                 .arg( event->completedStr() ));
-    } else {
-    mText.append(i18n("<p><i>%1 % completed</i></p>")
-                 .arg(event->percentComplete()));
-    }
-
     formatReadOnly(event);
     formatAttendees(event);
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index 8c1953d..14e8b5c 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -335,4 +335,5 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
   KOrg::BaseView(calendar,parent,name)
 {
+    isFlatDisplay = false;
   mNavigator = 0;
   QBoxLayout *topLayout = new QVBoxLayout(this);
@@ -953,15 +954,23 @@ void KOTodoView::itemClicked(QListViewItem *item)
       }
   }
-  int completed = todoItem->todo()->isCompleted();  // Completed or not?
-
+#if 0
+  // handled by the item itself
+  bool completed = todoItem->todo()->isCompleted();  // Completed or not?
+  qDebug("com %d ",completed );
+  qDebug("itemclicked ");
   if (todoItem->isOn()) {
+      qDebug("on ");
     if (!completed) {
+        qDebug("set true ");
       todoItem->todo()->setCompleted(QDateTime::currentDateTime());
     }
   } else {
+      qDebug("not on ");
     if (completed) {
+        qDebug("set false ");
       todoItem->todo()->setCompleted(false);
     }
   }
+#endif
 }
 
diff --git a/korganizer/kotodoviewitem.cpp b/korganizer/kotodoviewitem.cpp
index 21ecb73..2822237 100644
--- a/korganizer/kotodoviewitem.cpp
+++ b/korganizer/kotodoviewitem.cpp
@@ -204,11 +204,10 @@ void KOTodoViewItem::stateChange(bool state)
   // do not change setting on startup
   if ( m_init ) return;
-  
-  kdDebug() << "State changed, modified " << state << endl;
+  qDebug("KOTodoViewItem::stateChange ");
   QString keyd = "==";
   QString keyt = "==";
   
-  if (state) mTodo->setCompleted(state);
-  else mTodo->setPercentComplete(0);
+  mTodo->setCompleted(state);
+  if (state) mTodo->setCompleted(QDateTime::currentDateTime());
   if (isOn()!=state) {
     setOn(state);