author | zecke <zecke> | 2002-09-25 11:59:24 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-09-25 11:59:24 (UTC) |
commit | 38240090027bd68d8dd15d7d46ecf17792edb732 (patch) (unidiff) | |
tree | 589ef486d7169c57592ed8667f6c84d43f882d48 | |
parent | 5f2dd0a2340914b4983ebce3813187034e2cb9dc (diff) | |
download | opie-38240090027bd68d8dd15d7d46ecf17792edb732.zip opie-38240090027bd68d8dd15d7d46ecf17792edb732.tar.gz opie-38240090027bd68d8dd15d7d46ecf17792edb732.tar.bz2 |
Add a sort function and filter function to TodoAccess
This would allow us todo a paint hack in QTable
-rw-r--r-- | libopie/pim/orecordlist.h | 17 | ||||
-rw-r--r-- | libopie/pim/otodo.cpp | 1 | ||||
-rw-r--r-- | libopie/pim/otodoaccess.cpp | 8 | ||||
-rw-r--r-- | libopie/pim/otodoaccess.h | 16 | ||||
-rw-r--r-- | libopie/pim/otodoaccessbackend.h | 2 | ||||
-rw-r--r-- | libopie/pim/otodoaccessxml.cpp | 145 | ||||
-rw-r--r-- | libopie/pim/otodoaccessxml.h | 2 | ||||
-rw-r--r-- | libopie2/opiepim/backend/otodoaccessbackend.h | 2 | ||||
-rw-r--r-- | libopie2/opiepim/backend/otodoaccessxml.cpp | 145 | ||||
-rw-r--r-- | libopie2/opiepim/backend/otodoaccessxml.h | 2 | ||||
-rw-r--r-- | libopie2/opiepim/core/otodoaccess.cpp | 8 | ||||
-rw-r--r-- | libopie2/opiepim/core/otodoaccess.h | 16 | ||||
-rw-r--r-- | libopie2/opiepim/orecordlist.h | 17 | ||||
-rw-r--r-- | libopie2/opiepim/otodo.cpp | 1 |
14 files changed, 366 insertions, 16 deletions
diff --git a/libopie/pim/orecordlist.h b/libopie/pim/orecordlist.h index c63d813..1fd0741 100644 --- a/libopie/pim/orecordlist.h +++ b/libopie/pim/orecordlist.h | |||
@@ -17,165 +17,166 @@ | |||
17 | template <class T> class ORecordList; | 17 | template <class T> class ORecordList; |
18 | template <class T = OPimRecord> | 18 | template <class T = OPimRecord> |
19 | class ORecordListIterator { | 19 | class ORecordListIterator { |
20 | friend class ORecordList<T>; | 20 | friend class ORecordList<T>; |
21 | public: | 21 | public: |
22 | typedef OTemplateBase<T> Base; | 22 | typedef OTemplateBase<T> Base; |
23 | 23 | ||
24 | /** | 24 | /** |
25 | * The c'tor used internally from | 25 | * The c'tor used internally from |
26 | * ORecordList | 26 | * ORecordList |
27 | */ | 27 | */ |
28 | ORecordListIterator( const QArray<int>, const Base* ); | 28 | ORecordListIterator( const QArray<int>, const Base* ); |
29 | 29 | ||
30 | /** | 30 | /** |
31 | * The standard c'tor | 31 | * The standard c'tor |
32 | */ | 32 | */ |
33 | ORecordListIterator(); | 33 | ORecordListIterator(); |
34 | ~ORecordListIterator(); | 34 | ~ORecordListIterator(); |
35 | 35 | ||
36 | ORecordListIterator( const ORecordListIterator& ); | 36 | ORecordListIterator( const ORecordListIterator& ); |
37 | ORecordListIterator &operator=(const ORecordListIterator& ); | 37 | ORecordListIterator &operator=(const ORecordListIterator& ); |
38 | 38 | ||
39 | /** | 39 | /** |
40 | * a * operator ;) | 40 | * a * operator ;) |
41 | * use it like this T = (*it); | 41 | * use it like this T = (*it); |
42 | */ | 42 | */ |
43 | T operator*(); | 43 | T operator*(); |
44 | ORecordListIterator &operator++(); | 44 | ORecordListIterator &operator++(); |
45 | ORecordListIterator &operator--(); | 45 | ORecordListIterator &operator--(); |
46 | 46 | ||
47 | bool operator==( const ORecordListIterator& it ); | 47 | bool operator==( const ORecordListIterator& it ); |
48 | bool operator!=( const ORecordListIterator& it ); | 48 | bool operator!=( const ORecordListIterator& it ); |
49 | 49 | ||
50 | /** | 50 | /** |
51 | * the current item | 51 | * the current item |
52 | */ | 52 | */ |
53 | uint current()const; | 53 | uint current()const; |
54 | 54 | ||
55 | /** | 55 | /** |
56 | * the number of items | 56 | * the number of items |
57 | */ | 57 | */ |
58 | uint count()const; | 58 | uint count()const; |
59 | 59 | ||
60 | /** | 60 | /** |
61 | * sets the current item | 61 | * sets the current item |
62 | */ | 62 | */ |
63 | void setCurrent( uint cur ); | 63 | void setCurrent( uint cur ); |
64 | 64 | ||
65 | private: | 65 | private: |
66 | QArray<int> m_uids; | 66 | QArray<int> m_uids; |
67 | uint m_current; | 67 | uint m_current; |
68 | const Base* m_temp; | 68 | const Base* m_temp; |
69 | bool m_end : 1; | 69 | bool m_end : 1; |
70 | T m_record; | 70 | T m_record; |
71 | 71 | ||
72 | /* d pointer for future versions */ | 72 | /* d pointer for future versions */ |
73 | class IteratorPrivate; | 73 | class IteratorPrivate; |
74 | IteratorPrivate *d; | 74 | IteratorPrivate *d; |
75 | }; | 75 | }; |
76 | /** | 76 | /** |
77 | * The recordlist used as a return type | 77 | * The recordlist used as a return type |
78 | * from OPimAccessTemplate | 78 | * from OPimAccessTemplate |
79 | */ | 79 | */ |
80 | template <class T = OPimRecord > | 80 | template <class T = OPimRecord > |
81 | class ORecordList { | 81 | class ORecordList { |
82 | public: | 82 | public: |
83 | typedef OTemplateBase<T> Base; | 83 | typedef OTemplateBase<T> Base; |
84 | typedef ORecordListIterator<T> Iterator; | 84 | typedef ORecordListIterator<T> Iterator; |
85 | 85 | ||
86 | /** | 86 | /** |
87 | * c'tor | 87 | * c'tor |
88 | */ | 88 | */ |
89 | ORecordList () { | 89 | ORecordList () { |
90 | } | 90 | } |
91 | ORecordList( const QArray<int>& ids, | 91 | ORecordList( const QArray<int>& ids, |
92 | const Base* ); | 92 | const Base* ); |
93 | ~ORecordList(); | 93 | ~ORecordList(); |
94 | 94 | ||
95 | /** | 95 | /** |
96 | * the first iterator | 96 | * the first iterator |
97 | */ | 97 | */ |
98 | Iterator begin(); | 98 | Iterator begin(); |
99 | 99 | ||
100 | /** | 100 | /** |
101 | * the end | 101 | * the end |
102 | */ | 102 | */ |
103 | Iterator end(); | 103 | Iterator end(); |
104 | 104 | ||
105 | /** | 105 | /** |
106 | * the number of items in the list | 106 | * the number of items in the list |
107 | */ | 107 | */ |
108 | uint count()const; | 108 | uint count()const; |
109 | 109 | ||
110 | T operator[]( uint i ); | ||
110 | // FIXME implemenent remove | 111 | // FIXME implemenent remove |
111 | /* | 112 | /* |
112 | ConstIterator begin()const; | 113 | ConstIterator begin()const; |
113 | ConstIterator end()const; | 114 | ConstIterator end()const; |
114 | */ | 115 | */ |
115 | private: | 116 | private: |
116 | QArray<int> m_ids; | 117 | QArray<int> m_ids; |
117 | const Base* m_acc; | 118 | const Base* m_acc; |
118 | }; | 119 | }; |
119 | 120 | ||
120 | /* ok now implement it */ | 121 | /* ok now implement it */ |
121 | template <class T> | 122 | template <class T> |
122 | ORecordListIterator<T>::ORecordListIterator() { | 123 | ORecordListIterator<T>::ORecordListIterator() { |
123 | m_current = 0; | 124 | m_current = 0; |
124 | m_temp = 0l; | 125 | m_temp = 0l; |
125 | m_end = true; | 126 | m_end = true; |
126 | m_record = T(); | 127 | m_record = T(); |
127 | } | 128 | } |
128 | template <class T> | 129 | template <class T> |
129 | ORecordListIterator<T>::~ORecordListIterator() { | 130 | ORecordListIterator<T>::~ORecordListIterator() { |
130 | /* nothing to delete */ | 131 | /* nothing to delete */ |
131 | } | 132 | } |
132 | 133 | ||
133 | template <class T> | 134 | template <class T> |
134 | ORecordListIterator<T>::ORecordListIterator( const ORecordListIterator<T>& it) { | 135 | ORecordListIterator<T>::ORecordListIterator( const ORecordListIterator<T>& it) { |
135 | // qWarning("ORecordListIterator copy c'tor"); | 136 | // qWarning("ORecordListIterator copy c'tor"); |
136 | m_uids = it.m_uids; | 137 | m_uids = it.m_uids; |
137 | m_current = it.m_current; | 138 | m_current = it.m_current; |
138 | m_temp = it.m_temp; | 139 | m_temp = it.m_temp; |
139 | m_end = it.m_end; | 140 | m_end = it.m_end; |
140 | m_record = it.m_record; | 141 | m_record = it.m_record; |
141 | } | 142 | } |
142 | 143 | ||
143 | template <class T> | 144 | template <class T> |
144 | ORecordListIterator<T> &ORecordListIterator<T>::operator=( const ORecordListIterator<T>& it) { | 145 | ORecordListIterator<T> &ORecordListIterator<T>::operator=( const ORecordListIterator<T>& it) { |
145 | m_uids = it.m_uids; | 146 | m_uids = it.m_uids; |
146 | m_current = it.m_current; | 147 | m_current = it.m_current; |
147 | m_temp = it.m_temp; | 148 | m_temp = it.m_temp; |
148 | m_end = it.m_end; | 149 | m_end = it.m_end; |
149 | // m_record = it.m_record; | 150 | m_record = it.m_record; |
150 | 151 | ||
151 | return *this; | 152 | return *this; |
152 | } | 153 | } |
153 | 154 | ||
154 | template <class T> | 155 | template <class T> |
155 | T ORecordListIterator<T>::operator*() { | 156 | T ORecordListIterator<T>::operator*() { |
156 | // qWarning("operator* %d %d", m_current, m_uids[m_current] ); | 157 | // qWarning("operator* %d %d", m_current, m_uids[m_current] ); |
157 | if (!m_end ) | 158 | if (!m_end ) |
158 | /* FIXME | 159 | /* FIXME |
159 | * until the cache is in place | 160 | * until the cache is in place |
160 | * we do the uid match uid check | 161 | * we do the uid match uid check |
161 | */ | 162 | */ |
162 | if(m_record.uid() != m_uids[m_current] ) | 163 | if(m_record.uid() != m_uids[m_current] ) |
163 | m_record = m_temp->find( m_uids[m_current] ); | 164 | m_record = m_temp->find( m_uids[m_current] ); |
164 | else | 165 | else |
165 | m_record = T(); | 166 | m_record = T(); |
166 | 167 | ||
167 | return m_record; | 168 | return m_record; |
168 | } | 169 | } |
169 | 170 | ||
170 | template <class T> | 171 | template <class T> |
171 | ORecordListIterator<T> &ORecordListIterator<T>::operator++() { | 172 | ORecordListIterator<T> &ORecordListIterator<T>::operator++() { |
172 | if (m_current < m_uids.count() ) { | 173 | if (m_current < m_uids.count() ) { |
173 | m_end = false; | 174 | m_end = false; |
174 | ++m_current; | 175 | ++m_current; |
175 | }else | 176 | }else |
176 | m_end = true; | 177 | m_end = true; |
177 | 178 | ||
178 | return *this; | 179 | return *this; |
179 | } | 180 | } |
180 | template <class T> | 181 | template <class T> |
181 | ORecordListIterator<T> &ORecordListIterator<T>::operator--() { | 182 | ORecordListIterator<T> &ORecordListIterator<T>::operator--() { |
@@ -223,33 +224,37 @@ void ORecordListIterator<T>::setCurrent( uint cur ) { | |||
223 | } | 224 | } |
224 | template <class T> | 225 | template <class T> |
225 | uint ORecordListIterator<T>::count()const { | 226 | uint ORecordListIterator<T>::count()const { |
226 | return m_uids.count(); | 227 | return m_uids.count(); |
227 | } | 228 | } |
228 | template <class T> | 229 | template <class T> |
229 | ORecordList<T>::ORecordList( const QArray<int>& ids, | 230 | ORecordList<T>::ORecordList( const QArray<int>& ids, |
230 | const Base* acc ) | 231 | const Base* acc ) |
231 | : m_ids( ids ), m_acc( acc ) | 232 | : m_ids( ids ), m_acc( acc ) |
232 | { | 233 | { |
233 | } | 234 | } |
234 | template <class T> | 235 | template <class T> |
235 | ORecordList<T>::~ORecordList() { | 236 | ORecordList<T>::~ORecordList() { |
236 | /* nothing to do here */ | 237 | /* nothing to do here */ |
237 | } | 238 | } |
238 | template <class T> | 239 | template <class T> |
239 | ORecordList<T>::Iterator ORecordList<T>::begin() { | 240 | ORecordList<T>::Iterator ORecordList<T>::begin() { |
240 | Iterator it( m_ids, m_acc ); | 241 | Iterator it( m_ids, m_acc ); |
241 | return it; | 242 | return it; |
242 | } | 243 | } |
243 | template <class T> | 244 | template <class T> |
244 | ORecordList<T>::Iterator ORecordList<T>::end() { | 245 | ORecordList<T>::Iterator ORecordList<T>::end() { |
245 | Iterator it( m_ids, m_acc ); | 246 | Iterator it( m_ids, m_acc ); |
246 | it.m_end = true; | 247 | it.m_end = true; |
247 | it.m_current = m_ids.count(); | 248 | it.m_current = m_ids.count(); |
248 | 249 | ||
249 | return it; | 250 | return it; |
250 | } | 251 | } |
251 | template <class T> | 252 | template <class T> |
252 | uint ORecordList<T>::count()const { | 253 | uint ORecordList<T>::count()const { |
253 | return m_ids.count(); | 254 | return m_ids.count(); |
254 | } | 255 | } |
256 | template <class T> | ||
257 | T ORecordList<T>::operator[]( uint i ) { | ||
258 | return m_acc->find( m_ids[i] ); | ||
259 | } | ||
255 | #endif | 260 | #endif |
diff --git a/libopie/pim/otodo.cpp b/libopie/pim/otodo.cpp index 6dd4c0e..eb9dad3 100644 --- a/libopie/pim/otodo.cpp +++ b/libopie/pim/otodo.cpp | |||
@@ -143,64 +143,65 @@ QDateTime OTodo::alarmDateTime() const | |||
143 | QString OTodo::description()const | 143 | QString OTodo::description()const |
144 | { | 144 | { |
145 | return data->desc; | 145 | return data->desc; |
146 | } | 146 | } |
147 | void OTodo::setCompleted( bool completed ) | 147 | void OTodo::setCompleted( bool completed ) |
148 | { | 148 | { |
149 | changeOrModify(); | 149 | changeOrModify(); |
150 | data->isCompleted = completed; | 150 | data->isCompleted = completed; |
151 | } | 151 | } |
152 | void OTodo::setHasDueDate( bool hasDate ) | 152 | void OTodo::setHasDueDate( bool hasDate ) |
153 | { | 153 | { |
154 | changeOrModify(); | 154 | changeOrModify(); |
155 | data->hasDate = hasDate; | 155 | data->hasDate = hasDate; |
156 | } | 156 | } |
157 | void OTodo::setHasAlarmDateTime( bool hasAlarmDateTime ) | 157 | void OTodo::setHasAlarmDateTime( bool hasAlarmDateTime ) |
158 | { | 158 | { |
159 | changeOrModify(); | 159 | changeOrModify(); |
160 | data->hasAlarmDateTime = hasAlarmDateTime; | 160 | data->hasAlarmDateTime = hasAlarmDateTime; |
161 | } | 161 | } |
162 | void OTodo::setDescription(const QString &desc ) | 162 | void OTodo::setDescription(const QString &desc ) |
163 | { | 163 | { |
164 | // qWarning( "desc " + desc ); | 164 | // qWarning( "desc " + desc ); |
165 | changeOrModify(); | 165 | changeOrModify(); |
166 | data->desc = Qtopia::simplifyMultiLineSpace(desc ); | 166 | data->desc = Qtopia::simplifyMultiLineSpace(desc ); |
167 | } | 167 | } |
168 | void OTodo::setSummary( const QString& sum ) | 168 | void OTodo::setSummary( const QString& sum ) |
169 | { | 169 | { |
170 | changeOrModify(); | 170 | changeOrModify(); |
171 | data->sum = sum; | 171 | data->sum = sum; |
172 | } | 172 | } |
173 | void OTodo::setPriority(int prio ) | 173 | void OTodo::setPriority(int prio ) |
174 | { | 174 | { |
175 | qWarning("set priority %d", prio); | ||
175 | changeOrModify(); | 176 | changeOrModify(); |
176 | data->priority = prio; | 177 | data->priority = prio; |
177 | } | 178 | } |
178 | void OTodo::setDueDate( QDate date ) | 179 | void OTodo::setDueDate( QDate date ) |
179 | { | 180 | { |
180 | changeOrModify(); | 181 | changeOrModify(); |
181 | data->date = date; | 182 | data->date = date; |
182 | } | 183 | } |
183 | void OTodo::setAlarmDateTime( const QDateTime& alarm ) | 184 | void OTodo::setAlarmDateTime( const QDateTime& alarm ) |
184 | { | 185 | { |
185 | changeOrModify(); | 186 | changeOrModify(); |
186 | data->alarmDateTime = alarm; | 187 | data->alarmDateTime = alarm; |
187 | } | 188 | } |
188 | bool OTodo::isOverdue( ) | 189 | bool OTodo::isOverdue( ) |
189 | { | 190 | { |
190 | if( data->hasDate ) | 191 | if( data->hasDate ) |
191 | return QDate::currentDate() > data->date; | 192 | return QDate::currentDate() > data->date; |
192 | return false; | 193 | return false; |
193 | } | 194 | } |
194 | void OTodo::setProgress(ushort progress ) | 195 | void OTodo::setProgress(ushort progress ) |
195 | { | 196 | { |
196 | changeOrModify(); | 197 | changeOrModify(); |
197 | data->prog = progress; | 198 | data->prog = progress; |
198 | } | 199 | } |
199 | QString OTodo::toShortText() const { | 200 | QString OTodo::toShortText() const { |
200 | return summary(); | 201 | return summary(); |
201 | } | 202 | } |
202 | /*! | 203 | /*! |
203 | Returns a richt text string | 204 | Returns a richt text string |
204 | */ | 205 | */ |
205 | QString OTodo::toRichText() const | 206 | QString OTodo::toRichText() const |
206 | { | 207 | { |
diff --git a/libopie/pim/otodoaccess.cpp b/libopie/pim/otodoaccess.cpp index 8ec09bc..f51da29 100644 --- a/libopie/pim/otodoaccess.cpp +++ b/libopie/pim/otodoaccess.cpp | |||
@@ -39,33 +39,39 @@ OTodoAccess::List OTodoAccess::effectiveToDos( const QDate& start, | |||
39 | OTodoAccess::List OTodoAccess::overDue() { | 39 | OTodoAccess::List OTodoAccess::overDue() { |
40 | List lis( m_todoBackEnd->overDue(), this ); | 40 | List lis( m_todoBackEnd->overDue(), this ); |
41 | return lis; | 41 | return lis; |
42 | } | 42 | } |
43 | void OTodoAccess::addAlarm( const OTodo& event) { | 43 | void OTodoAccess::addAlarm( const OTodo& event) { |
44 | if (!event.hasAlarmDateTime() ) | 44 | if (!event.hasAlarmDateTime() ) |
45 | return; | 45 | return; |
46 | 46 | ||
47 | QDateTime now = QDateTime::currentDateTime(); | 47 | QDateTime now = QDateTime::currentDateTime(); |
48 | QDateTime schedule = event.alarmDateTime(); | 48 | QDateTime schedule = event.alarmDateTime(); |
49 | 49 | ||
50 | if ( schedule > now ){ | 50 | if ( schedule > now ){ |
51 | AlarmServer::addAlarm( schedule, | 51 | AlarmServer::addAlarm( schedule, |
52 | "QPE/Application/todolist", | 52 | "QPE/Application/todolist", |
53 | "alarm(QDateTime,int)", event.uid() ); | 53 | "alarm(QDateTime,int)", event.uid() ); |
54 | 54 | ||
55 | } | 55 | } |
56 | } | 56 | } |
57 | void OTodoAccess::delAlarm( int uid) { | 57 | void OTodoAccess::delAlarm( int uid) { |
58 | 58 | ||
59 | QDateTime schedule; // Create null DateTime | 59 | QDateTime schedule; // Create null DateTime |
60 | 60 | ||
61 | // I hope this will remove all scheduled alarms | 61 | // I hope this will remove all scheduled alarms |
62 | // with the given uid !? | 62 | // with the given uid !? |
63 | // If not: I have to rethink how to remove already | 63 | // If not: I have to rethink how to remove already |
64 | // scheduled events... (se) | 64 | // scheduled events... (se) |
65 | // it should be fine -zecke | 65 | // it should be fine -zecke |
66 | // qWarning("Removing alarm for event with uid %d", uid ); | 66 | // qWarning("Removing alarm for event with uid %d", uid ); |
67 | AlarmServer::deleteAlarm( schedule , | 67 | AlarmServer::deleteAlarm( schedule , |
68 | "QPE/Application/todolist", | 68 | "QPE/Application/todolist", |
69 | "alarm(QDateTime,int)", uid ); | 69 | "alarm(QDateTime,int)", uid ); |
70 | } | 70 | } |
71 | 71 | /* sort order */ | |
72 | OTodoAccess::List OTodoAccess::sorted( bool ascending, int sort,int filter, int cat ) { | ||
73 | QArray<int> ints = m_todoBackEnd->sorted( ascending, sort, | ||
74 | filter, cat ); | ||
75 | OTodoAccess::List list( ints, this ); | ||
76 | return list; | ||
77 | } | ||
diff --git a/libopie/pim/otodoaccess.h b/libopie/pim/otodoaccess.h index c43efe9..12997aa 100644 --- a/libopie/pim/otodoaccess.h +++ b/libopie/pim/otodoaccess.h | |||
@@ -1,79 +1,93 @@ | |||
1 | #ifndef OPIE_TODO_ACCESS_H | 1 | #ifndef OPIE_TODO_ACCESS_H |
2 | #define OPIE_TODO_ACCESS_H | 2 | #define OPIE_TODO_ACCESS_H |
3 | 3 | ||
4 | #include <qobject.h> | 4 | #include <qobject.h> |
5 | #include <qvaluelist.h> | 5 | #include <qvaluelist.h> |
6 | 6 | ||
7 | #include "otodo.h" | 7 | #include "otodo.h" |
8 | #include "otodoaccessbackend.h" | 8 | #include "otodoaccessbackend.h" |
9 | #include "opimaccesstemplate.h" | 9 | #include "opimaccesstemplate.h" |
10 | 10 | ||
11 | 11 | ||
12 | /** | 12 | /** |
13 | * OTodoAccess | 13 | * OTodoAccess |
14 | * the class to get access to | 14 | * the class to get access to |
15 | * the todolist | 15 | * the todolist |
16 | */ | 16 | */ |
17 | class OTodoAccess : public QObject, public OPimAccessTemplate<OTodo> { | 17 | class OTodoAccess : public QObject, public OPimAccessTemplate<OTodo> { |
18 | Q_OBJECT | 18 | Q_OBJECT |
19 | public: | 19 | public: |
20 | enum SortOrder { Completed = 0, | ||
21 | Priority, | ||
22 | Description, | ||
23 | Deadline }; | ||
24 | enum SortFilter{ ShowOverdue = 0, | ||
25 | Category =1, | ||
26 | OnlyOverDue= 2 }; | ||
20 | /** | 27 | /** |
21 | * if you use 0l | 28 | * if you use 0l |
22 | * the default resource will be | 29 | * the default resource will be |
23 | * icked up | 30 | * picked up |
24 | */ | 31 | */ |
25 | OTodoAccess( OTodoAccessBackend* = 0l); | 32 | OTodoAccess( OTodoAccessBackend* = 0l); |
26 | ~OTodoAccess(); | 33 | ~OTodoAccess(); |
27 | 34 | ||
28 | 35 | ||
29 | /* our functions here */ | 36 | /* our functions here */ |
30 | /** | 37 | /** |
31 | * include todos from start to end | 38 | * include todos from start to end |
32 | * includeNoDates whether or not to include | 39 | * includeNoDates whether or not to include |
33 | * events with no dates | 40 | * events with no dates |
34 | */ | 41 | */ |
35 | List effectiveToDos( const QDate& start, | 42 | List effectiveToDos( const QDate& start, |
36 | const QDate& end, | 43 | const QDate& end, |
37 | bool includeNoDates = true ); | 44 | bool includeNoDates = true ); |
38 | 45 | ||
39 | /** | 46 | /** |
40 | * start | 47 | * start |
41 | * end date taken from the currentDate() | 48 | * end date taken from the currentDate() |
42 | */ | 49 | */ |
43 | List effectiveToDos( const QDate& start, | 50 | List effectiveToDos( const QDate& start, |
44 | bool includeNoDates = true ); | 51 | bool includeNoDates = true ); |
45 | 52 | ||
46 | 53 | ||
47 | /** | 54 | /** |
48 | * return overdue OTodos | 55 | * return overdue OTodos |
49 | */ | 56 | */ |
50 | List overDue(); | 57 | List overDue(); |
58 | |||
59 | /** | ||
60 | * | ||
61 | */ | ||
62 | List sorted( bool ascending, int sortOrder, int sortFilter, int cat ); | ||
63 | |||
51 | /** | 64 | /** |
52 | * merge a list of OTodos into | 65 | * merge a list of OTodos into |
53 | * the resource | 66 | * the resource |
54 | */ | 67 | */ |
55 | void mergeWith( const QValueList<OTodo>& ); | 68 | void mergeWith( const QValueList<OTodo>& ); |
56 | 69 | ||
57 | /** | 70 | /** |
58 | * add an Alarm to the AlarmServer | 71 | * add an Alarm to the AlarmServer |
59 | */ | 72 | */ |
60 | void addAlarm( const OTodo& ); | 73 | void addAlarm( const OTodo& ); |
61 | 74 | ||
62 | /** | 75 | /** |
63 | * delete an alarm with the uid from | 76 | * delete an alarm with the uid from |
64 | * the alarm server | 77 | * the alarm server |
65 | */ | 78 | */ |
66 | void delAlarm( int uid ); | 79 | void delAlarm( int uid ); |
67 | 80 | ||
68 | signals: | 81 | signals: |
69 | /** | 82 | /** |
70 | * if the OTodoAccess was changed | 83 | * if the OTodoAccess was changed |
71 | */ | 84 | */ |
72 | void signalChanged( const OTodoAccess* ); | 85 | void signalChanged( const OTodoAccess* ); |
73 | private: | 86 | private: |
87 | int m_cat; | ||
74 | OTodoAccessBackend* m_todoBackEnd; | 88 | OTodoAccessBackend* m_todoBackEnd; |
75 | class OTodoAccessPrivate; | 89 | class OTodoAccessPrivate; |
76 | OTodoAccessPrivate* d; | 90 | OTodoAccessPrivate* d; |
77 | }; | 91 | }; |
78 | 92 | ||
79 | #endif | 93 | #endif |
diff --git a/libopie/pim/otodoaccessbackend.h b/libopie/pim/otodoaccessbackend.h index ebe2189..3bad6b7 100644 --- a/libopie/pim/otodoaccessbackend.h +++ b/libopie/pim/otodoaccessbackend.h | |||
@@ -1,18 +1,20 @@ | |||
1 | #ifndef OPIE_TODO_ACCESS_BACKEND_H | 1 | #ifndef OPIE_TODO_ACCESS_BACKEND_H |
2 | #define OPIE_TODO_ACCESS_BACKEND_H | 2 | #define OPIE_TODO_ACCESS_BACKEND_H |
3 | 3 | ||
4 | #include "otodo.h" | 4 | #include "otodo.h" |
5 | #include "opimaccessbackend.h" | 5 | #include "opimaccessbackend.h" |
6 | 6 | ||
7 | class OTodoAccessBackend : public OPimAccessBackend<OTodo> { | 7 | class OTodoAccessBackend : public OPimAccessBackend<OTodo> { |
8 | public: | 8 | public: |
9 | OTodoAccessBackend(); | 9 | OTodoAccessBackend(); |
10 | ~OTodoAccessBackend(); | 10 | ~OTodoAccessBackend(); |
11 | virtual QArray<int> effectiveToDos( const QDate& start, | 11 | virtual QArray<int> effectiveToDos( const QDate& start, |
12 | const QDate& end, | 12 | const QDate& end, |
13 | bool includeNoDates ) = 0; | 13 | bool includeNoDates ) = 0; |
14 | virtual QArray<int> overDue() = 0; | 14 | virtual QArray<int> overDue() = 0; |
15 | virtual QArray<int> sorted( bool asc, int sortOrder, int sortFilter, | ||
16 | int cat ) = 0; | ||
15 | 17 | ||
16 | }; | 18 | }; |
17 | 19 | ||
18 | #endif | 20 | #endif |
diff --git a/libopie/pim/otodoaccessxml.cpp b/libopie/pim/otodoaccessxml.cpp index 5fe733c..692483e 100644 --- a/libopie/pim/otodoaccessxml.cpp +++ b/libopie/pim/otodoaccessxml.cpp | |||
@@ -1,33 +1,34 @@ | |||
1 | #include <qfile.h> | 1 | #include <qfile.h> |
2 | #include <qvector.h> | ||
2 | 3 | ||
3 | #include <qpe/global.h> | 4 | #include <qpe/global.h> |
4 | #include <qpe/stringutil.h> | 5 | #include <qpe/stringutil.h> |
5 | #include <qpe/timeconversion.h> | 6 | #include <qpe/timeconversion.h> |
6 | 7 | ||
7 | #include <opie/xmltree.h> | 8 | #include <opie/xmltree.h> |
8 | 9 | ||
9 | #include "otodoaccessxml.h" | 10 | #include "otodoaccessxml.h" |
10 | 11 | ||
11 | OTodoAccessXML::OTodoAccessXML( const QString& appName, | 12 | OTodoAccessXML::OTodoAccessXML( const QString& appName, |
12 | const QString& fileName ) | 13 | const QString& fileName ) |
13 | : OTodoAccessBackend(), m_app( appName ), m_opened( false ), m_changed( false ) | 14 | : OTodoAccessBackend(), m_app( appName ), m_opened( false ), m_changed( false ) |
14 | { | 15 | { |
15 | if (!fileName.isEmpty() ) | 16 | if (!fileName.isEmpty() ) |
16 | m_file = fileName; | 17 | m_file = fileName; |
17 | else | 18 | else |
18 | m_file = Global::applicationFileName( "todolist", "todolist.xml" ); | 19 | m_file = Global::applicationFileName( "todolist", "todolist.xml" ); |
19 | } | 20 | } |
20 | OTodoAccessXML::~OTodoAccessXML() { | 21 | OTodoAccessXML::~OTodoAccessXML() { |
21 | 22 | ||
22 | } | 23 | } |
23 | bool OTodoAccessXML::load() { | 24 | bool OTodoAccessXML::load() { |
24 | m_opened = true; | 25 | m_opened = true; |
25 | m_changed = false; | 26 | m_changed = false; |
26 | /* initialize dict */ | 27 | /* initialize dict */ |
27 | /* | 28 | /* |
28 | * UPDATE dict if you change anything!!! | 29 | * UPDATE dict if you change anything!!! |
29 | */ | 30 | */ |
30 | QAsciiDict<int> dict(15); | 31 | QAsciiDict<int> dict(15); |
31 | dict.setAutoDelete( TRUE ); | 32 | dict.setAutoDelete( TRUE ); |
32 | dict.insert("Categories" , new int(OTodo::Category) ); | 33 | dict.insert("Categories" , new int(OTodo::Category) ); |
33 | dict.insert("Uid" , new int(OTodo::Uid) ); | 34 | dict.insert("Uid" , new int(OTodo::Uid) ); |
@@ -227,64 +228,65 @@ OTodo OTodoAccessXML::todo( QAsciiDict<int>* dict, Opie::XMLElement* element)con | |||
227 | 228 | ||
228 | int *find=0; | 229 | int *find=0; |
229 | int day, month, year; | 230 | int day, month, year; |
230 | day = month = year = -1; | 231 | day = month = year = -1; |
231 | for ( it = attributes.begin(); it != attributes.end(); ++it ) { | 232 | for ( it = attributes.begin(); it != attributes.end(); ++it ) { |
232 | find = (*dict)[ it.key() ]; | 233 | find = (*dict)[ it.key() ]; |
233 | if (!find ) { | 234 | if (!find ) { |
234 | // qWarning("Unknown option" + it.key() ); | 235 | // qWarning("Unknown option" + it.key() ); |
235 | ev.setCustomField( it.key(), it.data() ); | 236 | ev.setCustomField( it.key(), it.data() ); |
236 | continue; | 237 | continue; |
237 | } | 238 | } |
238 | 239 | ||
239 | switch( *find ) { | 240 | switch( *find ) { |
240 | case OTodo::Uid: | 241 | case OTodo::Uid: |
241 | ev.setUid( it.data().toInt() ); | 242 | ev.setUid( it.data().toInt() ); |
242 | break; | 243 | break; |
243 | case OTodo::Category: | 244 | case OTodo::Category: |
244 | ev.setCategories( ev.idsFromString( it.data() ) ); | 245 | ev.setCategories( ev.idsFromString( it.data() ) ); |
245 | break; | 246 | break; |
246 | case OTodo::HasDate: | 247 | case OTodo::HasDate: |
247 | ev.setHasDueDate( it.data().toInt() ); | 248 | ev.setHasDueDate( it.data().toInt() ); |
248 | break; | 249 | break; |
249 | case OTodo::Completed: | 250 | case OTodo::Completed: |
250 | ev.setCompleted( it.data().toInt() ); | 251 | ev.setCompleted( it.data().toInt() ); |
251 | break; | 252 | break; |
252 | case OTodo::Description: | 253 | case OTodo::Description: |
253 | ev.setDescription( it.data() ); | 254 | ev.setDescription( it.data() ); |
254 | break; | 255 | break; |
255 | case OTodo::Summary: | 256 | case OTodo::Summary: |
256 | ev.setSummary( it.data() ); | 257 | ev.setSummary( it.data() ); |
257 | break; | 258 | break; |
258 | case OTodo::Priority: | 259 | case OTodo::Priority: |
260 | qWarning("ParsePriority " + it.data() ); | ||
259 | ev.setPriority( it.data().toInt() ); | 261 | ev.setPriority( it.data().toInt() ); |
260 | break; | 262 | break; |
261 | case OTodo::DateDay: | 263 | case OTodo::DateDay: |
262 | day = it.data().toInt(); | 264 | day = it.data().toInt(); |
263 | break; | 265 | break; |
264 | case OTodo::DateMonth: | 266 | case OTodo::DateMonth: |
265 | month = it.data().toInt(); | 267 | month = it.data().toInt(); |
266 | break; | 268 | break; |
267 | case OTodo::DateYear: | 269 | case OTodo::DateYear: |
268 | year = it.data().toInt(); | 270 | year = it.data().toInt(); |
269 | break; | 271 | break; |
270 | case OTodo::Progress: | 272 | case OTodo::Progress: |
271 | ev.setProgress( it.data().toInt() ); | 273 | ev.setProgress( it.data().toInt() ); |
272 | break; | 274 | break; |
273 | case OTodo::CrossReference: | 275 | case OTodo::CrossReference: |
274 | { | 276 | { |
275 | /* | 277 | /* |
276 | * A cross refernce looks like | 278 | * A cross refernce looks like |
277 | * appname,id;appname,id | 279 | * appname,id;appname,id |
278 | * we need to split it up | 280 | * we need to split it up |
279 | */ | 281 | */ |
280 | QStringList refs = QStringList::split(';', it.data() ); | 282 | QStringList refs = QStringList::split(';', it.data() ); |
281 | QStringList::Iterator strIt; | 283 | QStringList::Iterator strIt; |
282 | for (strIt = refs.begin(); strIt != refs.end(); ++strIt ) { | 284 | for (strIt = refs.begin(); strIt != refs.end(); ++strIt ) { |
283 | int pos = (*strIt).find(','); | 285 | int pos = (*strIt).find(','); |
284 | if ( pos > -1 ) | 286 | if ( pos > -1 ) |
285 | ev.addRelation( (*strIt).left(pos), (*strIt).mid(pos+1).toInt() ); | 287 | ev.addRelation( (*strIt).left(pos), (*strIt).mid(pos+1).toInt() ); |
286 | 288 | ||
287 | } | 289 | } |
288 | break; | 290 | break; |
289 | } | 291 | } |
290 | case OTodo::HasAlarmDateTime: | 292 | case OTodo::HasAlarmDateTime: |
@@ -335,32 +337,175 @@ QString OTodoAccessXML::toString( const OTodo& ev )const { | |||
335 | */ | 337 | */ |
336 | /* | 338 | /* |
337 | QMap<QString, QString> extras = ev.extras(); | 339 | QMap<QString, QString> extras = ev.extras(); |
338 | QMap<QString, QString>::Iterator extIt; | 340 | QMap<QString, QString>::Iterator extIt; |
339 | for (extIt = extras.begin(); extIt != extras.end(); ++extIt ) | 341 | for (extIt = extras.begin(); extIt != extras.end(); ++extIt ) |
340 | str += extIt.key() + "=\"" + extIt.data() + "\" "; | 342 | str += extIt.key() + "=\"" + extIt.data() + "\" "; |
341 | */ | 343 | */ |
342 | // cross refernce | 344 | // cross refernce |
343 | QStringList list = ev.relatedApps(); | 345 | QStringList list = ev.relatedApps(); |
344 | QStringList::Iterator listIt; | 346 | QStringList::Iterator listIt; |
345 | QString refs; | 347 | QString refs; |
346 | str += "CrossReference=\""; | 348 | str += "CrossReference=\""; |
347 | bool added = false; | 349 | bool added = false; |
348 | for ( listIt = list.begin(); listIt != list.end(); ++listIt ) { | 350 | for ( listIt = list.begin(); listIt != list.end(); ++listIt ) { |
349 | added = true; | 351 | added = true; |
350 | QArray<int> ints = ev.relations( (*listIt) ); | 352 | QArray<int> ints = ev.relations( (*listIt) ); |
351 | for ( uint i = 0; i< ints.count(); i++ ) { | 353 | for ( uint i = 0; i< ints.count(); i++ ) { |
352 | str += (*listIt) + "," + QString::number( i ) + ";"; | 354 | str += (*listIt) + "," + QString::number( i ) + ";"; |
353 | } | 355 | } |
354 | } | 356 | } |
355 | if ( added ) | 357 | if ( added ) |
356 | str = str.remove( str.length()-1, 1 ); | 358 | str = str.remove( str.length()-1, 1 ); |
357 | 359 | ||
358 | str += "\" "; | 360 | str += "\" "; |
359 | 361 | ||
360 | str += "AlarmDateTime=\"" + TimeConversion::toISO8601( ev.alarmDateTime() ) + "\" "; | 362 | str += "AlarmDateTime=\"" + TimeConversion::toISO8601( ev.alarmDateTime() ) + "\" "; |
361 | 363 | ||
362 | return str; | 364 | return str; |
363 | } | 365 | } |
364 | QString OTodoAccessXML::toString( const QArray<int>& ints ) const { | 366 | QString OTodoAccessXML::toString( const QArray<int>& ints ) const { |
365 | return Qtopia::Record::idsToString( ints ); | 367 | return Qtopia::Record::idsToString( ints ); |
366 | } | 368 | } |
369 | |||
370 | /* internal class for sorting */ | ||
371 | |||
372 | struct OTodoXMLContainer { | ||
373 | OTodo todo; | ||
374 | }; | ||
375 | /* | ||
376 | * Returns: | ||
377 | * 0 if item1 == item2 | ||
378 | * | ||
379 | * non-zero if item1 != item2 | ||
380 | * | ||
381 | * This function returns int rather than bool so that reimplementations | ||
382 | * can return one of three values and use it to sort by: | ||
383 | * | ||
384 | * 0 if item1 == item2 | ||
385 | * | ||
386 | * > 0 (positive integer) if item1 > item2 | ||
387 | * | ||
388 | * < 0 (negative integer) if item1 < item2 | ||
389 | * | ||
390 | */ | ||
391 | class OTodoXMLVector : public QVector<OTodoXMLContainer> { | ||
392 | public: | ||
393 | OTodoXMLVector(int size, bool asc, int sort) | ||
394 | : QVector<OTodoXMLContainer>( size ) | ||
395 | { | ||
396 | setAutoDelete( true ); | ||
397 | m_asc = asc; | ||
398 | m_sort = sort; | ||
399 | } | ||
400 | /* return the summary/description */ | ||
401 | QString string( const OTodo& todo) { | ||
402 | return todo.summary().isEmpty() ? | ||
403 | todo.description().left(20 ) : | ||
404 | todo.summary(); | ||
405 | } | ||
406 | /** | ||
407 | * we take the sortorder( switch on it ) | ||
408 | * | ||
409 | */ | ||
410 | int compareItems( Item d1, Item d2 ) { | ||
411 | qWarning("compare items"); | ||
412 | int ret =0; | ||
413 | OTodoXMLContainer* con1 = (OTodoXMLContainer*)d1; | ||
414 | OTodoXMLContainer* con2 = (OTodoXMLContainer*)d2; | ||
415 | |||
416 | /* same item */ | ||
417 | if ( con1->todo.uid() == con2->todo.uid() ) | ||
418 | return 0; | ||
419 | qWarning("m_sort %d", m_sort ); | ||
420 | |||
421 | switch ( m_sort ) { | ||
422 | /* completed */ | ||
423 | case 0: { | ||
424 | ret = 0; | ||
425 | if ( con1->todo.isCompleted() ) ret++; | ||
426 | if ( con2->todo.isCompleted() ) ret--; | ||
427 | break; | ||
428 | } | ||
429 | /* priority */ | ||
430 | case 1: { | ||
431 | ret = con1->todo.priority() - con2->todo.priority(); | ||
432 | qWarning(" priority %d %d %d", ret, | ||
433 | con1->todo.priority(), | ||
434 | con2->todo.priority() | ||
435 | ); | ||
436 | break; | ||
437 | } | ||
438 | /* description */ | ||
439 | case 2: { | ||
440 | QString str1 = string( con1->todo ); | ||
441 | QString str2 = string( con2->todo ); | ||
442 | ret = QString::compare( str1, str2 ); | ||
443 | break; | ||
444 | } | ||
445 | /* deadline */ | ||
446 | case 3: { | ||
447 | /* either bot got a dueDate | ||
448 | * or one of them got one | ||
449 | */ | ||
450 | if ( con1->todo.hasDueDate() && | ||
451 | con2->todo.hasDueDate() ) | ||
452 | ret = con1->todo.dueDate().daysTo( con2->todo.dueDate() ); | ||
453 | else if ( con1->todo.hasDueDate() ) | ||
454 | ret = -1; | ||
455 | else if ( con2->todo.hasDueDate() ) | ||
456 | ret = 0; | ||
457 | break; | ||
458 | } | ||
459 | default: | ||
460 | ret = 0; | ||
461 | break; | ||
462 | }; | ||
463 | |||
464 | /* twist it we're not ascending*/ | ||
465 | if (!m_asc) | ||
466 | ret = ret * -1; | ||
467 | return ret; | ||
468 | } | ||
469 | private: | ||
470 | bool m_asc; | ||
471 | int m_sort; | ||
472 | |||
473 | }; | ||
474 | |||
475 | QArray<int> OTodoAccessXML::sorted( bool asc, int sortOrder, | ||
476 | int sortFilter, int cat ) { | ||
477 | OTodoXMLVector vector(m_events.count(), asc,sortOrder ); | ||
478 | QMap<int, OTodo>::Iterator it; | ||
479 | int item = 0; | ||
480 | |||
481 | bool bCat = sortFilter & 1 ? true : false; | ||
482 | bool bOver = sortFilter & 0 ? true : false; | ||
483 | bool bOnly = split & 2 ? true : false; | ||
484 | for ( it = m_events.begin(); it != m_events.end(); ++it ) { | ||
485 | |||
486 | /* show category */ | ||
487 | if ( bCat ) | ||
488 | if (!(*it).categories().contains( cat ) ) | ||
489 | continue; | ||
490 | /* isOverdue but we should not show overdue */ | ||
491 | if ( (*it).isOverdue() && ( !bOver || !bOnly ) ) | ||
492 | continue; | ||
493 | if ( !(*it).isOverdue() && bOnly ) | ||
494 | continue; | ||
495 | |||
496 | |||
497 | OTodoXMLContainer* con = new OTodoXMLContainer(); | ||
498 | con->todo = (*it); | ||
499 | vector.insert(item, con ); | ||
500 | item++; | ||
501 | } | ||
502 | vector.resize( item ); | ||
503 | /* sort it now */ | ||
504 | vector.sort(); | ||
505 | /* now get the uids */ | ||
506 | QArray<int> array( vector.count() ); | ||
507 | for (uint i= 0; i < vector.count(); i++ ) { | ||
508 | array[i] = ( vector.at(i) )->todo.uid(); | ||
509 | } | ||
510 | return array; | ||
511 | }; | ||
diff --git a/libopie/pim/otodoaccessxml.h b/libopie/pim/otodoaccessxml.h index be9109d..6886bab 100644 --- a/libopie/pim/otodoaccessxml.h +++ b/libopie/pim/otodoaccessxml.h | |||
@@ -7,47 +7,49 @@ | |||
7 | #include "otodoaccessbackend.h" | 7 | #include "otodoaccessbackend.h" |
8 | 8 | ||
9 | namespace Opie { | 9 | namespace Opie { |
10 | class XMLElement; | 10 | class XMLElement; |
11 | }; | 11 | }; |
12 | 12 | ||
13 | class OTodoAccessXML : public OTodoAccessBackend { | 13 | class OTodoAccessXML : public OTodoAccessBackend { |
14 | public: | 14 | public: |
15 | /** | 15 | /** |
16 | * fileName if Empty we will use the default path | 16 | * fileName if Empty we will use the default path |
17 | */ | 17 | */ |
18 | OTodoAccessXML( const QString& appName, | 18 | OTodoAccessXML( const QString& appName, |
19 | const QString& fileName = QString::null ); | 19 | const QString& fileName = QString::null ); |
20 | ~OTodoAccessXML(); | 20 | ~OTodoAccessXML(); |
21 | 21 | ||
22 | bool load(); | 22 | bool load(); |
23 | bool reload(); | 23 | bool reload(); |
24 | bool save(); | 24 | bool save(); |
25 | 25 | ||
26 | QArray<int> allRecords()const; | 26 | QArray<int> allRecords()const; |
27 | QArray<int> queryByExample( const OTodo&, int sort ); | 27 | QArray<int> queryByExample( const OTodo&, int sort ); |
28 | OTodo find( int uid )const; | 28 | OTodo find( int uid )const; |
29 | void clear(); | 29 | void clear(); |
30 | bool add( const OTodo& ); | 30 | bool add( const OTodo& ); |
31 | bool remove( int uid ); | 31 | bool remove( int uid ); |
32 | bool replace( const OTodo& ); | 32 | bool replace( const OTodo& ); |
33 | 33 | ||
34 | /* our functions */ | 34 | /* our functions */ |
35 | QArray<int> effectiveToDos( const QDate& start, | 35 | QArray<int> effectiveToDos( const QDate& start, |
36 | const QDate& end, | 36 | const QDate& end, |
37 | bool includeNoDates ); | 37 | bool includeNoDates ); |
38 | QArray<int> overDue(); | 38 | QArray<int> overDue(); |
39 | QArray<int> sorted( bool asc, int sortOrder, | ||
40 | int sortFilter, int cat ); | ||
39 | private: | 41 | private: |
40 | OTodo todo( QAsciiDict<int>*, Opie::XMLElement* )const; | 42 | OTodo todo( QAsciiDict<int>*, Opie::XMLElement* )const; |
41 | QString toString( const OTodo& )const; | 43 | QString toString( const OTodo& )const; |
42 | QString toString( const QArray<int>& ints ) const; | 44 | QString toString( const QArray<int>& ints ) const; |
43 | QMap<int, OTodo> m_events; | 45 | QMap<int, OTodo> m_events; |
44 | QString m_file; | 46 | QString m_file; |
45 | QString m_app; | 47 | QString m_app; |
46 | bool m_opened : 1; | 48 | bool m_opened : 1; |
47 | bool m_changed : 1; | 49 | bool m_changed : 1; |
48 | class OTodoAccessXMLPrivate; | 50 | class OTodoAccessXMLPrivate; |
49 | OTodoAccessXMLPrivate* d; | 51 | OTodoAccessXMLPrivate* d; |
50 | 52 | ||
51 | }; | 53 | }; |
52 | 54 | ||
53 | #endif | 55 | #endif |
diff --git a/libopie2/opiepim/backend/otodoaccessbackend.h b/libopie2/opiepim/backend/otodoaccessbackend.h index ebe2189..3bad6b7 100644 --- a/libopie2/opiepim/backend/otodoaccessbackend.h +++ b/libopie2/opiepim/backend/otodoaccessbackend.h | |||
@@ -1,18 +1,20 @@ | |||
1 | #ifndef OPIE_TODO_ACCESS_BACKEND_H | 1 | #ifndef OPIE_TODO_ACCESS_BACKEND_H |
2 | #define OPIE_TODO_ACCESS_BACKEND_H | 2 | #define OPIE_TODO_ACCESS_BACKEND_H |
3 | 3 | ||
4 | #include "otodo.h" | 4 | #include "otodo.h" |
5 | #include "opimaccessbackend.h" | 5 | #include "opimaccessbackend.h" |
6 | 6 | ||
7 | class OTodoAccessBackend : public OPimAccessBackend<OTodo> { | 7 | class OTodoAccessBackend : public OPimAccessBackend<OTodo> { |
8 | public: | 8 | public: |
9 | OTodoAccessBackend(); | 9 | OTodoAccessBackend(); |
10 | ~OTodoAccessBackend(); | 10 | ~OTodoAccessBackend(); |
11 | virtual QArray<int> effectiveToDos( const QDate& start, | 11 | virtual QArray<int> effectiveToDos( const QDate& start, |
12 | const QDate& end, | 12 | const QDate& end, |
13 | bool includeNoDates ) = 0; | 13 | bool includeNoDates ) = 0; |
14 | virtual QArray<int> overDue() = 0; | 14 | virtual QArray<int> overDue() = 0; |
15 | virtual QArray<int> sorted( bool asc, int sortOrder, int sortFilter, | ||
16 | int cat ) = 0; | ||
15 | 17 | ||
16 | }; | 18 | }; |
17 | 19 | ||
18 | #endif | 20 | #endif |
diff --git a/libopie2/opiepim/backend/otodoaccessxml.cpp b/libopie2/opiepim/backend/otodoaccessxml.cpp index 5fe733c..692483e 100644 --- a/libopie2/opiepim/backend/otodoaccessxml.cpp +++ b/libopie2/opiepim/backend/otodoaccessxml.cpp | |||
@@ -1,33 +1,34 @@ | |||
1 | #include <qfile.h> | 1 | #include <qfile.h> |
2 | #include <qvector.h> | ||
2 | 3 | ||
3 | #include <qpe/global.h> | 4 | #include <qpe/global.h> |
4 | #include <qpe/stringutil.h> | 5 | #include <qpe/stringutil.h> |
5 | #include <qpe/timeconversion.h> | 6 | #include <qpe/timeconversion.h> |
6 | 7 | ||
7 | #include <opie/xmltree.h> | 8 | #include <opie/xmltree.h> |
8 | 9 | ||
9 | #include "otodoaccessxml.h" | 10 | #include "otodoaccessxml.h" |
10 | 11 | ||
11 | OTodoAccessXML::OTodoAccessXML( const QString& appName, | 12 | OTodoAccessXML::OTodoAccessXML( const QString& appName, |
12 | const QString& fileName ) | 13 | const QString& fileName ) |
13 | : OTodoAccessBackend(), m_app( appName ), m_opened( false ), m_changed( false ) | 14 | : OTodoAccessBackend(), m_app( appName ), m_opened( false ), m_changed( false ) |
14 | { | 15 | { |
15 | if (!fileName.isEmpty() ) | 16 | if (!fileName.isEmpty() ) |
16 | m_file = fileName; | 17 | m_file = fileName; |
17 | else | 18 | else |
18 | m_file = Global::applicationFileName( "todolist", "todolist.xml" ); | 19 | m_file = Global::applicationFileName( "todolist", "todolist.xml" ); |
19 | } | 20 | } |
20 | OTodoAccessXML::~OTodoAccessXML() { | 21 | OTodoAccessXML::~OTodoAccessXML() { |
21 | 22 | ||
22 | } | 23 | } |
23 | bool OTodoAccessXML::load() { | 24 | bool OTodoAccessXML::load() { |
24 | m_opened = true; | 25 | m_opened = true; |
25 | m_changed = false; | 26 | m_changed = false; |
26 | /* initialize dict */ | 27 | /* initialize dict */ |
27 | /* | 28 | /* |
28 | * UPDATE dict if you change anything!!! | 29 | * UPDATE dict if you change anything!!! |
29 | */ | 30 | */ |
30 | QAsciiDict<int> dict(15); | 31 | QAsciiDict<int> dict(15); |
31 | dict.setAutoDelete( TRUE ); | 32 | dict.setAutoDelete( TRUE ); |
32 | dict.insert("Categories" , new int(OTodo::Category) ); | 33 | dict.insert("Categories" , new int(OTodo::Category) ); |
33 | dict.insert("Uid" , new int(OTodo::Uid) ); | 34 | dict.insert("Uid" , new int(OTodo::Uid) ); |
@@ -227,64 +228,65 @@ OTodo OTodoAccessXML::todo( QAsciiDict<int>* dict, Opie::XMLElement* element)con | |||
227 | 228 | ||
228 | int *find=0; | 229 | int *find=0; |
229 | int day, month, year; | 230 | int day, month, year; |
230 | day = month = year = -1; | 231 | day = month = year = -1; |
231 | for ( it = attributes.begin(); it != attributes.end(); ++it ) { | 232 | for ( it = attributes.begin(); it != attributes.end(); ++it ) { |
232 | find = (*dict)[ it.key() ]; | 233 | find = (*dict)[ it.key() ]; |
233 | if (!find ) { | 234 | if (!find ) { |
234 | // qWarning("Unknown option" + it.key() ); | 235 | // qWarning("Unknown option" + it.key() ); |
235 | ev.setCustomField( it.key(), it.data() ); | 236 | ev.setCustomField( it.key(), it.data() ); |
236 | continue; | 237 | continue; |
237 | } | 238 | } |
238 | 239 | ||
239 | switch( *find ) { | 240 | switch( *find ) { |
240 | case OTodo::Uid: | 241 | case OTodo::Uid: |
241 | ev.setUid( it.data().toInt() ); | 242 | ev.setUid( it.data().toInt() ); |
242 | break; | 243 | break; |
243 | case OTodo::Category: | 244 | case OTodo::Category: |
244 | ev.setCategories( ev.idsFromString( it.data() ) ); | 245 | ev.setCategories( ev.idsFromString( it.data() ) ); |
245 | break; | 246 | break; |
246 | case OTodo::HasDate: | 247 | case OTodo::HasDate: |
247 | ev.setHasDueDate( it.data().toInt() ); | 248 | ev.setHasDueDate( it.data().toInt() ); |
248 | break; | 249 | break; |
249 | case OTodo::Completed: | 250 | case OTodo::Completed: |
250 | ev.setCompleted( it.data().toInt() ); | 251 | ev.setCompleted( it.data().toInt() ); |
251 | break; | 252 | break; |
252 | case OTodo::Description: | 253 | case OTodo::Description: |
253 | ev.setDescription( it.data() ); | 254 | ev.setDescription( it.data() ); |
254 | break; | 255 | break; |
255 | case OTodo::Summary: | 256 | case OTodo::Summary: |
256 | ev.setSummary( it.data() ); | 257 | ev.setSummary( it.data() ); |
257 | break; | 258 | break; |
258 | case OTodo::Priority: | 259 | case OTodo::Priority: |
260 | qWarning("ParsePriority " + it.data() ); | ||
259 | ev.setPriority( it.data().toInt() ); | 261 | ev.setPriority( it.data().toInt() ); |
260 | break; | 262 | break; |
261 | case OTodo::DateDay: | 263 | case OTodo::DateDay: |
262 | day = it.data().toInt(); | 264 | day = it.data().toInt(); |
263 | break; | 265 | break; |
264 | case OTodo::DateMonth: | 266 | case OTodo::DateMonth: |
265 | month = it.data().toInt(); | 267 | month = it.data().toInt(); |
266 | break; | 268 | break; |
267 | case OTodo::DateYear: | 269 | case OTodo::DateYear: |
268 | year = it.data().toInt(); | 270 | year = it.data().toInt(); |
269 | break; | 271 | break; |
270 | case OTodo::Progress: | 272 | case OTodo::Progress: |
271 | ev.setProgress( it.data().toInt() ); | 273 | ev.setProgress( it.data().toInt() ); |
272 | break; | 274 | break; |
273 | case OTodo::CrossReference: | 275 | case OTodo::CrossReference: |
274 | { | 276 | { |
275 | /* | 277 | /* |
276 | * A cross refernce looks like | 278 | * A cross refernce looks like |
277 | * appname,id;appname,id | 279 | * appname,id;appname,id |
278 | * we need to split it up | 280 | * we need to split it up |
279 | */ | 281 | */ |
280 | QStringList refs = QStringList::split(';', it.data() ); | 282 | QStringList refs = QStringList::split(';', it.data() ); |
281 | QStringList::Iterator strIt; | 283 | QStringList::Iterator strIt; |
282 | for (strIt = refs.begin(); strIt != refs.end(); ++strIt ) { | 284 | for (strIt = refs.begin(); strIt != refs.end(); ++strIt ) { |
283 | int pos = (*strIt).find(','); | 285 | int pos = (*strIt).find(','); |
284 | if ( pos > -1 ) | 286 | if ( pos > -1 ) |
285 | ev.addRelation( (*strIt).left(pos), (*strIt).mid(pos+1).toInt() ); | 287 | ev.addRelation( (*strIt).left(pos), (*strIt).mid(pos+1).toInt() ); |
286 | 288 | ||
287 | } | 289 | } |
288 | break; | 290 | break; |
289 | } | 291 | } |
290 | case OTodo::HasAlarmDateTime: | 292 | case OTodo::HasAlarmDateTime: |
@@ -335,32 +337,175 @@ QString OTodoAccessXML::toString( const OTodo& ev )const { | |||
335 | */ | 337 | */ |
336 | /* | 338 | /* |
337 | QMap<QString, QString> extras = ev.extras(); | 339 | QMap<QString, QString> extras = ev.extras(); |
338 | QMap<QString, QString>::Iterator extIt; | 340 | QMap<QString, QString>::Iterator extIt; |
339 | for (extIt = extras.begin(); extIt != extras.end(); ++extIt ) | 341 | for (extIt = extras.begin(); extIt != extras.end(); ++extIt ) |
340 | str += extIt.key() + "=\"" + extIt.data() + "\" "; | 342 | str += extIt.key() + "=\"" + extIt.data() + "\" "; |
341 | */ | 343 | */ |
342 | // cross refernce | 344 | // cross refernce |
343 | QStringList list = ev.relatedApps(); | 345 | QStringList list = ev.relatedApps(); |
344 | QStringList::Iterator listIt; | 346 | QStringList::Iterator listIt; |
345 | QString refs; | 347 | QString refs; |
346 | str += "CrossReference=\""; | 348 | str += "CrossReference=\""; |
347 | bool added = false; | 349 | bool added = false; |
348 | for ( listIt = list.begin(); listIt != list.end(); ++listIt ) { | 350 | for ( listIt = list.begin(); listIt != list.end(); ++listIt ) { |
349 | added = true; | 351 | added = true; |
350 | QArray<int> ints = ev.relations( (*listIt) ); | 352 | QArray<int> ints = ev.relations( (*listIt) ); |
351 | for ( uint i = 0; i< ints.count(); i++ ) { | 353 | for ( uint i = 0; i< ints.count(); i++ ) { |
352 | str += (*listIt) + "," + QString::number( i ) + ";"; | 354 | str += (*listIt) + "," + QString::number( i ) + ";"; |
353 | } | 355 | } |
354 | } | 356 | } |
355 | if ( added ) | 357 | if ( added ) |
356 | str = str.remove( str.length()-1, 1 ); | 358 | str = str.remove( str.length()-1, 1 ); |
357 | 359 | ||
358 | str += "\" "; | 360 | str += "\" "; |
359 | 361 | ||
360 | str += "AlarmDateTime=\"" + TimeConversion::toISO8601( ev.alarmDateTime() ) + "\" "; | 362 | str += "AlarmDateTime=\"" + TimeConversion::toISO8601( ev.alarmDateTime() ) + "\" "; |
361 | 363 | ||
362 | return str; | 364 | return str; |
363 | } | 365 | } |
364 | QString OTodoAccessXML::toString( const QArray<int>& ints ) const { | 366 | QString OTodoAccessXML::toString( const QArray<int>& ints ) const { |
365 | return Qtopia::Record::idsToString( ints ); | 367 | return Qtopia::Record::idsToString( ints ); |
366 | } | 368 | } |
369 | |||
370 | /* internal class for sorting */ | ||
371 | |||
372 | struct OTodoXMLContainer { | ||
373 | OTodo todo; | ||
374 | }; | ||
375 | /* | ||
376 | * Returns: | ||
377 | * 0 if item1 == item2 | ||
378 | * | ||
379 | * non-zero if item1 != item2 | ||
380 | * | ||
381 | * This function returns int rather than bool so that reimplementations | ||
382 | * can return one of three values and use it to sort by: | ||
383 | * | ||
384 | * 0 if item1 == item2 | ||
385 | * | ||
386 | * > 0 (positive integer) if item1 > item2 | ||
387 | * | ||
388 | * < 0 (negative integer) if item1 < item2 | ||
389 | * | ||
390 | */ | ||
391 | class OTodoXMLVector : public QVector<OTodoXMLContainer> { | ||
392 | public: | ||
393 | OTodoXMLVector(int size, bool asc, int sort) | ||
394 | : QVector<OTodoXMLContainer>( size ) | ||
395 | { | ||
396 | setAutoDelete( true ); | ||
397 | m_asc = asc; | ||
398 | m_sort = sort; | ||
399 | } | ||
400 | /* return the summary/description */ | ||
401 | QString string( const OTodo& todo) { | ||
402 | return todo.summary().isEmpty() ? | ||
403 | todo.description().left(20 ) : | ||
404 | todo.summary(); | ||
405 | } | ||
406 | /** | ||
407 | * we take the sortorder( switch on it ) | ||
408 | * | ||
409 | */ | ||
410 | int compareItems( Item d1, Item d2 ) { | ||
411 | qWarning("compare items"); | ||
412 | int ret =0; | ||
413 | OTodoXMLContainer* con1 = (OTodoXMLContainer*)d1; | ||
414 | OTodoXMLContainer* con2 = (OTodoXMLContainer*)d2; | ||
415 | |||
416 | /* same item */ | ||
417 | if ( con1->todo.uid() == con2->todo.uid() ) | ||
418 | return 0; | ||
419 | qWarning("m_sort %d", m_sort ); | ||
420 | |||
421 | switch ( m_sort ) { | ||
422 | /* completed */ | ||
423 | case 0: { | ||
424 | ret = 0; | ||
425 | if ( con1->todo.isCompleted() ) ret++; | ||
426 | if ( con2->todo.isCompleted() ) ret--; | ||
427 | break; | ||
428 | } | ||
429 | /* priority */ | ||
430 | case 1: { | ||
431 | ret = con1->todo.priority() - con2->todo.priority(); | ||
432 | qWarning(" priority %d %d %d", ret, | ||
433 | con1->todo.priority(), | ||
434 | con2->todo.priority() | ||
435 | ); | ||
436 | break; | ||
437 | } | ||
438 | /* description */ | ||
439 | case 2: { | ||
440 | QString str1 = string( con1->todo ); | ||
441 | QString str2 = string( con2->todo ); | ||
442 | ret = QString::compare( str1, str2 ); | ||
443 | break; | ||
444 | } | ||
445 | /* deadline */ | ||
446 | case 3: { | ||
447 | /* either bot got a dueDate | ||
448 | * or one of them got one | ||
449 | */ | ||
450 | if ( con1->todo.hasDueDate() && | ||
451 | con2->todo.hasDueDate() ) | ||
452 | ret = con1->todo.dueDate().daysTo( con2->todo.dueDate() ); | ||
453 | else if ( con1->todo.hasDueDate() ) | ||
454 | ret = -1; | ||
455 | else if ( con2->todo.hasDueDate() ) | ||
456 | ret = 0; | ||
457 | break; | ||
458 | } | ||
459 | default: | ||
460 | ret = 0; | ||
461 | break; | ||
462 | }; | ||
463 | |||
464 | /* twist it we're not ascending*/ | ||
465 | if (!m_asc) | ||
466 | ret = ret * -1; | ||
467 | return ret; | ||
468 | } | ||
469 | private: | ||
470 | bool m_asc; | ||
471 | int m_sort; | ||
472 | |||
473 | }; | ||
474 | |||
475 | QArray<int> OTodoAccessXML::sorted( bool asc, int sortOrder, | ||
476 | int sortFilter, int cat ) { | ||
477 | OTodoXMLVector vector(m_events.count(), asc,sortOrder ); | ||
478 | QMap<int, OTodo>::Iterator it; | ||
479 | int item = 0; | ||
480 | |||
481 | bool bCat = sortFilter & 1 ? true : false; | ||
482 | bool bOver = sortFilter & 0 ? true : false; | ||
483 | bool bOnly = split & 2 ? true : false; | ||
484 | for ( it = m_events.begin(); it != m_events.end(); ++it ) { | ||
485 | |||
486 | /* show category */ | ||
487 | if ( bCat ) | ||
488 | if (!(*it).categories().contains( cat ) ) | ||
489 | continue; | ||
490 | /* isOverdue but we should not show overdue */ | ||
491 | if ( (*it).isOverdue() && ( !bOver || !bOnly ) ) | ||
492 | continue; | ||
493 | if ( !(*it).isOverdue() && bOnly ) | ||
494 | continue; | ||
495 | |||
496 | |||
497 | OTodoXMLContainer* con = new OTodoXMLContainer(); | ||
498 | con->todo = (*it); | ||
499 | vector.insert(item, con ); | ||
500 | item++; | ||
501 | } | ||
502 | vector.resize( item ); | ||
503 | /* sort it now */ | ||
504 | vector.sort(); | ||
505 | /* now get the uids */ | ||
506 | QArray<int> array( vector.count() ); | ||
507 | for (uint i= 0; i < vector.count(); i++ ) { | ||
508 | array[i] = ( vector.at(i) )->todo.uid(); | ||
509 | } | ||
510 | return array; | ||
511 | }; | ||
diff --git a/libopie2/opiepim/backend/otodoaccessxml.h b/libopie2/opiepim/backend/otodoaccessxml.h index be9109d..6886bab 100644 --- a/libopie2/opiepim/backend/otodoaccessxml.h +++ b/libopie2/opiepim/backend/otodoaccessxml.h | |||
@@ -7,47 +7,49 @@ | |||
7 | #include "otodoaccessbackend.h" | 7 | #include "otodoaccessbackend.h" |
8 | 8 | ||
9 | namespace Opie { | 9 | namespace Opie { |
10 | class XMLElement; | 10 | class XMLElement; |
11 | }; | 11 | }; |
12 | 12 | ||
13 | class OTodoAccessXML : public OTodoAccessBackend { | 13 | class OTodoAccessXML : public OTodoAccessBackend { |
14 | public: | 14 | public: |
15 | /** | 15 | /** |
16 | * fileName if Empty we will use the default path | 16 | * fileName if Empty we will use the default path |
17 | */ | 17 | */ |
18 | OTodoAccessXML( const QString& appName, | 18 | OTodoAccessXML( const QString& appName, |
19 | const QString& fileName = QString::null ); | 19 | const QString& fileName = QString::null ); |
20 | ~OTodoAccessXML(); | 20 | ~OTodoAccessXML(); |
21 | 21 | ||
22 | bool load(); | 22 | bool load(); |
23 | bool reload(); | 23 | bool reload(); |
24 | bool save(); | 24 | bool save(); |
25 | 25 | ||
26 | QArray<int> allRecords()const; | 26 | QArray<int> allRecords()const; |
27 | QArray<int> queryByExample( const OTodo&, int sort ); | 27 | QArray<int> queryByExample( const OTodo&, int sort ); |
28 | OTodo find( int uid )const; | 28 | OTodo find( int uid )const; |
29 | void clear(); | 29 | void clear(); |
30 | bool add( const OTodo& ); | 30 | bool add( const OTodo& ); |
31 | bool remove( int uid ); | 31 | bool remove( int uid ); |
32 | bool replace( const OTodo& ); | 32 | bool replace( const OTodo& ); |
33 | 33 | ||
34 | /* our functions */ | 34 | /* our functions */ |
35 | QArray<int> effectiveToDos( const QDate& start, | 35 | QArray<int> effectiveToDos( const QDate& start, |
36 | const QDate& end, | 36 | const QDate& end, |
37 | bool includeNoDates ); | 37 | bool includeNoDates ); |
38 | QArray<int> overDue(); | 38 | QArray<int> overDue(); |
39 | QArray<int> sorted( bool asc, int sortOrder, | ||
40 | int sortFilter, int cat ); | ||
39 | private: | 41 | private: |
40 | OTodo todo( QAsciiDict<int>*, Opie::XMLElement* )const; | 42 | OTodo todo( QAsciiDict<int>*, Opie::XMLElement* )const; |
41 | QString toString( const OTodo& )const; | 43 | QString toString( const OTodo& )const; |
42 | QString toString( const QArray<int>& ints ) const; | 44 | QString toString( const QArray<int>& ints ) const; |
43 | QMap<int, OTodo> m_events; | 45 | QMap<int, OTodo> m_events; |
44 | QString m_file; | 46 | QString m_file; |
45 | QString m_app; | 47 | QString m_app; |
46 | bool m_opened : 1; | 48 | bool m_opened : 1; |
47 | bool m_changed : 1; | 49 | bool m_changed : 1; |
48 | class OTodoAccessXMLPrivate; | 50 | class OTodoAccessXMLPrivate; |
49 | OTodoAccessXMLPrivate* d; | 51 | OTodoAccessXMLPrivate* d; |
50 | 52 | ||
51 | }; | 53 | }; |
52 | 54 | ||
53 | #endif | 55 | #endif |
diff --git a/libopie2/opiepim/core/otodoaccess.cpp b/libopie2/opiepim/core/otodoaccess.cpp index 8ec09bc..f51da29 100644 --- a/libopie2/opiepim/core/otodoaccess.cpp +++ b/libopie2/opiepim/core/otodoaccess.cpp | |||
@@ -39,33 +39,39 @@ OTodoAccess::List OTodoAccess::effectiveToDos( const QDate& start, | |||
39 | OTodoAccess::List OTodoAccess::overDue() { | 39 | OTodoAccess::List OTodoAccess::overDue() { |
40 | List lis( m_todoBackEnd->overDue(), this ); | 40 | List lis( m_todoBackEnd->overDue(), this ); |
41 | return lis; | 41 | return lis; |
42 | } | 42 | } |
43 | void OTodoAccess::addAlarm( const OTodo& event) { | 43 | void OTodoAccess::addAlarm( const OTodo& event) { |
44 | if (!event.hasAlarmDateTime() ) | 44 | if (!event.hasAlarmDateTime() ) |
45 | return; | 45 | return; |
46 | 46 | ||
47 | QDateTime now = QDateTime::currentDateTime(); | 47 | QDateTime now = QDateTime::currentDateTime(); |
48 | QDateTime schedule = event.alarmDateTime(); | 48 | QDateTime schedule = event.alarmDateTime(); |
49 | 49 | ||
50 | if ( schedule > now ){ | 50 | if ( schedule > now ){ |
51 | AlarmServer::addAlarm( schedule, | 51 | AlarmServer::addAlarm( schedule, |
52 | "QPE/Application/todolist", | 52 | "QPE/Application/todolist", |
53 | "alarm(QDateTime,int)", event.uid() ); | 53 | "alarm(QDateTime,int)", event.uid() ); |
54 | 54 | ||
55 | } | 55 | } |
56 | } | 56 | } |
57 | void OTodoAccess::delAlarm( int uid) { | 57 | void OTodoAccess::delAlarm( int uid) { |
58 | 58 | ||
59 | QDateTime schedule; // Create null DateTime | 59 | QDateTime schedule; // Create null DateTime |
60 | 60 | ||
61 | // I hope this will remove all scheduled alarms | 61 | // I hope this will remove all scheduled alarms |
62 | // with the given uid !? | 62 | // with the given uid !? |
63 | // If not: I have to rethink how to remove already | 63 | // If not: I have to rethink how to remove already |
64 | // scheduled events... (se) | 64 | // scheduled events... (se) |
65 | // it should be fine -zecke | 65 | // it should be fine -zecke |
66 | // qWarning("Removing alarm for event with uid %d", uid ); | 66 | // qWarning("Removing alarm for event with uid %d", uid ); |
67 | AlarmServer::deleteAlarm( schedule , | 67 | AlarmServer::deleteAlarm( schedule , |
68 | "QPE/Application/todolist", | 68 | "QPE/Application/todolist", |
69 | "alarm(QDateTime,int)", uid ); | 69 | "alarm(QDateTime,int)", uid ); |
70 | } | 70 | } |
71 | 71 | /* sort order */ | |
72 | OTodoAccess::List OTodoAccess::sorted( bool ascending, int sort,int filter, int cat ) { | ||
73 | QArray<int> ints = m_todoBackEnd->sorted( ascending, sort, | ||
74 | filter, cat ); | ||
75 | OTodoAccess::List list( ints, this ); | ||
76 | return list; | ||
77 | } | ||
diff --git a/libopie2/opiepim/core/otodoaccess.h b/libopie2/opiepim/core/otodoaccess.h index c43efe9..12997aa 100644 --- a/libopie2/opiepim/core/otodoaccess.h +++ b/libopie2/opiepim/core/otodoaccess.h | |||
@@ -1,79 +1,93 @@ | |||
1 | #ifndef OPIE_TODO_ACCESS_H | 1 | #ifndef OPIE_TODO_ACCESS_H |
2 | #define OPIE_TODO_ACCESS_H | 2 | #define OPIE_TODO_ACCESS_H |
3 | 3 | ||
4 | #include <qobject.h> | 4 | #include <qobject.h> |
5 | #include <qvaluelist.h> | 5 | #include <qvaluelist.h> |
6 | 6 | ||
7 | #include "otodo.h" | 7 | #include "otodo.h" |
8 | #include "otodoaccessbackend.h" | 8 | #include "otodoaccessbackend.h" |
9 | #include "opimaccesstemplate.h" | 9 | #include "opimaccesstemplate.h" |
10 | 10 | ||
11 | 11 | ||
12 | /** | 12 | /** |
13 | * OTodoAccess | 13 | * OTodoAccess |
14 | * the class to get access to | 14 | * the class to get access to |
15 | * the todolist | 15 | * the todolist |
16 | */ | 16 | */ |
17 | class OTodoAccess : public QObject, public OPimAccessTemplate<OTodo> { | 17 | class OTodoAccess : public QObject, public OPimAccessTemplate<OTodo> { |
18 | Q_OBJECT | 18 | Q_OBJECT |
19 | public: | 19 | public: |
20 | enum SortOrder { Completed = 0, | ||
21 | Priority, | ||
22 | Description, | ||
23 | Deadline }; | ||
24 | enum SortFilter{ ShowOverdue = 0, | ||
25 | Category =1, | ||
26 | OnlyOverDue= 2 }; | ||
20 | /** | 27 | /** |
21 | * if you use 0l | 28 | * if you use 0l |
22 | * the default resource will be | 29 | * the default resource will be |
23 | * icked up | 30 | * picked up |
24 | */ | 31 | */ |
25 | OTodoAccess( OTodoAccessBackend* = 0l); | 32 | OTodoAccess( OTodoAccessBackend* = 0l); |
26 | ~OTodoAccess(); | 33 | ~OTodoAccess(); |
27 | 34 | ||
28 | 35 | ||
29 | /* our functions here */ | 36 | /* our functions here */ |
30 | /** | 37 | /** |
31 | * include todos from start to end | 38 | * include todos from start to end |
32 | * includeNoDates whether or not to include | 39 | * includeNoDates whether or not to include |
33 | * events with no dates | 40 | * events with no dates |
34 | */ | 41 | */ |
35 | List effectiveToDos( const QDate& start, | 42 | List effectiveToDos( const QDate& start, |
36 | const QDate& end, | 43 | const QDate& end, |
37 | bool includeNoDates = true ); | 44 | bool includeNoDates = true ); |
38 | 45 | ||
39 | /** | 46 | /** |
40 | * start | 47 | * start |
41 | * end date taken from the currentDate() | 48 | * end date taken from the currentDate() |
42 | */ | 49 | */ |
43 | List effectiveToDos( const QDate& start, | 50 | List effectiveToDos( const QDate& start, |
44 | bool includeNoDates = true ); | 51 | bool includeNoDates = true ); |
45 | 52 | ||
46 | 53 | ||
47 | /** | 54 | /** |
48 | * return overdue OTodos | 55 | * return overdue OTodos |
49 | */ | 56 | */ |
50 | List overDue(); | 57 | List overDue(); |
58 | |||
59 | /** | ||
60 | * | ||
61 | */ | ||
62 | List sorted( bool ascending, int sortOrder, int sortFilter, int cat ); | ||
63 | |||
51 | /** | 64 | /** |
52 | * merge a list of OTodos into | 65 | * merge a list of OTodos into |
53 | * the resource | 66 | * the resource |
54 | */ | 67 | */ |
55 | void mergeWith( const QValueList<OTodo>& ); | 68 | void mergeWith( const QValueList<OTodo>& ); |
56 | 69 | ||
57 | /** | 70 | /** |
58 | * add an Alarm to the AlarmServer | 71 | * add an Alarm to the AlarmServer |
59 | */ | 72 | */ |
60 | void addAlarm( const OTodo& ); | 73 | void addAlarm( const OTodo& ); |
61 | 74 | ||
62 | /** | 75 | /** |
63 | * delete an alarm with the uid from | 76 | * delete an alarm with the uid from |
64 | * the alarm server | 77 | * the alarm server |
65 | */ | 78 | */ |
66 | void delAlarm( int uid ); | 79 | void delAlarm( int uid ); |
67 | 80 | ||
68 | signals: | 81 | signals: |
69 | /** | 82 | /** |
70 | * if the OTodoAccess was changed | 83 | * if the OTodoAccess was changed |
71 | */ | 84 | */ |
72 | void signalChanged( const OTodoAccess* ); | 85 | void signalChanged( const OTodoAccess* ); |
73 | private: | 86 | private: |
87 | int m_cat; | ||
74 | OTodoAccessBackend* m_todoBackEnd; | 88 | OTodoAccessBackend* m_todoBackEnd; |
75 | class OTodoAccessPrivate; | 89 | class OTodoAccessPrivate; |
76 | OTodoAccessPrivate* d; | 90 | OTodoAccessPrivate* d; |
77 | }; | 91 | }; |
78 | 92 | ||
79 | #endif | 93 | #endif |
diff --git a/libopie2/opiepim/orecordlist.h b/libopie2/opiepim/orecordlist.h index c63d813..1fd0741 100644 --- a/libopie2/opiepim/orecordlist.h +++ b/libopie2/opiepim/orecordlist.h | |||
@@ -17,165 +17,166 @@ | |||
17 | template <class T> class ORecordList; | 17 | template <class T> class ORecordList; |
18 | template <class T = OPimRecord> | 18 | template <class T = OPimRecord> |
19 | class ORecordListIterator { | 19 | class ORecordListIterator { |
20 | friend class ORecordList<T>; | 20 | friend class ORecordList<T>; |
21 | public: | 21 | public: |
22 | typedef OTemplateBase<T> Base; | 22 | typedef OTemplateBase<T> Base; |
23 | 23 | ||
24 | /** | 24 | /** |
25 | * The c'tor used internally from | 25 | * The c'tor used internally from |
26 | * ORecordList | 26 | * ORecordList |
27 | */ | 27 | */ |
28 | ORecordListIterator( const QArray<int>, const Base* ); | 28 | ORecordListIterator( const QArray<int>, const Base* ); |
29 | 29 | ||
30 | /** | 30 | /** |
31 | * The standard c'tor | 31 | * The standard c'tor |
32 | */ | 32 | */ |
33 | ORecordListIterator(); | 33 | ORecordListIterator(); |
34 | ~ORecordListIterator(); | 34 | ~ORecordListIterator(); |
35 | 35 | ||
36 | ORecordListIterator( const ORecordListIterator& ); | 36 | ORecordListIterator( const ORecordListIterator& ); |
37 | ORecordListIterator &operator=(const ORecordListIterator& ); | 37 | ORecordListIterator &operator=(const ORecordListIterator& ); |
38 | 38 | ||
39 | /** | 39 | /** |
40 | * a * operator ;) | 40 | * a * operator ;) |
41 | * use it like this T = (*it); | 41 | * use it like this T = (*it); |
42 | */ | 42 | */ |
43 | T operator*(); | 43 | T operator*(); |
44 | ORecordListIterator &operator++(); | 44 | ORecordListIterator &operator++(); |
45 | ORecordListIterator &operator--(); | 45 | ORecordListIterator &operator--(); |
46 | 46 | ||
47 | bool operator==( const ORecordListIterator& it ); | 47 | bool operator==( const ORecordListIterator& it ); |
48 | bool operator!=( const ORecordListIterator& it ); | 48 | bool operator!=( const ORecordListIterator& it ); |
49 | 49 | ||
50 | /** | 50 | /** |
51 | * the current item | 51 | * the current item |
52 | */ | 52 | */ |
53 | uint current()const; | 53 | uint current()const; |
54 | 54 | ||
55 | /** | 55 | /** |
56 | * the number of items | 56 | * the number of items |
57 | */ | 57 | */ |
58 | uint count()const; | 58 | uint count()const; |
59 | 59 | ||
60 | /** | 60 | /** |
61 | * sets the current item | 61 | * sets the current item |
62 | */ | 62 | */ |
63 | void setCurrent( uint cur ); | 63 | void setCurrent( uint cur ); |
64 | 64 | ||
65 | private: | 65 | private: |
66 | QArray<int> m_uids; | 66 | QArray<int> m_uids; |
67 | uint m_current; | 67 | uint m_current; |
68 | const Base* m_temp; | 68 | const Base* m_temp; |
69 | bool m_end : 1; | 69 | bool m_end : 1; |
70 | T m_record; | 70 | T m_record; |
71 | 71 | ||
72 | /* d pointer for future versions */ | 72 | /* d pointer for future versions */ |
73 | class IteratorPrivate; | 73 | class IteratorPrivate; |
74 | IteratorPrivate *d; | 74 | IteratorPrivate *d; |
75 | }; | 75 | }; |
76 | /** | 76 | /** |
77 | * The recordlist used as a return type | 77 | * The recordlist used as a return type |
78 | * from OPimAccessTemplate | 78 | * from OPimAccessTemplate |
79 | */ | 79 | */ |
80 | template <class T = OPimRecord > | 80 | template <class T = OPimRecord > |
81 | class ORecordList { | 81 | class ORecordList { |
82 | public: | 82 | public: |
83 | typedef OTemplateBase<T> Base; | 83 | typedef OTemplateBase<T> Base; |
84 | typedef ORecordListIterator<T> Iterator; | 84 | typedef ORecordListIterator<T> Iterator; |
85 | 85 | ||
86 | /** | 86 | /** |
87 | * c'tor | 87 | * c'tor |
88 | */ | 88 | */ |
89 | ORecordList () { | 89 | ORecordList () { |
90 | } | 90 | } |
91 | ORecordList( const QArray<int>& ids, | 91 | ORecordList( const QArray<int>& ids, |
92 | const Base* ); | 92 | const Base* ); |
93 | ~ORecordList(); | 93 | ~ORecordList(); |
94 | 94 | ||
95 | /** | 95 | /** |
96 | * the first iterator | 96 | * the first iterator |
97 | */ | 97 | */ |
98 | Iterator begin(); | 98 | Iterator begin(); |
99 | 99 | ||
100 | /** | 100 | /** |
101 | * the end | 101 | * the end |
102 | */ | 102 | */ |
103 | Iterator end(); | 103 | Iterator end(); |
104 | 104 | ||
105 | /** | 105 | /** |
106 | * the number of items in the list | 106 | * the number of items in the list |
107 | */ | 107 | */ |
108 | uint count()const; | 108 | uint count()const; |
109 | 109 | ||
110 | T operator[]( uint i ); | ||
110 | // FIXME implemenent remove | 111 | // FIXME implemenent remove |
111 | /* | 112 | /* |
112 | ConstIterator begin()const; | 113 | ConstIterator begin()const; |
113 | ConstIterator end()const; | 114 | ConstIterator end()const; |
114 | */ | 115 | */ |
115 | private: | 116 | private: |
116 | QArray<int> m_ids; | 117 | QArray<int> m_ids; |
117 | const Base* m_acc; | 118 | const Base* m_acc; |
118 | }; | 119 | }; |
119 | 120 | ||
120 | /* ok now implement it */ | 121 | /* ok now implement it */ |
121 | template <class T> | 122 | template <class T> |
122 | ORecordListIterator<T>::ORecordListIterator() { | 123 | ORecordListIterator<T>::ORecordListIterator() { |
123 | m_current = 0; | 124 | m_current = 0; |
124 | m_temp = 0l; | 125 | m_temp = 0l; |
125 | m_end = true; | 126 | m_end = true; |
126 | m_record = T(); | 127 | m_record = T(); |
127 | } | 128 | } |
128 | template <class T> | 129 | template <class T> |
129 | ORecordListIterator<T>::~ORecordListIterator() { | 130 | ORecordListIterator<T>::~ORecordListIterator() { |
130 | /* nothing to delete */ | 131 | /* nothing to delete */ |
131 | } | 132 | } |
132 | 133 | ||
133 | template <class T> | 134 | template <class T> |
134 | ORecordListIterator<T>::ORecordListIterator( const ORecordListIterator<T>& it) { | 135 | ORecordListIterator<T>::ORecordListIterator( const ORecordListIterator<T>& it) { |
135 | // qWarning("ORecordListIterator copy c'tor"); | 136 | // qWarning("ORecordListIterator copy c'tor"); |
136 | m_uids = it.m_uids; | 137 | m_uids = it.m_uids; |
137 | m_current = it.m_current; | 138 | m_current = it.m_current; |
138 | m_temp = it.m_temp; | 139 | m_temp = it.m_temp; |
139 | m_end = it.m_end; | 140 | m_end = it.m_end; |
140 | m_record = it.m_record; | 141 | m_record = it.m_record; |
141 | } | 142 | } |
142 | 143 | ||
143 | template <class T> | 144 | template <class T> |
144 | ORecordListIterator<T> &ORecordListIterator<T>::operator=( const ORecordListIterator<T>& it) { | 145 | ORecordListIterator<T> &ORecordListIterator<T>::operator=( const ORecordListIterator<T>& it) { |
145 | m_uids = it.m_uids; | 146 | m_uids = it.m_uids; |
146 | m_current = it.m_current; | 147 | m_current = it.m_current; |
147 | m_temp = it.m_temp; | 148 | m_temp = it.m_temp; |
148 | m_end = it.m_end; | 149 | m_end = it.m_end; |
149 | // m_record = it.m_record; | 150 | m_record = it.m_record; |
150 | 151 | ||
151 | return *this; | 152 | return *this; |
152 | } | 153 | } |
153 | 154 | ||
154 | template <class T> | 155 | template <class T> |
155 | T ORecordListIterator<T>::operator*() { | 156 | T ORecordListIterator<T>::operator*() { |
156 | // qWarning("operator* %d %d", m_current, m_uids[m_current] ); | 157 | // qWarning("operator* %d %d", m_current, m_uids[m_current] ); |
157 | if (!m_end ) | 158 | if (!m_end ) |
158 | /* FIXME | 159 | /* FIXME |
159 | * until the cache is in place | 160 | * until the cache is in place |
160 | * we do the uid match uid check | 161 | * we do the uid match uid check |
161 | */ | 162 | */ |
162 | if(m_record.uid() != m_uids[m_current] ) | 163 | if(m_record.uid() != m_uids[m_current] ) |
163 | m_record = m_temp->find( m_uids[m_current] ); | 164 | m_record = m_temp->find( m_uids[m_current] ); |
164 | else | 165 | else |
165 | m_record = T(); | 166 | m_record = T(); |
166 | 167 | ||
167 | return m_record; | 168 | return m_record; |
168 | } | 169 | } |
169 | 170 | ||
170 | template <class T> | 171 | template <class T> |
171 | ORecordListIterator<T> &ORecordListIterator<T>::operator++() { | 172 | ORecordListIterator<T> &ORecordListIterator<T>::operator++() { |
172 | if (m_current < m_uids.count() ) { | 173 | if (m_current < m_uids.count() ) { |
173 | m_end = false; | 174 | m_end = false; |
174 | ++m_current; | 175 | ++m_current; |
175 | }else | 176 | }else |
176 | m_end = true; | 177 | m_end = true; |
177 | 178 | ||
178 | return *this; | 179 | return *this; |
179 | } | 180 | } |
180 | template <class T> | 181 | template <class T> |
181 | ORecordListIterator<T> &ORecordListIterator<T>::operator--() { | 182 | ORecordListIterator<T> &ORecordListIterator<T>::operator--() { |
@@ -223,33 +224,37 @@ void ORecordListIterator<T>::setCurrent( uint cur ) { | |||
223 | } | 224 | } |
224 | template <class T> | 225 | template <class T> |
225 | uint ORecordListIterator<T>::count()const { | 226 | uint ORecordListIterator<T>::count()const { |
226 | return m_uids.count(); | 227 | return m_uids.count(); |
227 | } | 228 | } |
228 | template <class T> | 229 | template <class T> |
229 | ORecordList<T>::ORecordList( const QArray<int>& ids, | 230 | ORecordList<T>::ORecordList( const QArray<int>& ids, |
230 | const Base* acc ) | 231 | const Base* acc ) |
231 | : m_ids( ids ), m_acc( acc ) | 232 | : m_ids( ids ), m_acc( acc ) |
232 | { | 233 | { |
233 | } | 234 | } |
234 | template <class T> | 235 | template <class T> |
235 | ORecordList<T>::~ORecordList() { | 236 | ORecordList<T>::~ORecordList() { |
236 | /* nothing to do here */ | 237 | /* nothing to do here */ |
237 | } | 238 | } |
238 | template <class T> | 239 | template <class T> |
239 | ORecordList<T>::Iterator ORecordList<T>::begin() { | 240 | ORecordList<T>::Iterator ORecordList<T>::begin() { |
240 | Iterator it( m_ids, m_acc ); | 241 | Iterator it( m_ids, m_acc ); |
241 | return it; | 242 | return it; |
242 | } | 243 | } |
243 | template <class T> | 244 | template <class T> |
244 | ORecordList<T>::Iterator ORecordList<T>::end() { | 245 | ORecordList<T>::Iterator ORecordList<T>::end() { |
245 | Iterator it( m_ids, m_acc ); | 246 | Iterator it( m_ids, m_acc ); |
246 | it.m_end = true; | 247 | it.m_end = true; |
247 | it.m_current = m_ids.count(); | 248 | it.m_current = m_ids.count(); |
248 | 249 | ||
249 | return it; | 250 | return it; |
250 | } | 251 | } |
251 | template <class T> | 252 | template <class T> |
252 | uint ORecordList<T>::count()const { | 253 | uint ORecordList<T>::count()const { |
253 | return m_ids.count(); | 254 | return m_ids.count(); |
254 | } | 255 | } |
256 | template <class T> | ||
257 | T ORecordList<T>::operator[]( uint i ) { | ||
258 | return m_acc->find( m_ids[i] ); | ||
259 | } | ||
255 | #endif | 260 | #endif |
diff --git a/libopie2/opiepim/otodo.cpp b/libopie2/opiepim/otodo.cpp index 6dd4c0e..eb9dad3 100644 --- a/libopie2/opiepim/otodo.cpp +++ b/libopie2/opiepim/otodo.cpp | |||
@@ -143,64 +143,65 @@ QDateTime OTodo::alarmDateTime() const | |||
143 | QString OTodo::description()const | 143 | QString OTodo::description()const |
144 | { | 144 | { |
145 | return data->desc; | 145 | return data->desc; |
146 | } | 146 | } |
147 | void OTodo::setCompleted( bool completed ) | 147 | void OTodo::setCompleted( bool completed ) |
148 | { | 148 | { |
149 | changeOrModify(); | 149 | changeOrModify(); |
150 | data->isCompleted = completed; | 150 | data->isCompleted = completed; |
151 | } | 151 | } |
152 | void OTodo::setHasDueDate( bool hasDate ) | 152 | void OTodo::setHasDueDate( bool hasDate ) |
153 | { | 153 | { |
154 | changeOrModify(); | 154 | changeOrModify(); |
155 | data->hasDate = hasDate; | 155 | data->hasDate = hasDate; |
156 | } | 156 | } |
157 | void OTodo::setHasAlarmDateTime( bool hasAlarmDateTime ) | 157 | void OTodo::setHasAlarmDateTime( bool hasAlarmDateTime ) |
158 | { | 158 | { |
159 | changeOrModify(); | 159 | changeOrModify(); |
160 | data->hasAlarmDateTime = hasAlarmDateTime; | 160 | data->hasAlarmDateTime = hasAlarmDateTime; |
161 | } | 161 | } |
162 | void OTodo::setDescription(const QString &desc ) | 162 | void OTodo::setDescription(const QString &desc ) |
163 | { | 163 | { |
164 | // qWarning( "desc " + desc ); | 164 | // qWarning( "desc " + desc ); |
165 | changeOrModify(); | 165 | changeOrModify(); |
166 | data->desc = Qtopia::simplifyMultiLineSpace(desc ); | 166 | data->desc = Qtopia::simplifyMultiLineSpace(desc ); |
167 | } | 167 | } |
168 | void OTodo::setSummary( const QString& sum ) | 168 | void OTodo::setSummary( const QString& sum ) |
169 | { | 169 | { |
170 | changeOrModify(); | 170 | changeOrModify(); |
171 | data->sum = sum; | 171 | data->sum = sum; |
172 | } | 172 | } |
173 | void OTodo::setPriority(int prio ) | 173 | void OTodo::setPriority(int prio ) |
174 | { | 174 | { |
175 | qWarning("set priority %d", prio); | ||
175 | changeOrModify(); | 176 | changeOrModify(); |
176 | data->priority = prio; | 177 | data->priority = prio; |
177 | } | 178 | } |
178 | void OTodo::setDueDate( QDate date ) | 179 | void OTodo::setDueDate( QDate date ) |
179 | { | 180 | { |
180 | changeOrModify(); | 181 | changeOrModify(); |
181 | data->date = date; | 182 | data->date = date; |
182 | } | 183 | } |
183 | void OTodo::setAlarmDateTime( const QDateTime& alarm ) | 184 | void OTodo::setAlarmDateTime( const QDateTime& alarm ) |
184 | { | 185 | { |
185 | changeOrModify(); | 186 | changeOrModify(); |
186 | data->alarmDateTime = alarm; | 187 | data->alarmDateTime = alarm; |
187 | } | 188 | } |
188 | bool OTodo::isOverdue( ) | 189 | bool OTodo::isOverdue( ) |
189 | { | 190 | { |
190 | if( data->hasDate ) | 191 | if( data->hasDate ) |
191 | return QDate::currentDate() > data->date; | 192 | return QDate::currentDate() > data->date; |
192 | return false; | 193 | return false; |
193 | } | 194 | } |
194 | void OTodo::setProgress(ushort progress ) | 195 | void OTodo::setProgress(ushort progress ) |
195 | { | 196 | { |
196 | changeOrModify(); | 197 | changeOrModify(); |
197 | data->prog = progress; | 198 | data->prog = progress; |
198 | } | 199 | } |
199 | QString OTodo::toShortText() const { | 200 | QString OTodo::toShortText() const { |
200 | return summary(); | 201 | return summary(); |
201 | } | 202 | } |
202 | /*! | 203 | /*! |
203 | Returns a richt text string | 204 | Returns a richt text string |
204 | */ | 205 | */ |
205 | QString OTodo::toRichText() const | 206 | QString OTodo::toRichText() const |
206 | { | 207 | { |