todo enhancements/fixes

1 files changed, 29 insertions, 4 deletions

diff --git a/korganizer/kotodoviewitem.cpp b/korganizer/kotodoviewitem.cpp
index ae0b334..347d982 100644
--- a/korganizer/kotodoviewitem.cpp
+++ b/korganizer/kotodoviewitem.cpp
@@ -81,2 +81,4 @@ void KOTodoViewItem::construct()
   QString keyt = "==";
+  QString skeyd = "==";
+  QString skeyt = "==";
 
@@ -98,3 +100,3 @@ void KOTodoViewItem::construct()
     keyd.sprintf("%04d%02d%02d",d.year(),d.month(),d.day());
-    setSortKey(3,keyd);
+    // setSortKey(3,keyd);
     if (mTodo->doesFloat()) {
@@ -106,3 +108,3 @@ void KOTodoViewItem::construct()
       keyt.sprintf("%02d%02d",t.hour(),t.minute());
-      setSortKey(4,keyt);
+      //setSortKey(4,keyt);
     }
@@ -118,4 +120,27 @@ void KOTodoViewItem::construct()
 
-  setText(5,mTodo->cancelled() ? i18n("Yes") : i18n("No"));
-  setText(6,mTodo->categoriesStr());
+
+
+  if (mTodo->hasStartDate()) {
+    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());
+      
+    }
+  } else {
+    setText(5,"");
+    setText(6,"");
+  }
+  setSortKey(5,skeyd);
+  setSortKey(6,skeyt);
+
+  setText(7,mTodo->cancelled() ? i18n("Yes") : i18n("No"));
+  setText(8,mTodo->categoriesStr());