summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--korganizer/kotodoeditor.cpp29
-rw-r--r--korganizer/kotodoviewitem.cpp40
-rw-r--r--libkcal/incidence.cpp9
-rw-r--r--libkcal/incidence.h5
-rw-r--r--libkcal/incidencebase.cpp1
-rw-r--r--libkcal/incidencebase.h4
-rw-r--r--libkcal/todo.cpp47
-rw-r--r--libkcal/todo.h2
8 files changed, 130 insertions, 7 deletions
diff --git a/korganizer/kotodoeditor.cpp b/korganizer/kotodoeditor.cpp
index 069dda8..9232e09 100644
--- a/korganizer/kotodoeditor.cpp
+++ b/korganizer/kotodoeditor.cpp
@@ -321,6 +321,8 @@ void KOTodoEditor::checkRecurrence()
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 {
@@ -350,6 +352,33 @@ void KOTodoEditor::writeTodo(Todo *event)
}
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();
}
diff --git a/korganizer/kotodoviewitem.cpp b/korganizer/kotodoviewitem.cpp
index 0e847c2..70f00c6 100644
--- a/korganizer/kotodoviewitem.cpp
+++ b/korganizer/kotodoviewitem.cpp
@@ -191,6 +191,14 @@ void KOTodoViewItem::setMyPixmap()
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 ) ;
@@ -200,7 +208,7 @@ void KOTodoViewItem::setMyPixmap()
}
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) {
@@ -215,7 +223,18 @@ void KOTodoViewItem::stateChange(bool state)
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()) {
@@ -233,6 +252,25 @@ void KOTodoViewItem::stateChange(bool state)
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);
diff --git a/libkcal/incidence.cpp b/libkcal/incidence.cpp
index dbc159c..0684af2 100644
--- a/libkcal/incidence.cpp
+++ b/libkcal/incidence.cpp
@@ -647,3 +647,12 @@ QDateTime Incidence::getNextOccurence( const QDateTime& dt, bool* ok ) const
*ok = true;
return incidenceStart;
}
+QDateTime Incidence::dtStart() const
+{
+ if ( doesRecur() ) {
+ if ( type() == "Todo" ) {
+ ((Todo*)this)->checkSetCompletedFalse();
+ }
+ }
+ return mDtStart;
+}
diff --git a/libkcal/incidence.h b/libkcal/incidence.h
index 38d2aaa..0ae9656 100644
--- a/libkcal/incidence.h
+++ b/libkcal/incidence.h
@@ -269,18 +269,19 @@ class Incidence : public IncidenceBase
void setRecurrenceID(QDateTime);
QDateTime recurrenceID () const;
+ QDateTime dtStart() const;
protected:
QPtrList<Alarm> mAlarms;
QPtrList<Incidence> mRelations;
+ QDateTime mRecurrenceID;
+ bool mHasRecurrenceID;
private:
int mRevision;
bool mCancelled;
// base components of jounal, event and todo
- QDateTime mRecurrenceID;
- bool mHasRecurrenceID;
QDateTime mCreated;
QString mDescription;
QString mSummary;
diff --git a/libkcal/incidencebase.cpp b/libkcal/incidencebase.cpp
index 7525a4a..51f2e9d 100644
--- a/libkcal/incidencebase.cpp
+++ b/libkcal/incidencebase.cpp
@@ -179,6 +179,7 @@ void IncidenceBase::setDtStart(const QDateTime &dtStart)
updated();
}
+
QDateTime IncidenceBase::dtStart() const
{
return mDtStart;
diff --git a/libkcal/incidencebase.h b/libkcal/incidencebase.h
index f9a6558..8624786 100644
--- a/libkcal/incidencebase.h
+++ b/libkcal/incidencebase.h
@@ -74,7 +74,7 @@ class IncidenceBase : public CustomProperties
/** for setting the event's starting date/time with a QDateTime. */
virtual void setDtStart(const QDateTime &dtStart);
/** returns an event's starting date/time as a QDateTime. */
- QDateTime dtStart() const;
+ virtual QDateTime dtStart() const;
/** returns an event's starting time as a string formatted according to the
users locale settings */
QString dtStartTimeStr() const;
@@ -141,12 +141,12 @@ class IncidenceBase : public CustomProperties
void updated();
protected:
+ QDateTime mDtStart;
bool mReadOnly;
QDateTime getEvenTime( QDateTime );
private:
// base components
- QDateTime mDtStart;
QString mOrganizer;
QString mUid;
QDateTime mLastModified;
diff --git a/libkcal/todo.cpp b/libkcal/todo.cpp
index 9c04a7e..1f54c2f 100644
--- a/libkcal/todo.cpp
+++ b/libkcal/todo.cpp
@@ -311,12 +311,18 @@ QString Todo::statusStr() const
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;
@@ -357,9 +363,33 @@ 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;
@@ -412,3 +442,16 @@ QDateTime Todo::getNextAlarmDateTime( bool * ok, int * offset ) const
}
+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++++++++++++++++++++++++++++ ");
+ }
+}
diff --git a/libkcal/todo.h b/libkcal/todo.h
index 137b252..a22d4b7 100644
--- a/libkcal/todo.h
+++ b/libkcal/todo.h
@@ -112,6 +112,8 @@ class Todo : public Incidence
/** Return true, if todo has a date associated with completion */
bool hasCompletedDate() const;
bool contains ( Todo*);
+ void checkSetCompletedFalse();
+ bool setRecurDates();
private:
bool accept(Visitor &v) { return v.visit(this); }