todo fixi

4 files changed, 27 insertions, 7 deletions

diff --git a/libkcal/icalformatimpl.cpp b/libkcal/icalformatimpl.cpp
index bb9cb29..2e38ae3 100644
--- a/libkcal/icalformatimpl.cpp
+++ b/libkcal/icalformatimpl.cpp
@@ -1189,49 +1189,49 @@ void ICalFormatImpl::readIncidence(icalcomponent *parent,Incidence *incidence)
         incidence->setDescription(QString::fromUtf8(text));
         break;
 
       case ICAL_SUMMARY_PROPERTY:  // summary
           {
               text = icalproperty_get_summary(p);
               incidence->setSummary(QString::fromUtf8(text));
           }
         break;
        case ICAL_STATUS_PROPERTY:  // summary
         {
             if ( ICAL_STATUS_CANCELLED == icalproperty_get_status(p) )
                 incidence->setCancelled( true );
         }
         break;
 
       case ICAL_LOCATION_PROPERTY:  // location
         text = icalproperty_get_location(p);
         incidence->setLocation(QString::fromUtf8(text));
         break;
 
       case ICAL_RECURRENCEID_PROPERTY:
         icaltime = icalproperty_get_recurrenceid(p);
         incidence->setRecurrenceID( readICalDateTime(icaltime) );
-        qDebug(" RecurrenceID %s",incidence->recurrenceID().toString().latin1() );
+        //qDebug(" RecurrenceID %s",incidence->recurrenceID().toString().latin1() );
         break;
 #if 0
   // status
   if ((vo = isAPropertyOf(vincidence, VCStatusProp)) != 0) {
     incidence->setStatus(s = fakeCString(vObjectUStringZValue(vo)));
     deleteStr(s);
   }
   else
     incidence->setStatus("NEEDS ACTION");
 #endif
 
       case ICAL_PRIORITY_PROPERTY:  // priority
         intvalue = icalproperty_get_priority(p);
         incidence->setPriority(intvalue);
         break;
 
       case ICAL_CATEGORIES_PROPERTY:  // categories
         text = icalproperty_get_categories(p);
         categories.append(QString::fromUtf8(text));
         break;
         //*******************************************
       case ICAL_RRULE_PROPERTY:
           // we do need (maybe )start datetime of incidence for recurrence
           // such that we can read recurrence only after we read incidence completely
diff --git a/libkcal/incidence.cpp b/libkcal/incidence.cpp
index 0684af2..708ee6b 100644
--- a/libkcal/incidence.cpp
+++ b/libkcal/incidence.cpp
@@ -192,52 +192,60 @@ bool KCal::operator==( const Incidence& i1, const Incidence& i2 )
     return
         //  i1.created() == i2.created() &&
         stringCompare( i1.description(), i2.description() ) &&
         stringCompare( i1.summary(), i2.summary() ) &&
         i1.categories() == i2.categories() &&
         // no need to compare mRelatedTo
         stringCompare( i1.relatedToUid(), i2.relatedToUid() ) &&
         //      i1.relations() == i2.relations() &&
         i1.exDates() == i2.exDates() &&
         i1.attachments() == i2.attachments() &&
         i1.resources() == i2.resources() &&
         i1.secrecy() == i2.secrecy() &&
         i1.priority() == i2.priority() &&
         i1.cancelled() == i2.cancelled() &&
         stringCompare( i1.location(), i2.location() );
 }
 
 Incidence* Incidence::recreateCloneException( QDate d  )
 {
     Incidence* newInc = clone();
     newInc->recreate();
     if ( doesRecur() ) {
         addExDate( d );
         newInc->recurrence()->unsetRecurs();
-        int len = dtStart().secsTo( ((Event*)this)->dtEnd());
-        QTime tim = dtStart().time();
-        newInc->setDtStart( QDateTime(d, tim) );
-        ((Event*)newInc)->setDtEnd( newInc->dtStart().addSecs( len ) );
+        if ( type() == "Event") {
+            int len = dtStart().secsTo( ((Event*)this)->dtEnd());
+            QTime tim = dtStart().time();
+            newInc->setDtStart( QDateTime(d, tim) );
+            ((Event*)newInc)->setDtEnd( newInc->dtStart().addSecs( len ) );
+        } else {
+            int len = dtStart().secsTo( ((Todo*)this)->dtDue());
+            QTime tim = ((Todo*)this)->dtDue().time();
+            ((Todo*)newInc)->setDtDue( QDateTime(d, tim) );
+            ((Todo*)newInc)->setDtStart( ((Todo*)newInc)->dtDue().addSecs( -len ) );
+            ((Todo*)this)->setRecurDates();
+        }
     }
     return newInc;
 }
 
 void Incidence::recreate()
 {
   setCreated(QDateTime::currentDateTime());
 
   setUid(CalFormat::createUniqueId());
 
   setRevision(0);
   setIDStr( ":" );
   setLastModified(QDateTime::currentDateTime());
 }
 
 void Incidence::setReadOnly( bool readOnly )
 {
   IncidenceBase::setReadOnly( readOnly );
   recurrence()->setRecurReadOnly( readOnly);
 }
 
 void Incidence::setCreated(QDateTime created)
 {
   if (mReadOnly) return;
diff --git a/libkcal/kincidenceformatter.cpp b/libkcal/kincidenceformatter.cpp
index 0d9c3f4..cc3088a 100644
--- a/libkcal/kincidenceformatter.cpp
+++ b/libkcal/kincidenceformatter.cpp
@@ -171,48 +171,60 @@ void KIncidenceFormatter::setTodo(Todo *event )
         }
         addTag("h3",i18n( "Last modified: " ) + KGlobal::locale()->formatDateTime(event->lastModified(),shortDate, true ) );
         if ( mColorMode )
             mText += "</font>";
     } 
     if ( event->percentComplete() == 100 && event->hasCompletedDate() ) {
         mText +="<font color=\"#B00000\">";
         addTag("i",  i18n("<p><i>Completed on %1</i></p>").arg( event->completedStr(shortDate) ) );
         mText += "</font>";
     } else {
         mText.append(i18n("<p><i>%1 % completed</i></p>")
                      .arg(event->percentComplete()));
     }
     if (event->cancelled ()) {
         mText +="<font color=\"#B00000\">";
         addTag("i",i18n("This todo has been cancelled!"));
         mText.append("<br>");
         mText += "</font>";
     }
    
     if (!event->location().isEmpty()) {
         addTag("b",i18n("Location: "));
         mText.append(event->location()+"<br>");
     }
+
+    if (event->recurrence()->doesRecur()) {
+
+        QString recurText = event->recurrence()->recurrenceText();
+        addTag("p","<em>" + i18n("This is a %1 recurring todo.").arg(recurText ) + "</em>");
+    } 
+        
+    if (event->hasStartDate()) {
+        mText.append(i18n("<p><b>Start on:</b> %1</p>").arg(event->dtStartStr(shortDate)));
+    }
+        
+
     if (event->hasDueDate()) {
         mText.append(i18n("<p><b>Due on:</b> %1</p>").arg(event->dtDueStr(shortDate)));
     }
     mText.append(i18n("<p><b>Priority:</b> %2</p>")
                  .arg(QString::number(event->priority())));
   
     addTag("p",i18n("<b>Access: </b>") +event->secrecyStr() );
     formatCategories(event);
     if (!event->description().isEmpty()) {
         addTag("p",i18n("<b>Details: </b>"));
         addTag("p",event->description());
     }
 
 
 
     formatReadOnly(event);
     formatAttendees(event);
 
 }
 
 void KIncidenceFormatter::setJournal(Journal*  )
 {
 
 }
diff --git a/libkcal/todo.cpp b/libkcal/todo.cpp
index 1f54c2f..39d16b6 100644
--- a/libkcal/todo.cpp
+++ b/libkcal/todo.cpp
@@ -348,49 +348,49 @@ void Todo::setCompleted(const QDateTime &completed)
         // 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("T: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();
@@ -431,27 +431,27 @@ QDateTime Todo::getNextAlarmDateTime( bool * ok, int * offset ) const
          }
      }
      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++++++++++++++++++++++++++++ ");
+        qDebug("Todo::checkSetCompletedFalse ");
     }
 }