author | drw <drw> | 2002-11-02 23:13:41 (UTC) |
---|---|---|
committer | drw <drw> | 2002-11-02 23:13:41 (UTC) |
commit | e224e28dfa730ce315caa7ae570496c9cd3ffbe2 (patch) (unidiff) | |
tree | ed97aca731ee3f92dfb6c7c47a4394da87061b66 | |
parent | efb3cb40de57d53de1eb22662261e58333a3a39d (diff) | |
download | opie-e224e28dfa730ce315caa7ae570496c9cd3ffbe2.zip opie-e224e28dfa730ce315caa7ae570496c9cd3ffbe2.tar.gz opie-e224e28dfa730ce315caa7ae570496c9cd3ffbe2.tar.bz2 |
Fixes
-rw-r--r-- | noncore/apps/checkbook/checkbook.cpp | 6 | ||||
-rw-r--r-- | noncore/apps/checkbook/traninfo.cpp | 15 | ||||
-rw-r--r-- | noncore/apps/checkbook/traninfo.h | 8 |
3 files changed, 25 insertions, 4 deletions
diff --git a/noncore/apps/checkbook/checkbook.cpp b/noncore/apps/checkbook/checkbook.cpp index 77c1f57..ab25516 100644 --- a/noncore/apps/checkbook/checkbook.cpp +++ b/noncore/apps/checkbook/checkbook.cpp | |||
@@ -306,17 +306,17 @@ void Checkbook::loadCheckbook() | |||
306 | if ( tran->withdrawal() ) | 306 | if ( tran->withdrawal() ) |
307 | { | 307 | { |
308 | amount *= -1; | 308 | amount *= -1; |
309 | } | 309 | } |
310 | currBalance += amount; | 310 | currBalance += amount; |
311 | stramount.sprintf( "%c%.2f", currencySymbol, amount ); | 311 | stramount.sprintf( "%c%.2f", currencySymbol, amount ); |
312 | 312 | ||
313 | // Add to transaction list | 313 | // Add to transaction list |
314 | transactions.append( tran ); | 314 | transactions.inSort( tran ); |
315 | 315 | ||
316 | // Add to transaction table | 316 | // Add to transaction table |
317 | ( void ) new QListViewItem( tranTable, QString::number( i ), tran->datestr(), | 317 | ( void ) new QListViewItem( tranTable, QString::number( i ), tran->datestr(), |
318 | trandesc, stramount ); | 318 | trandesc, stramount ); |
319 | } | 319 | } |
320 | else | 320 | else |
321 | { | 321 | { |
322 | delete tran; | 322 | delete tran; |
@@ -410,17 +410,17 @@ void Checkbook::slotNewTran() | |||
410 | if ( traninfo->withdrawal() ) | 410 | if ( traninfo->withdrawal() ) |
411 | { | 411 | { |
412 | amount *= -1; | 412 | amount *= -1; |
413 | } | 413 | } |
414 | QString stramount; | 414 | QString stramount; |
415 | stramount.sprintf( "%c%.2f", currencySymbol, amount ); | 415 | stramount.sprintf( "%c%.2f", currencySymbol, amount ); |
416 | 416 | ||
417 | // Add to transaction list | 417 | // Add to transaction list |
418 | transactions.append( traninfo ); | 418 | transactions.inSort( traninfo ); |
419 | 419 | ||
420 | // Add to transaction table | 420 | // Add to transaction table |
421 | ( void ) new QListViewItem( tranTable, QString::number( highTranNum ), | 421 | ( void ) new QListViewItem( tranTable, QString::number( highTranNum ), |
422 | traninfo->datestr(), traninfo->desc(), stramount ); | 422 | traninfo->datestr(), traninfo->desc(), stramount ); |
423 | 423 | ||
424 | adjustBalance( amount ); | 424 | adjustBalance( amount ); |
425 | } | 425 | } |
426 | else | 426 | else |
@@ -557,17 +557,17 @@ void Checkbook::drawBalanceChart() | |||
557 | graphInfo = new GraphInfo( GraphInfo::BarChart, list ); | 557 | graphInfo = new GraphInfo( GraphInfo::BarChart, list ); |
558 | } | 558 | } |
559 | 559 | ||
560 | void Checkbook::drawCategoryChart( bool withdrawals ) | 560 | void Checkbook::drawCategoryChart( bool withdrawals ) |
561 | { | 561 | { |
562 | DataPointList *list = new DataPointList(); | 562 | DataPointList *list = new DataPointList(); |
563 | 563 | ||
564 | TranInfo *tran = transactions.first(); | 564 | TranInfo *tran = transactions.first(); |
565 | if ( tran->withdrawal() == withdrawals ) | 565 | if ( tran && tran->withdrawal() == withdrawals ) |
566 | { | 566 | { |
567 | list->append( new DataPointInfo( tran->category(), tran->amount() ) ); | 567 | list->append( new DataPointInfo( tran->category(), tran->amount() ) ); |
568 | } | 568 | } |
569 | tran = transactions.next(); | 569 | tran = transactions.next(); |
570 | 570 | ||
571 | DataPointInfo *cat; | 571 | DataPointInfo *cat; |
572 | for ( ; tran; tran = transactions.next() ) | 572 | for ( ; tran; tran = transactions.next() ) |
573 | { | 573 | { |
diff --git a/noncore/apps/checkbook/traninfo.cpp b/noncore/apps/checkbook/traninfo.cpp index 460466c..dcba869 100644 --- a/noncore/apps/checkbook/traninfo.cpp +++ b/noncore/apps/checkbook/traninfo.cpp | |||
@@ -168,8 +168,23 @@ void TranInfo::write( Config *config, int entry ) | |||
168 | 168 | ||
169 | tempstr.setNum( f, 'f', 2 ); | 169 | tempstr.setNum( f, 'f', 2 ); |
170 | config->writeEntry( "TransactionFee", tempstr ); | 170 | config->writeEntry( "TransactionFee", tempstr ); |
171 | 171 | ||
172 | config->writeEntry( "CheckNumber", cn ); | 172 | config->writeEntry( "CheckNumber", cn ); |
173 | 173 | ||
174 | config->writeEntry( "Comments", n ); | 174 | config->writeEntry( "Comments", n ); |
175 | } | 175 | } |
176 | |||
177 | int TranInfoList::compareItems( QCollection::Item item1, QCollection::Item item2 ) | ||
178 | { | ||
179 | QDate d1 = ((TranInfo *)item1)->date(); | ||
180 | QDate d2 = ((TranInfo *)item2)->date(); | ||
181 | int r = -1; | ||
182 | |||
183 | if ( d1 < d2 ) | ||
184 | r = -1; | ||
185 | else if ( d1 == d2 ) | ||
186 | r = 0; | ||
187 | else if ( d1 > d2 ) | ||
188 | r = 1; | ||
189 | return( r ); | ||
190 | } \ No newline at end of file | ||
diff --git a/noncore/apps/checkbook/traninfo.h b/noncore/apps/checkbook/traninfo.h index e944c29..e488816 100644 --- a/noncore/apps/checkbook/traninfo.h +++ b/noncore/apps/checkbook/traninfo.h | |||
@@ -76,11 +76,17 @@ class TranInfo | |||
76 | QString t; | 76 | QString t; |
77 | QString c; | 77 | QString c; |
78 | float a; | 78 | float a; |
79 | float f; | 79 | float f; |
80 | QString cn; | 80 | QString cn; |
81 | QString n; | 81 | QString n; |
82 | }; | 82 | }; |
83 | 83 | ||
84 | typedef QList<TranInfo> TranInfoList; | 84 | class TranInfoList : public QList<TranInfo> |
85 | { | ||
86 | protected: | ||
87 | int compareItems( QCollection::Item, QCollection::Item ); | ||
88 | }; | ||
89 | |||
90 | //typedef TranList<TranInfo> TranInfoList; | ||
85 | 91 | ||
86 | #endif | 92 | #endif |