author | zecke <zecke> | 2002-10-18 03:12:54 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-10-18 03:12:54 (UTC) |
commit | 07a1cb4baaf544e0e594040bbe8e5872ccb34c0f (patch) (unidiff) | |
tree | ba556d2f587a65bfc3b15fc844a9383f5ef66c9e | |
parent | 86b3550348cf896b568e98d21da577c3f35a1a4a (diff) | |
download | opie-07a1cb4baaf544e0e594040bbe8e5872ccb34c0f.zip opie-07a1cb4baaf544e0e594040bbe8e5872ccb34c0f.tar.gz opie-07a1cb4baaf544e0e594040bbe8e5872ccb34c0f.tar.bz2 |
Fix the behaviour of isOverDue.
We currently check if the Record got a DueDate
and then do some calculations.
I added a check to see if the item isCompleted.
If it is completed it can not be overdue
Stefan: Only one item left which is overdue ;)
-rw-r--r-- | libopie/pim/otodo.cpp | 2 | ||||
-rw-r--r-- | libopie2/opiepim/otodo.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libopie/pim/otodo.cpp b/libopie/pim/otodo.cpp index 6dd4c0e..765d5a9 100644 --- a/libopie/pim/otodo.cpp +++ b/libopie/pim/otodo.cpp | |||
@@ -94,193 +94,193 @@ OTodo::OTodo(bool completed, int priority, | |||
94 | 94 | ||
95 | } | 95 | } |
96 | bool OTodo::match( const QRegExp ®Exp )const | 96 | bool OTodo::match( const QRegExp ®Exp )const |
97 | { | 97 | { |
98 | if( QString::number( data->priority ).find( regExp ) != -1 ){ | 98 | if( QString::number( data->priority ).find( regExp ) != -1 ){ |
99 | return true; | 99 | return true; |
100 | }else if( data->hasDate && data->date.toString().find( regExp) != -1 ){ | 100 | }else if( data->hasDate && data->date.toString().find( regExp) != -1 ){ |
101 | return true; | 101 | return true; |
102 | }else if(data->desc.find( regExp ) != -1 ){ | 102 | }else if(data->desc.find( regExp ) != -1 ){ |
103 | return true; | 103 | return true; |
104 | }else if(data->sum.find( regExp ) != -1 ) { | 104 | }else if(data->sum.find( regExp ) != -1 ) { |
105 | return true; | 105 | return true; |
106 | } | 106 | } |
107 | return false; | 107 | return false; |
108 | } | 108 | } |
109 | bool OTodo::isCompleted() const | 109 | bool OTodo::isCompleted() const |
110 | { | 110 | { |
111 | return data->isCompleted; | 111 | return data->isCompleted; |
112 | } | 112 | } |
113 | bool OTodo::hasDueDate() const | 113 | bool OTodo::hasDueDate() const |
114 | { | 114 | { |
115 | return data->hasDate; | 115 | return data->hasDate; |
116 | } | 116 | } |
117 | bool OTodo::hasAlarmDateTime() const | 117 | bool OTodo::hasAlarmDateTime() const |
118 | { | 118 | { |
119 | return data->hasAlarmDateTime; | 119 | return data->hasAlarmDateTime; |
120 | } | 120 | } |
121 | int OTodo::priority()const | 121 | int OTodo::priority()const |
122 | { | 122 | { |
123 | return data->priority; | 123 | return data->priority; |
124 | } | 124 | } |
125 | QString OTodo::summary() const | 125 | QString OTodo::summary() const |
126 | { | 126 | { |
127 | return data->sum; | 127 | return data->sum; |
128 | } | 128 | } |
129 | ushort OTodo::progress() const | 129 | ushort OTodo::progress() const |
130 | { | 130 | { |
131 | return data->prog; | 131 | return data->prog; |
132 | } | 132 | } |
133 | QDate OTodo::dueDate()const | 133 | QDate OTodo::dueDate()const |
134 | { | 134 | { |
135 | return data->date; | 135 | return data->date; |
136 | } | 136 | } |
137 | 137 | ||
138 | QDateTime OTodo::alarmDateTime() const | 138 | QDateTime OTodo::alarmDateTime() const |
139 | { | 139 | { |
140 | return data->alarmDateTime; | 140 | return data->alarmDateTime; |
141 | } | 141 | } |
142 | 142 | ||
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 | changeOrModify(); | 175 | changeOrModify(); |
176 | data->priority = prio; | 176 | data->priority = prio; |
177 | } | 177 | } |
178 | void OTodo::setDueDate( QDate date ) | 178 | void OTodo::setDueDate( QDate date ) |
179 | { | 179 | { |
180 | changeOrModify(); | 180 | changeOrModify(); |
181 | data->date = date; | 181 | data->date = date; |
182 | } | 182 | } |
183 | void OTodo::setAlarmDateTime( const QDateTime& alarm ) | 183 | void OTodo::setAlarmDateTime( const QDateTime& alarm ) |
184 | { | 184 | { |
185 | changeOrModify(); | 185 | changeOrModify(); |
186 | data->alarmDateTime = alarm; | 186 | data->alarmDateTime = alarm; |
187 | } | 187 | } |
188 | bool OTodo::isOverdue( ) | 188 | bool OTodo::isOverdue( ) |
189 | { | 189 | { |
190 | if( data->hasDate ) | 190 | if( data->hasDate && !data->isCompleted) |
191 | return QDate::currentDate() > data->date; | 191 | return QDate::currentDate() > data->date; |
192 | return false; | 192 | return false; |
193 | } | 193 | } |
194 | void OTodo::setProgress(ushort progress ) | 194 | void OTodo::setProgress(ushort progress ) |
195 | { | 195 | { |
196 | changeOrModify(); | 196 | changeOrModify(); |
197 | data->prog = progress; | 197 | data->prog = progress; |
198 | } | 198 | } |
199 | QString OTodo::toShortText() const { | 199 | QString OTodo::toShortText() const { |
200 | return summary(); | 200 | return summary(); |
201 | } | 201 | } |
202 | /*! | 202 | /*! |
203 | Returns a richt text string | 203 | Returns a richt text string |
204 | */ | 204 | */ |
205 | QString OTodo::toRichText() const | 205 | QString OTodo::toRichText() const |
206 | { | 206 | { |
207 | QString text; | 207 | QString text; |
208 | QStringList catlist; | 208 | QStringList catlist; |
209 | 209 | ||
210 | // Description of the todo | 210 | // Description of the todo |
211 | if ( !summary().isEmpty() ) { | 211 | if ( !summary().isEmpty() ) { |
212 | text += "<b>" + QObject::tr( "Summary:") + "</b><br>"; | 212 | text += "<b>" + QObject::tr( "Summary:") + "</b><br>"; |
213 | text += Qtopia::escapeString(summary() ).replace(QRegExp( "[\n]"), "<br>" ) + "<br>"; | 213 | text += Qtopia::escapeString(summary() ).replace(QRegExp( "[\n]"), "<br>" ) + "<br>"; |
214 | } | 214 | } |
215 | if( !description().isEmpty() ){ | 215 | if( !description().isEmpty() ){ |
216 | text += "<b>" + QObject::tr( "Description:" ) + "</b><br>"; | 216 | text += "<b>" + QObject::tr( "Description:" ) + "</b><br>"; |
217 | text += Qtopia::escapeString(description() ).replace(QRegExp( "[\n]"), "<br>" ) ; | 217 | text += Qtopia::escapeString(description() ).replace(QRegExp( "[\n]"), "<br>" ) ; |
218 | } | 218 | } |
219 | text += "<br><br><br>"; | 219 | text += "<br><br><br>"; |
220 | 220 | ||
221 | text += "<b>" + QObject::tr( "Priority:") +" </b>" | 221 | text += "<b>" + QObject::tr( "Priority:") +" </b>" |
222 | + QString::number( priority() ) + " <br>"; | 222 | + QString::number( priority() ) + " <br>"; |
223 | text += "<b>" + QObject::tr( "Progress:") + " </b>" | 223 | text += "<b>" + QObject::tr( "Progress:") + " </b>" |
224 | + QString::number( progress() ) + " %<br>"; | 224 | + QString::number( progress() ) + " %<br>"; |
225 | if (hasDueDate() ){ | 225 | if (hasDueDate() ){ |
226 | text += "<b>" + QObject::tr( "Deadline:") + " </b>"; | 226 | text += "<b>" + QObject::tr( "Deadline:") + " </b>"; |
227 | text += dueDate().toString(); | 227 | text += dueDate().toString(); |
228 | text += "<br>"; | 228 | text += "<br>"; |
229 | } | 229 | } |
230 | if (hasAlarmDateTime() ){ | 230 | if (hasAlarmDateTime() ){ |
231 | text += "<b>" + QObject::tr( "Alarmed Notification:") + " </b>"; | 231 | text += "<b>" + QObject::tr( "Alarmed Notification:") + " </b>"; |
232 | text += alarmDateTime().toString(); | 232 | text += alarmDateTime().toString(); |
233 | text += "<br>"; | 233 | text += "<br>"; |
234 | } | 234 | } |
235 | 235 | ||
236 | text += "<b>" + QObject::tr( "Category:") + "</b> "; | 236 | text += "<b>" + QObject::tr( "Category:") + "</b> "; |
237 | text += categoryNames().join(", "); | 237 | text += categoryNames().join(", "); |
238 | text += "<br>"; | 238 | text += "<br>"; |
239 | 239 | ||
240 | return text; | 240 | return text; |
241 | } | 241 | } |
242 | 242 | ||
243 | bool OTodo::operator<( const OTodo &toDoEvent )const{ | 243 | bool OTodo::operator<( const OTodo &toDoEvent )const{ |
244 | if( !hasDueDate() && !toDoEvent.hasDueDate() ) return true; | 244 | if( !hasDueDate() && !toDoEvent.hasDueDate() ) return true; |
245 | if( !hasDueDate() && toDoEvent.hasDueDate() ) return false; | 245 | if( !hasDueDate() && toDoEvent.hasDueDate() ) return false; |
246 | if( hasDueDate() && toDoEvent.hasDueDate() ){ | 246 | if( hasDueDate() && toDoEvent.hasDueDate() ){ |
247 | if( dueDate() == toDoEvent.dueDate() ){ // let's the priority decide | 247 | if( dueDate() == toDoEvent.dueDate() ){ // let's the priority decide |
248 | return priority() < toDoEvent.priority(); | 248 | return priority() < toDoEvent.priority(); |
249 | }else{ | 249 | }else{ |
250 | return dueDate() < toDoEvent.dueDate(); | 250 | return dueDate() < toDoEvent.dueDate(); |
251 | } | 251 | } |
252 | } | 252 | } |
253 | return false; | 253 | return false; |
254 | } | 254 | } |
255 | bool OTodo::operator<=(const OTodo &toDoEvent )const | 255 | bool OTodo::operator<=(const OTodo &toDoEvent )const |
256 | { | 256 | { |
257 | if( !hasDueDate() && !toDoEvent.hasDueDate() ) return true; | 257 | if( !hasDueDate() && !toDoEvent.hasDueDate() ) return true; |
258 | if( !hasDueDate() && toDoEvent.hasDueDate() ) return true; | 258 | if( !hasDueDate() && toDoEvent.hasDueDate() ) return true; |
259 | if( hasDueDate() && toDoEvent.hasDueDate() ){ | 259 | if( hasDueDate() && toDoEvent.hasDueDate() ){ |
260 | if( dueDate() == toDoEvent.dueDate() ){ // let's the priority decide | 260 | if( dueDate() == toDoEvent.dueDate() ){ // let's the priority decide |
261 | return priority() <= toDoEvent.priority(); | 261 | return priority() <= toDoEvent.priority(); |
262 | }else{ | 262 | }else{ |
263 | return dueDate() <= toDoEvent.dueDate(); | 263 | return dueDate() <= toDoEvent.dueDate(); |
264 | } | 264 | } |
265 | } | 265 | } |
266 | return true; | 266 | return true; |
267 | } | 267 | } |
268 | bool OTodo::operator>(const OTodo &toDoEvent )const | 268 | bool OTodo::operator>(const OTodo &toDoEvent )const |
269 | { | 269 | { |
270 | if( !hasDueDate() && !toDoEvent.hasDueDate() ) return false; | 270 | if( !hasDueDate() && !toDoEvent.hasDueDate() ) return false; |
271 | if( !hasDueDate() && toDoEvent.hasDueDate() ) return false; | 271 | if( !hasDueDate() && toDoEvent.hasDueDate() ) return false; |
272 | if( hasDueDate() && toDoEvent.hasDueDate() ){ | 272 | if( hasDueDate() && toDoEvent.hasDueDate() ){ |
273 | if( dueDate() == toDoEvent.dueDate() ){ // let's the priority decide | 273 | if( dueDate() == toDoEvent.dueDate() ){ // let's the priority decide |
274 | return priority() > toDoEvent.priority(); | 274 | return priority() > toDoEvent.priority(); |
275 | }else{ | 275 | }else{ |
276 | return dueDate() > toDoEvent.dueDate(); | 276 | return dueDate() > toDoEvent.dueDate(); |
277 | } | 277 | } |
278 | } | 278 | } |
279 | return false; | 279 | return false; |
280 | } | 280 | } |
281 | bool OTodo::operator>=(const OTodo &toDoEvent )const | 281 | bool OTodo::operator>=(const OTodo &toDoEvent )const |
282 | { | 282 | { |
283 | if( !hasDueDate() && !toDoEvent.hasDueDate() ) return true; | 283 | if( !hasDueDate() && !toDoEvent.hasDueDate() ) return true; |
284 | if( !hasDueDate() && toDoEvent.hasDueDate() ) return false; | 284 | if( !hasDueDate() && toDoEvent.hasDueDate() ) return false; |
285 | if( hasDueDate() && toDoEvent.hasDueDate() ){ | 285 | if( hasDueDate() && toDoEvent.hasDueDate() ){ |
286 | if( dueDate() == toDoEvent.dueDate() ){ // let's the priority decide | 286 | if( dueDate() == toDoEvent.dueDate() ){ // let's the priority decide |
diff --git a/libopie2/opiepim/otodo.cpp b/libopie2/opiepim/otodo.cpp index 6dd4c0e..765d5a9 100644 --- a/libopie2/opiepim/otodo.cpp +++ b/libopie2/opiepim/otodo.cpp | |||
@@ -94,193 +94,193 @@ OTodo::OTodo(bool completed, int priority, | |||
94 | 94 | ||
95 | } | 95 | } |
96 | bool OTodo::match( const QRegExp ®Exp )const | 96 | bool OTodo::match( const QRegExp ®Exp )const |
97 | { | 97 | { |
98 | if( QString::number( data->priority ).find( regExp ) != -1 ){ | 98 | if( QString::number( data->priority ).find( regExp ) != -1 ){ |
99 | return true; | 99 | return true; |
100 | }else if( data->hasDate && data->date.toString().find( regExp) != -1 ){ | 100 | }else if( data->hasDate && data->date.toString().find( regExp) != -1 ){ |
101 | return true; | 101 | return true; |
102 | }else if(data->desc.find( regExp ) != -1 ){ | 102 | }else if(data->desc.find( regExp ) != -1 ){ |
103 | return true; | 103 | return true; |
104 | }else if(data->sum.find( regExp ) != -1 ) { | 104 | }else if(data->sum.find( regExp ) != -1 ) { |
105 | return true; | 105 | return true; |
106 | } | 106 | } |
107 | return false; | 107 | return false; |
108 | } | 108 | } |
109 | bool OTodo::isCompleted() const | 109 | bool OTodo::isCompleted() const |
110 | { | 110 | { |
111 | return data->isCompleted; | 111 | return data->isCompleted; |
112 | } | 112 | } |
113 | bool OTodo::hasDueDate() const | 113 | bool OTodo::hasDueDate() const |
114 | { | 114 | { |
115 | return data->hasDate; | 115 | return data->hasDate; |
116 | } | 116 | } |
117 | bool OTodo::hasAlarmDateTime() const | 117 | bool OTodo::hasAlarmDateTime() const |
118 | { | 118 | { |
119 | return data->hasAlarmDateTime; | 119 | return data->hasAlarmDateTime; |
120 | } | 120 | } |
121 | int OTodo::priority()const | 121 | int OTodo::priority()const |
122 | { | 122 | { |
123 | return data->priority; | 123 | return data->priority; |
124 | } | 124 | } |
125 | QString OTodo::summary() const | 125 | QString OTodo::summary() const |
126 | { | 126 | { |
127 | return data->sum; | 127 | return data->sum; |
128 | } | 128 | } |
129 | ushort OTodo::progress() const | 129 | ushort OTodo::progress() const |
130 | { | 130 | { |
131 | return data->prog; | 131 | return data->prog; |
132 | } | 132 | } |
133 | QDate OTodo::dueDate()const | 133 | QDate OTodo::dueDate()const |
134 | { | 134 | { |
135 | return data->date; | 135 | return data->date; |
136 | } | 136 | } |
137 | 137 | ||
138 | QDateTime OTodo::alarmDateTime() const | 138 | QDateTime OTodo::alarmDateTime() const |
139 | { | 139 | { |
140 | return data->alarmDateTime; | 140 | return data->alarmDateTime; |
141 | } | 141 | } |
142 | 142 | ||
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 | changeOrModify(); | 175 | changeOrModify(); |
176 | data->priority = prio; | 176 | data->priority = prio; |
177 | } | 177 | } |
178 | void OTodo::setDueDate( QDate date ) | 178 | void OTodo::setDueDate( QDate date ) |
179 | { | 179 | { |
180 | changeOrModify(); | 180 | changeOrModify(); |
181 | data->date = date; | 181 | data->date = date; |
182 | } | 182 | } |
183 | void OTodo::setAlarmDateTime( const QDateTime& alarm ) | 183 | void OTodo::setAlarmDateTime( const QDateTime& alarm ) |
184 | { | 184 | { |
185 | changeOrModify(); | 185 | changeOrModify(); |
186 | data->alarmDateTime = alarm; | 186 | data->alarmDateTime = alarm; |
187 | } | 187 | } |
188 | bool OTodo::isOverdue( ) | 188 | bool OTodo::isOverdue( ) |
189 | { | 189 | { |
190 | if( data->hasDate ) | 190 | if( data->hasDate && !data->isCompleted) |
191 | return QDate::currentDate() > data->date; | 191 | return QDate::currentDate() > data->date; |
192 | return false; | 192 | return false; |
193 | } | 193 | } |
194 | void OTodo::setProgress(ushort progress ) | 194 | void OTodo::setProgress(ushort progress ) |
195 | { | 195 | { |
196 | changeOrModify(); | 196 | changeOrModify(); |
197 | data->prog = progress; | 197 | data->prog = progress; |
198 | } | 198 | } |
199 | QString OTodo::toShortText() const { | 199 | QString OTodo::toShortText() const { |
200 | return summary(); | 200 | return summary(); |
201 | } | 201 | } |
202 | /*! | 202 | /*! |
203 | Returns a richt text string | 203 | Returns a richt text string |
204 | */ | 204 | */ |
205 | QString OTodo::toRichText() const | 205 | QString OTodo::toRichText() const |
206 | { | 206 | { |
207 | QString text; | 207 | QString text; |
208 | QStringList catlist; | 208 | QStringList catlist; |
209 | 209 | ||
210 | // Description of the todo | 210 | // Description of the todo |
211 | if ( !summary().isEmpty() ) { | 211 | if ( !summary().isEmpty() ) { |
212 | text += "<b>" + QObject::tr( "Summary:") + "</b><br>"; | 212 | text += "<b>" + QObject::tr( "Summary:") + "</b><br>"; |
213 | text += Qtopia::escapeString(summary() ).replace(QRegExp( "[\n]"), "<br>" ) + "<br>"; | 213 | text += Qtopia::escapeString(summary() ).replace(QRegExp( "[\n]"), "<br>" ) + "<br>"; |
214 | } | 214 | } |
215 | if( !description().isEmpty() ){ | 215 | if( !description().isEmpty() ){ |
216 | text += "<b>" + QObject::tr( "Description:" ) + "</b><br>"; | 216 | text += "<b>" + QObject::tr( "Description:" ) + "</b><br>"; |
217 | text += Qtopia::escapeString(description() ).replace(QRegExp( "[\n]"), "<br>" ) ; | 217 | text += Qtopia::escapeString(description() ).replace(QRegExp( "[\n]"), "<br>" ) ; |
218 | } | 218 | } |
219 | text += "<br><br><br>"; | 219 | text += "<br><br><br>"; |
220 | 220 | ||
221 | text += "<b>" + QObject::tr( "Priority:") +" </b>" | 221 | text += "<b>" + QObject::tr( "Priority:") +" </b>" |
222 | + QString::number( priority() ) + " <br>"; | 222 | + QString::number( priority() ) + " <br>"; |
223 | text += "<b>" + QObject::tr( "Progress:") + " </b>" | 223 | text += "<b>" + QObject::tr( "Progress:") + " </b>" |
224 | + QString::number( progress() ) + " %<br>"; | 224 | + QString::number( progress() ) + " %<br>"; |
225 | if (hasDueDate() ){ | 225 | if (hasDueDate() ){ |
226 | text += "<b>" + QObject::tr( "Deadline:") + " </b>"; | 226 | text += "<b>" + QObject::tr( "Deadline:") + " </b>"; |
227 | text += dueDate().toString(); | 227 | text += dueDate().toString(); |
228 | text += "<br>"; | 228 | text += "<br>"; |
229 | } | 229 | } |
230 | if (hasAlarmDateTime() ){ | 230 | if (hasAlarmDateTime() ){ |
231 | text += "<b>" + QObject::tr( "Alarmed Notification:") + " </b>"; | 231 | text += "<b>" + QObject::tr( "Alarmed Notification:") + " </b>"; |
232 | text += alarmDateTime().toString(); | 232 | text += alarmDateTime().toString(); |
233 | text += "<br>"; | 233 | text += "<br>"; |
234 | } | 234 | } |
235 | 235 | ||
236 | text += "<b>" + QObject::tr( "Category:") + "</b> "; | 236 | text += "<b>" + QObject::tr( "Category:") + "</b> "; |
237 | text += categoryNames().join(", "); | 237 | text += categoryNames().join(", "); |
238 | text += "<br>"; | 238 | text += "<br>"; |
239 | 239 | ||
240 | return text; | 240 | return text; |
241 | } | 241 | } |
242 | 242 | ||
243 | bool OTodo::operator<( const OTodo &toDoEvent )const{ | 243 | bool OTodo::operator<( const OTodo &toDoEvent )const{ |
244 | if( !hasDueDate() && !toDoEvent.hasDueDate() ) return true; | 244 | if( !hasDueDate() && !toDoEvent.hasDueDate() ) return true; |
245 | if( !hasDueDate() && toDoEvent.hasDueDate() ) return false; | 245 | if( !hasDueDate() && toDoEvent.hasDueDate() ) return false; |
246 | if( hasDueDate() && toDoEvent.hasDueDate() ){ | 246 | if( hasDueDate() && toDoEvent.hasDueDate() ){ |
247 | if( dueDate() == toDoEvent.dueDate() ){ // let's the priority decide | 247 | if( dueDate() == toDoEvent.dueDate() ){ // let's the priority decide |
248 | return priority() < toDoEvent.priority(); | 248 | return priority() < toDoEvent.priority(); |
249 | }else{ | 249 | }else{ |
250 | return dueDate() < toDoEvent.dueDate(); | 250 | return dueDate() < toDoEvent.dueDate(); |
251 | } | 251 | } |
252 | } | 252 | } |
253 | return false; | 253 | return false; |
254 | } | 254 | } |
255 | bool OTodo::operator<=(const OTodo &toDoEvent )const | 255 | bool OTodo::operator<=(const OTodo &toDoEvent )const |
256 | { | 256 | { |
257 | if( !hasDueDate() && !toDoEvent.hasDueDate() ) return true; | 257 | if( !hasDueDate() && !toDoEvent.hasDueDate() ) return true; |
258 | if( !hasDueDate() && toDoEvent.hasDueDate() ) return true; | 258 | if( !hasDueDate() && toDoEvent.hasDueDate() ) return true; |
259 | if( hasDueDate() && toDoEvent.hasDueDate() ){ | 259 | if( hasDueDate() && toDoEvent.hasDueDate() ){ |
260 | if( dueDate() == toDoEvent.dueDate() ){ // let's the priority decide | 260 | if( dueDate() == toDoEvent.dueDate() ){ // let's the priority decide |
261 | return priority() <= toDoEvent.priority(); | 261 | return priority() <= toDoEvent.priority(); |
262 | }else{ | 262 | }else{ |
263 | return dueDate() <= toDoEvent.dueDate(); | 263 | return dueDate() <= toDoEvent.dueDate(); |
264 | } | 264 | } |
265 | } | 265 | } |
266 | return true; | 266 | return true; |
267 | } | 267 | } |
268 | bool OTodo::operator>(const OTodo &toDoEvent )const | 268 | bool OTodo::operator>(const OTodo &toDoEvent )const |
269 | { | 269 | { |
270 | if( !hasDueDate() && !toDoEvent.hasDueDate() ) return false; | 270 | if( !hasDueDate() && !toDoEvent.hasDueDate() ) return false; |
271 | if( !hasDueDate() && toDoEvent.hasDueDate() ) return false; | 271 | if( !hasDueDate() && toDoEvent.hasDueDate() ) return false; |
272 | if( hasDueDate() && toDoEvent.hasDueDate() ){ | 272 | if( hasDueDate() && toDoEvent.hasDueDate() ){ |
273 | if( dueDate() == toDoEvent.dueDate() ){ // let's the priority decide | 273 | if( dueDate() == toDoEvent.dueDate() ){ // let's the priority decide |
274 | return priority() > toDoEvent.priority(); | 274 | return priority() > toDoEvent.priority(); |
275 | }else{ | 275 | }else{ |
276 | return dueDate() > toDoEvent.dueDate(); | 276 | return dueDate() > toDoEvent.dueDate(); |
277 | } | 277 | } |
278 | } | 278 | } |
279 | return false; | 279 | return false; |
280 | } | 280 | } |
281 | bool OTodo::operator>=(const OTodo &toDoEvent )const | 281 | bool OTodo::operator>=(const OTodo &toDoEvent )const |
282 | { | 282 | { |
283 | if( !hasDueDate() && !toDoEvent.hasDueDate() ) return true; | 283 | if( !hasDueDate() && !toDoEvent.hasDueDate() ) return true; |
284 | if( !hasDueDate() && toDoEvent.hasDueDate() ) return false; | 284 | if( !hasDueDate() && toDoEvent.hasDueDate() ) return false; |
285 | if( hasDueDate() && toDoEvent.hasDueDate() ){ | 285 | if( hasDueDate() && toDoEvent.hasDueDate() ){ |
286 | if( dueDate() == toDoEvent.dueDate() ){ // let's the priority decide | 286 | if( dueDate() == toDoEvent.dueDate() ){ // let's the priority decide |