3 files changed, 44 insertions, 2 deletions

diff --git a/libkcal/incidence.h b/libkcal/incidence.h
index 1807bc4..de2a381 100644
--- a/libkcal/incidence.h
+++ b/libkcal/incidence.h
@@ -257,36 +257,36 @@ class Incidence : public IncidenceBase
     /** return the event's/todo's location. Do _not_ use it with journal */
     QString location() const;  
    /** returns TRUE or FALSE depending on whether the todo has a start date */
     bool hasStartDate() const;
     /** sets the event's hasStartDate value. */
     void setHasStartDate(bool f);
     QDateTime getNextOccurence( const QDateTime& dt, bool* yes ) const;
     bool cancelled() const;
     void setCancelled( bool b );
 
 protected:
     QPtrList<Alarm> mAlarms;
+    QPtrList<Incidence> mRelations;
   private:
     int mRevision;
     bool mCancelled;
 
     // base components of jounal, event and todo
     QDateTime mCreated;
     QString mDescription;
     QString mSummary;
     QStringList mCategories;
     Incidence *mRelatedTo;
     QString mRelatedToUid;
-    QPtrList<Incidence> mRelations;
     DateList mExDates;
     QPtrList<Attachment> mAttachments;
     QStringList mResources;
     bool mHasStartDate;                  // if todo has associated start date
 
     int mSecrecy;
     int mPriority;                        // 1 = highest, 2 = less, etc.
 
     //QPtrList<Alarm> mAlarms;
     Recurrence *mRecurrence;
     
     QString mLocation;
diff --git a/libkcal/todo.cpp b/libkcal/todo.cpp
index 7f1de78..d81a68f 100644
--- a/libkcal/todo.cpp
+++ b/libkcal/todo.cpp
@@ -184,25 +184,55 @@ QString Todo::dtDueTimeStr() const
   return KGlobal::locale()->formatTime(mDtDue.time());
 }
 
 QString Todo::dtDueDateStr(bool shortfmt) const
 {
   return KGlobal::locale()->formatDate(mDtDue.date(),shortfmt);
 }
 
 QString Todo::dtDueStr(bool shortfmt) const
 {
   return KGlobal::locale()->formatDateTime(mDtDue, shortfmt);
 }
-
+// retval 0 : no found
+//        1 : due for date found
+//        2 : overdue for date found
+int Todo::hasDueSubTodoForDate( const QDate & date, bool checkSubtodos  )
+{
+    int retval = 0;
+    if ( isCompleted() )
+        return 0;
+    if ( hasDueDate() ) {
+        if ( dtDue().date() < date )
+            return 2;
+        // we do not return, because we may find an overdue sub todo
+        if ( dtDue().date() == date )
+            retval = 1;
+    }
+    if ( checkSubtodos ) {
+        Incidence *aTodo;
+        for (aTodo = mRelations.first(); aTodo; aTodo = mRelations.next()) {
+            int ret = ((Todo*)aTodo)->hasDueSubTodoForDate( date ,checkSubtodos );
+            if ( ret == 2 )
+                return 2;
+            if ( ret == 1)
+                retval = 1;
+        }
+    }
+    return retval;
+}
+int Todo::hasDueSubTodo( bool checkSubtodos  ) //= true
+{  
+    return hasDueSubTodoForDate(QDate::currentDate(), checkSubtodos );
+}
 bool Todo::hasDueDate() const
 {
   return mHasDueDate;
 }
 
 void Todo::setHasDueDate(bool f)
 {
   if (mReadOnly) return;
   mHasDueDate = f;
   updated();
 }
 
diff --git a/libkcal/todo.h b/libkcal/todo.h
index 41f5841..137b252 100644
--- a/libkcal/todo.h
+++ b/libkcal/todo.h
@@ -53,24 +53,36 @@ class Todo : public Incidence
     /** returns an event's due date as a string formatted according to the
      users locale settings */
     QString dtDueDateStr(bool shortfmt=true) const;
     /** returns an event's due date and time as a string formatted according
      to the users locale settings */
     QString dtDueStr(bool shortfmt=true) const;
 
     /** returns TRUE or FALSE depending on whether the todo has a due date */
     bool hasDueDate() const;
     /** sets the event's hasDueDate value. */
     void setHasDueDate(bool f);
 
+    /*
+      Looks for a subtodo (including itself ) which is not complete and is
+      - overdue, or
+      - due today.
+      It returns 0 for nothing found,
+      1 for found a todo which is due today and no overdue found
+      2 for found a overdue todo
+    */
+    int hasDueSubTodo( bool checkSubtodos = true );
+    /* same as above, but a specific date can be specified*/
+    int hasDueSubTodoForDate( const  QDate & date, bool checkSubtodos );
+
  
     /** sets the event's status to the string specified.  The string
      * must be a recognized value for the status field, i.e. a string
      * equivalent of the possible status enumerations previously described. */
 //    void setStatus(const QString &statStr);
     /** sets the event's status to the value specified.  See the enumeration
      * above for possible values. */
 //    void setStatus(int);
     /** return the event's status. */
 //    int status() const;
     /** return the event's status in string format. */
 //    QString statusStr() const;