summaryrefslogtreecommitdiff
authorzecke <zecke>2002-10-07 23:54:18 (UTC)
committer zecke <zecke>2002-10-07 23:54:18 (UTC)
commit02464ee120e2661d1fb30b0743ce64626c2d3133 (patch) (side-by-side diff)
treef53d7f4c91eaee616b3c67401bd213dbfad57d43
parentdbdc38993798a0e223437908a46846b16541f843 (diff)
downloadopie-02464ee120e2661d1fb30b0743ce64626c2d3133.zip
opie-02464ee120e2661d1fb30b0743ce64626c2d3133.tar.gz
opie-02464ee120e2661d1fb30b0743ce64626c2d3133.tar.bz2
Fix sorted stuff
Case number 4 is still to go
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie/pim/otodoaccessxml.cpp11
-rw-r--r--libopie2/opiepim/backend/otodoaccessxml.cpp11
2 files changed, 12 insertions, 10 deletions
diff --git a/libopie/pim/otodoaccessxml.cpp b/libopie/pim/otodoaccessxml.cpp
index 80b8599..f3b0783 100644
--- a/libopie/pim/otodoaccessxml.cpp
+++ b/libopie/pim/otodoaccessxml.cpp
@@ -442,21 +442,19 @@ public:
}
/**
* we take the sortorder( switch on it )
*
*/
int compareItems( Item d1, Item d2 ) {
- qWarning("compare items");
int ret =0;
OTodoXMLContainer* con1 = (OTodoXMLContainer*)d1;
OTodoXMLContainer* con2 = (OTodoXMLContainer*)d2;
/* same item */
if ( con1->todo.uid() == con2->todo.uid() )
return 0;
- qWarning("m_sort %d", m_sort );
switch ( m_sort ) {
/* completed */
case 0: {
ret = 0;
if ( con1->todo.isCompleted() ) ret++;
@@ -484,12 +482,14 @@ public:
/* either bot got a dueDate
* or one of them got one
*/
if ( con1->todo.hasDueDate() &&
con2->todo.hasDueDate() )
ret = con1->todo.dueDate().daysTo( con2->todo.dueDate() );
+
+
else if ( con1->todo.hasDueDate() )
ret = -1;
else if ( con2->todo.hasDueDate() )
ret = 0;
break;
}
@@ -508,27 +508,27 @@ public:
int m_sort;
};
QArray<int> OTodoAccessXML::sorted( bool asc, int sortOrder,
int sortFilter, int cat ) {
+ qWarning("sorted! %d cat", cat);
OTodoXMLVector vector(m_events.count(), asc,sortOrder );
QMap<int, OTodo>::Iterator it;
int item = 0;
bool bCat = sortFilter & 1 ? true : false;
- bool bOver = sortFilter & 0 ? true : false;
bool bOnly = sortFilter & 2 ? true : false;
for ( it = m_events.begin(); it != m_events.end(); ++it ) {
/* show category */
- if ( bCat )
+ if ( bCat && cat != 0)
if (!(*it).categories().contains( cat ) )
continue;
/* isOverdue but we should not show overdue */
- if ( (*it).isOverdue() && ( !bOver || !bOnly ) )
+ if ( (*it).isOverdue() && !bOnly )
continue;
if ( !(*it).isOverdue() && bOnly )
continue;
OTodoXMLContainer* con = new OTodoXMLContainer();
@@ -541,8 +541,9 @@ QArray<int> OTodoAccessXML::sorted( bool asc, int sortOrder,
vector.sort();
/* now get the uids */
QArray<int> array( vector.count() );
for (uint i= 0; i < vector.count(); i++ ) {
array[i] = ( vector.at(i) )->todo.uid();
}
+ qWarning("array count = %d %d", array.count(), vector.count() );
return array;
};
diff --git a/libopie2/opiepim/backend/otodoaccessxml.cpp b/libopie2/opiepim/backend/otodoaccessxml.cpp
index 80b8599..f3b0783 100644
--- a/libopie2/opiepim/backend/otodoaccessxml.cpp
+++ b/libopie2/opiepim/backend/otodoaccessxml.cpp
@@ -442,21 +442,19 @@ public:
}
/**
* we take the sortorder( switch on it )
*
*/
int compareItems( Item d1, Item d2 ) {
- qWarning("compare items");
int ret =0;
OTodoXMLContainer* con1 = (OTodoXMLContainer*)d1;
OTodoXMLContainer* con2 = (OTodoXMLContainer*)d2;
/* same item */
if ( con1->todo.uid() == con2->todo.uid() )
return 0;
- qWarning("m_sort %d", m_sort );
switch ( m_sort ) {
/* completed */
case 0: {
ret = 0;
if ( con1->todo.isCompleted() ) ret++;
@@ -484,12 +482,14 @@ public:
/* either bot got a dueDate
* or one of them got one
*/
if ( con1->todo.hasDueDate() &&
con2->todo.hasDueDate() )
ret = con1->todo.dueDate().daysTo( con2->todo.dueDate() );
+
+
else if ( con1->todo.hasDueDate() )
ret = -1;
else if ( con2->todo.hasDueDate() )
ret = 0;
break;
}
@@ -508,27 +508,27 @@ public:
int m_sort;
};
QArray<int> OTodoAccessXML::sorted( bool asc, int sortOrder,
int sortFilter, int cat ) {
+ qWarning("sorted! %d cat", cat);
OTodoXMLVector vector(m_events.count(), asc,sortOrder );
QMap<int, OTodo>::Iterator it;
int item = 0;
bool bCat = sortFilter & 1 ? true : false;
- bool bOver = sortFilter & 0 ? true : false;
bool bOnly = sortFilter & 2 ? true : false;
for ( it = m_events.begin(); it != m_events.end(); ++it ) {
/* show category */
- if ( bCat )
+ if ( bCat && cat != 0)
if (!(*it).categories().contains( cat ) )
continue;
/* isOverdue but we should not show overdue */
- if ( (*it).isOverdue() && ( !bOver || !bOnly ) )
+ if ( (*it).isOverdue() && !bOnly )
continue;
if ( !(*it).isOverdue() && bOnly )
continue;
OTodoXMLContainer* con = new OTodoXMLContainer();
@@ -541,8 +541,9 @@ QArray<int> OTodoAccessXML::sorted( bool asc, int sortOrder,
vector.sort();
/* now get the uids */
QArray<int> array( vector.count() );
for (uint i= 0; i < vector.count(); i++ ) {
array[i] = ( vector.at(i) )->todo.uid();
}
+ qWarning("array count = %d %d", array.count(), vector.count() );
return array;
};