Working on time frame for displaying cleared transactions. Not yet working.

1 files changed, 8 insertions, 12 deletions

diff --git a/noncore/apps/qashmoney/transaction.cpp b/noncore/apps/qashmoney/transaction.cpp
index af7d18f..5ecc7ed 100755
--- a/noncore/apps/qashmoney/transaction.cpp
+++ b/noncore/apps/qashmoney/transaction.cpp
@@ -1,34 +1,35 @@
 // RESERVEDONE COLUMN NAME REPRESENTS THE LINEITEMID AND SHOULD BE CHANGED IN
 // FUTURE VERSIONS OF QASHMONEY
 
 // RESERVEDTWO REPRESENTS THE TRANSACTION DESCRIPTION
 
 #include "transaction.h"
 #include "account.h"
 #include "transactiondisplay.h"
 
 #include <stdlib.h>
+#include <iostream.h>
 
 extern Account *account;
 extern Preferences *preferences;
 
 Transaction::Transaction ()
   {
     tdb = sqlite_open ( "qmtransactions.db", 0, NULL );
   }
 
 Transaction::~Transaction ()
   {
     sqlite_close ( tdb );
   }
 
 void Transaction::addTransaction ( QString description, QString payee, int accountid, int parentid, int number, int day, int month, int year, float amount, int cleared, int budgetid, int lineitemid )
   {
     sqlite_exec_printf ( tdb, "insert into transactions values ( '%q', %i, %i, %i, %i, %i, %i, %.2f, %i, %i, 0, 0, 0, 0, 0, 0, %i, '%q', 0,
     0, 0, 0, NULL );", 0, 0, 0, ( const char * ) payee, accountid, parentid, number, day, month, year, amount, cleared, budgetid, lineitemid, ( const char * ) description );
   }
 
 void Transaction::updateTransaction ( QString description, QString payee, int number, int day, int month, int year, float amount, int cleared, int budgetid, int lineitemid, int transactionid )
   {
     sqlite_exec_printf ( tdb, "update transactions set reservedtwo = '%q', payee = '%q', number = %i, day = %i, month = %i, year = %i, amount = %.2f,
       cleared = %i, budgetid = %i, reservedone = %i where transid = %i;", 0, 0, 0, ( const char * ) description, ( const char * ) payee, number, day, month, year,
@@ -133,84 +134,79 @@ int Transaction::getLineItemID ( int id )
 int Transaction::getDay ( int id )
   {
     char **results;
     sqlite_get_table_printf ( tdb, "select day from transactions where transid= %i;", &results, NULL, NULL, NULL, id );
     QString daystring = results [ 1 ];
     return daystring.toInt();
   }
 
 int Transaction::getMonth ( int id )
   {
     char **results;
     sqlite_get_table_printf ( tdb, "select month from transactions where transid= %i;", &results, NULL, NULL, NULL, id );
     QString monthstring = results [ 1 ];
     return monthstring.toInt();
   }
 
 int Transaction::getYear ( int id )
   {
     char **results;
     sqlite_get_table_printf ( tdb, "select year from transactions where transid= %i;", &results, NULL, NULL, NULL, id );
     QString yearstring = results [ 1 ];
     return yearstring.toInt();
   }
 
-void Transaction::displayTransactions ( QListView *listview, int id, bool children, const char *limit )
+void Transaction::displayTransactions ( QListView *listview, int id, bool children, const char *limit, QDate displaydate )
   {
     int showcleared = preferences->getPreference ( 3 );
+    int year = ( displaydate.year() ) - 1;
 
     // select the transactions to display
     // two different statements are used based on
     // whether we are showing cleared transactions
     char **results;
     int rows, columns;
     if ( showcleared == 0 )
       {
         if ( account->getParentAccountID ( id ) == -1 && children == TRUE )
-          sqlite_get_table_printf ( tdb, "select day, month, year, payee, amount, transid, accountid from transactions where cleared = 0 and parentid = %i and payee like '%q';", &results, &rows, &columns, NULL, id, limit );
+          sqlite_get_table_printf ( tdb, "select day, month, year, payee, amount, transid, accountid from transactions where cleared = 0 and year >= %i parentid = %i and payee like '%q';", &results, &rows, &columns, NULL, year, id, limit );
         else
-          sqlite_get_table_printf ( tdb, "select day, month, year, payee, amount, transid, accountid from transactions where cleared = 0 and accountid = %i and payee like '%q';", &results, &rows, &columns, NULL, id, limit );
+          sqlite_get_table_printf ( tdb, "select day, month, year, payee, amount, transid, accountid from transactions where cleared = 0 year >= %i accountid = %i and payee like '%q';", &results, &rows, &columns, NULL, year, id, limit );
       }
     else
       {
       if ( account->getParentAccountID ( id ) == -1 && children == TRUE )
-          sqlite_get_table_printf ( tdb, "select day, month, year, payee, amount, transid, accountid from transactions where parentid = %i and payee like '%q';", &results, &rows, &columns, NULL, id, limit );
+          sqlite_get_table_printf ( tdb, "select day, month, year, payee, amount, transid, accountid from transactions where year >= %i and parentid = %i and payee like '%q';", &results, &rows, &columns, NULL, year, id, limit );
       else
         sqlite_get_table_printf ( tdb, "select day, month, year, payee, amount, transid, accountid from transactions where accountid = %i and payee like '%q';", &results, &rows, &columns, NULL, id, limit );
       }
 
     // iterate through the result list and display each item
     int counter = 7;
     while ( counter < ( ( rows + 1 ) * columns ) )
       {
-        // construct the date
-        //QString daystring = results [ counter ];
-        //int day = results [ counter ].toInt ();
-        //QString monthstring = results [ counter + 1 ];
-        //int month = results [ counter + 1 ].toInt ();
-        //QString yearstring = results [ counter + 2 ];
-        //int year = results [ counter + 2 ].toInt ();
-        QString date = preferences->getDate ( atoi ( results [ counter + 2 ] ), atoi ( results [ counter + 1 ] ), atoi ( results [ counter ] ) );
+        QDate displaydate ( atoi ( results [ counter + 2 ] ), atoi ( results [ counter + 1 ] ), atoi ( results [ counter ] ) );
+        QString date = preferences->getDate ( atoi ( results [ counter + 2 ] ), atoi ( results [ counter + 1 ] ), atoi ( results [ counter ] ) );
 
         // construct transaction name, amount, id
         QString payee = results [ counter + 3 ];
         QString amount = results [ counter + 4 ];
         QString transferid = results [ counter + 5 ];
 
         //determine the account name of the child accounts that we're displaying
         QString accountname = account->getAccountName ( atoi ( results [ counter + 6 ] ) );
 
         // fill in values
         if ( account->getParentAccountID ( id ) != -1 ) // use these constructors if we're showing a child account
           {
             if ( showcleared == 1 && getCleared ( transferid.toInt() ) == 1 )
               ColorListItem *item = new ColorListItem ( listview, date, payee, amount, transferid);
             else
               QListViewItem *item = new QListViewItem ( listview, date, payee, amount, transferid );
           }
        else
          {
             if ( showcleared == 1 && getCleared ( transferid.toInt() ) == 1 )
               ColorListItem *item = new ColorListItem ( listview, date, payee, amount, transferid, accountname );
             else
               QListViewItem *item = new QListViewItem ( listview, date, payee, amount, transferid, accountname );
          }