3 files changed, 65 insertions, 8 deletions

diff --git a/libopie2/opiepim/backend/otodoaccesssql.cpp b/libopie2/opiepim/backend/otodoaccesssql.cpp
index 209e714..25536e0 100644
--- a/libopie2/opiepim/backend/otodoaccesssql.cpp
+++ b/libopie2/opiepim/backend/otodoaccesssql.cpp
@@ -305,16 +305,73 @@ QArray<int> OTodoAccessBackendSQL::overDue() {
 QArray<int> OTodoAccessBackendSQL::effectiveToDos( const QDate& s,
                                                    const QDate& t,
                                                    bool u) {
     EffQuery ef(s, t, u );
     return uids (m_driver->query(&ef) );
 }
+/*
+ *
+ */
 QArray<int> OTodoAccessBackendSQL::sorted( bool asc, int sortOrder,
                                            int sortFilter, int cat ) {
-    QArray<int> ints(0);
-    return ints;
+    QString query;
+    query = "select uid from todolist WHERE ";
+
+    /*
+     * Sort Filter stuff
+     * not that straight forward
+     *
+     */
+    /* Category */
+    if ( sortFilter & 1 ) {
+        query += " categories like '%" +QString::number(cat)+"%' AND";
+    }
+    /* Show only overdue */
+    if ( sortFilter & 2 ) {
+        QDate date = QDate::currentDate();
+        QString due;
+        QString base;
+        base = QString("DueDate <= '%1-%2-%3' AND WHERE completed = 0").arg( date.year() ).arg( date.month() ).arg( date.day() );
+        query += " " + base + " AND";
+    }
+    /* not show completed */
+    if ( sortFilter & 4 ) {
+        query += " completed = 0 AND";
+    }else{
+       query += " ( completed = 1 OR  completed = 0) AND";
+    }
+    /* srtip the end */
+    query = query.remove( query.length()-3, 3 );
+
+
+    /*
+     * sort order stuff
+     * quite straight forward
+     */
+    query += "ORDER BY ";
+    switch( sortOrder ) {
+        /* completed */
+    case 0:
+        query += "completed";
+        break;
+    case 1:
+        query += "priority";
+        break;
+    case 2:
+        query += "description";
+        break;
+    case 3:
+        query += "DueDate";
+        break;
+    }
+    if ( !asc )
+        query += " DESC";
+
+    qWarning( query );
+    OSQLRawQuery raw(query );
+    return uids( m_driver->query(&raw) );
 }
 bool OTodoAccessBackendSQL::date( QDate& da, const QString& str ) const{
     if ( str == "0-0-0" )
         return false;
     else{
         int day, year, month;
diff --git a/libopie2/opiepim/backend/otodoaccesssql.h b/libopie2/opiepim/backend/otodoaccesssql.h
index 966628d..6c5f50a 100644
--- a/libopie2/opiepim/backend/otodoaccesssql.h
+++ b/libopie2/opiepim/backend/otodoaccesssql.h
@@ -29,15 +29,15 @@ public:
                                 const QDate& end, bool includeNoDates );
     QArray<int> sorted(bool asc, int sortOrder, int sortFilter, int cat );
 
 private:
     void update();
     void fillDict();
-    bool date( QDate& date, const QString& )const;
-    OTodo todo( const OSQLResult& )const;
-    QArray<int> uids( const OSQLResult& )const;
+    inline bool date( QDate& date, const QString& )const;
+    inline OTodo todo( const OSQLResult& )const;
+    inline QArray<int> uids( const OSQLResult& )const;
     OTodo todo( int uid )const;
 
     QAsciiDict<int> m_dict;
     OSQLDriver* m_driver;
     QArray<int> m_uids;
 };
diff --git a/libopie2/opiepim/core/otodoaccess.h b/libopie2/opiepim/core/otodoaccess.h
index 12997aa..390ab0e 100644
--- a/libopie2/opiepim/core/otodoaccess.h
+++ b/libopie2/opiepim/core/otodoaccess.h
@@ -18,15 +18,15 @@ class OTodoAccess : public QObject, public OPimAccessTemplate<OTodo> {
     Q_OBJECT
 public:
     enum SortOrder { Completed = 0,
                      Priority,
                      Description,
                      Deadline };
-    enum SortFilter{ ShowOverdue = 0,
-                     Category =1,
-                     OnlyOverDue= 2 };
+    enum SortFilter{ Category =1,
+                     OnlyOverDue= 2,
+                     DoNotShowCompleted =4  };
     /**
      * if you use 0l
      * the default resource will be
      * picked up
      */
     OTodoAccess( OTodoAccessBackend* = 0l);