Menu
▾
▴
[Moneymanagerex-commits] SF.net SVN: moneymanagerex:[1484] trunk/mmex/src
|
From: <ste...@us...> - 2011-10-15 05:05:53
|
Revision: 1484
http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1484&view=rev
Author: stef145g
Date: 2011-10-15 05:05:46 +0000 (Sat, 15 Oct 2011)
Log Message:
-----------
No real change: Code Tidy up. Removal of code using comments to preventing ambiguity.
Modified Paths:
--------------
trunk/mmex/src/dbwrapper.cpp
trunk/mmex/src/dbwrapper.h
trunk/mmex/src/mmcheckingpanel.cpp
trunk/mmex/src/reporttransactions.cpp
trunk/mmex/src/transdialog.cpp
Modified: trunk/mmex/src/dbwrapper.cpp
===================================================================
--- trunk/mmex/src/dbwrapper.cpp 2011-10-14 21:48:43 UTC (rev 1483)
+++ trunk/mmex/src/dbwrapper.cpp 2011-10-15 05:05:46 UTC (rev 1484)
@@ -1074,74 +1074,76 @@
return balance;
}
-bool mmDBWrapper::getExpensesIncome(wxSQLite3Database* db,
- int accountID,
- double& expenses,
- double& income,
- bool ignoreDate,
- wxDateTime dtBegin,
- wxDateTime dtEnd)
-{
- static const std::string sql_base =
- "select ca.TRANSCODE, "
- "ca.TRANSAMOUNT, "
- "ca.STATUS, "
- "ca.TRANSDATE, "
- "cf.BASECONVRATE "
- "from CHECKINGACCOUNT_V1 ca " + joinCURRENCYFORMATS("cf", "ca.ACCOUNTID");
+// Obsolete Code
+// Found as a method of class: mmBankTransactionList - file: mmtransaction.h
+//bool mmDBWrapper::getExpensesIncome(wxSQLite3Database* db,
+// int accountID,
+// double& expenses,
+// double& income,
+// bool ignoreDate,
+// wxDateTime dtBegin,
+// wxDateTime dtEnd)
+//{
+// static const std::string sql_base =
+// "select ca.TRANSCODE, "
+// "ca.TRANSAMOUNT, "
+// "ca.STATUS, "
+// "ca.TRANSDATE, "
+// "cf.BASECONVRATE "
+// "from CHECKINGACCOUNT_V1 ca " + joinCURRENCYFORMATS("cf", "ca.ACCOUNTID");
+//
+// wxSQLite3Statement st;
+//
+// if (accountID != -1)
+// {
+// std::string sql(sql_base);
+// sql += " where ca.ACCOUNTID = ? OR ca.TOACCOUNTID = ?";
+//
+// st = db->PrepareStatement(sql.c_str());
+// st.Bind(1, accountID);
+// st.Bind(2, accountID);
+// }
+// else
+// {
+// st = db->PrepareStatement(sql_base.c_str());
+// }
+//
+// wxSQLite3ResultSet q1 = st.ExecuteQuery();
+// while (q1.NextRow())
+// {
+// wxString transTypeString = q1.GetString(wxT("TRANSCODE"));
+// double transAmount = q1.GetDouble(wxT("TRANSAMOUNT"));
+// wxString transStatus = q1.GetString(wxT("STATUS"));
+// wxString dateString = q1.GetString(wxT("TRANSDATE"));
+// wxDateTime dtdt = mmGetStorageStringAsDate(dateString);
+//
+// double dbRate = q1.GetDouble(wxT("BASECONVRATE"), g_defBASECONVRATE);
+// transAmount = transAmount * dbRate;
+//
+// if (transStatus == wxT("V"))
+// continue; // skip
+//
+// if (!ignoreDate)
+// {
+// if (!dtdt.IsBetween(dtBegin, dtEnd))
+// continue; //skip
+// }
+//
+// if (transTypeString == TRANS_TYPE_DEPOSIT_STR)
+// income += transAmount;
+// else if (transTypeString == TRANS_TYPE_WITHDRAWAL_STR)
+// expenses += transAmount;
+// else if (transTypeString == TRANS_TYPE_TRANSFER_STR)
+// {
+// // transfers are not considered in income/expenses calculations
+// }
+// }
+// st.Finalize();
+//
+// return true;
+//}
- wxSQLite3Statement st;
- if (accountID != -1)
- {
- std::string sql(sql_base);
- sql += " where ca.ACCOUNTID = ? OR ca.TOACCOUNTID = ?";
-
- st = db->PrepareStatement(sql.c_str());
- st.Bind(1, accountID);
- st.Bind(2, accountID);
- }
- else
- {
- st = db->PrepareStatement(sql_base.c_str());
- }
-
- wxSQLite3ResultSet q1 = st.ExecuteQuery();
- while (q1.NextRow())
- {
- wxString transTypeString = q1.GetString(wxT("TRANSCODE"));
- double transAmount = q1.GetDouble(wxT("TRANSAMOUNT"));
- wxString transStatus = q1.GetString(wxT("STATUS"));
- wxString dateString = q1.GetString(wxT("TRANSDATE"));
- wxDateTime dtdt = mmGetStorageStringAsDate(dateString);
-
- double dbRate = q1.GetDouble(wxT("BASECONVRATE"), g_defBASECONVRATE);
- transAmount = transAmount * dbRate;
-
- if (transStatus == wxT("V"))
- continue; // skip
-
- if (!ignoreDate)
- {
- if (!dtdt.IsBetween(dtBegin, dtEnd))
- continue; //skip
- }
-
- if (transTypeString == TRANS_TYPE_DEPOSIT_STR)
- income += transAmount;
- else if (transTypeString == TRANS_TYPE_WITHDRAWAL_STR)
- expenses += transAmount;
- else if (transTypeString == TRANS_TYPE_TRANSFER_STR)
- {
- // transfers are not considered in income/expenses calculations
- }
- }
- st.Finalize();
-
- return true;
-}
-
-
void mmDBWrapper::addPayee(wxSQLite3Database* db, const wxString &payee, int categID, int subcategID)
{
static const char sql[] =
@@ -1886,7 +1888,7 @@
amt = amt - transAmount;
else if (code == TRANS_TYPE_DEPOSIT_STR)
amt = amt + transAmount;
- }
+ }
st.Finalize();
@@ -1941,7 +1943,7 @@
amt = amt - val;
else if (code == TRANS_TYPE_DEPOSIT_STR)
amt = amt + val;
- }
+ }
st.Finalize();
@@ -1976,58 +1978,60 @@
return amt;
}
-double mmDBWrapper::getAmountForPayee(wxSQLite3Database* db, int payeeID,
- bool ignoreDate, wxDateTime dtBegin, wxDateTime dtEnd)
-{
- static const std::string sql =
- "select ca.TRANSCODE, "
- "ca.TRANSAMOUNT, "
- "ca.STATUS, "
- "ca.TRANSDATE, "
- "cf.BASECONVRATE "
- "from CHECKINGACCOUNT_V1 ca " + joinCURRENCYFORMATS("cf", "ca.ACCOUNTID") +
- " where ca.PAYEEID = ?";
+// Obsolete Code
+// Found as a method of class: mmBankTransactionList - file: mmtransaction.h
+//double mmDBWrapper::getAmountForPayee(wxSQLite3Database* db, int payeeID,
+// bool ignoreDate, wxDateTime dtBegin, wxDateTime dtEnd)
+//{
+// static const std::string sql =
+// "select ca.TRANSCODE, "
+// "ca.TRANSAMOUNT, "
+// "ca.STATUS, "
+// "ca.TRANSDATE, "
+// "cf.BASECONVRATE "
+// "from CHECKINGACCOUNT_V1 ca " + joinCURRENCYFORMATS("cf", "ca.ACCOUNTID") +
+// " where ca.PAYEEID = ?";
+//
+// double amt = 0.0;
+//
+// wxSQLite3Statement st = db->PrepareStatement(sql.c_str());
+// st.Bind(1, payeeID);
+//
+// wxSQLite3ResultSet q1 = st.ExecuteQuery();
+//
+// while (q1.NextRow())
+// {
+// wxString code = q1.GetString(wxT("TRANSCODE"));
+// double transAmount = q1.GetDouble(wxT("TRANSAMOUNT"));
+// wxString transStatus = q1.GetString(wxT("STATUS"));
+// wxString dateString = q1.GetString(wxT("TRANSDATE"));
+// wxDateTime dtdt = mmGetStorageStringAsDate(dateString);
+//
+// double dbRate = q1.GetDouble(wxT("BASECONVRATE"), g_defBASECONVRATE);
+// transAmount = transAmount * dbRate;
+//
+// if (transStatus == wxT("V"))
+// continue; // skip
+//
+// if (!ignoreDate)
+// {
+// if (!dtdt.IsBetween(dtBegin, dtEnd))
+// continue; //skip
+// }
+//
+// if (code == TRANS_TYPE_TRANSFER_STR)
+// continue;
+//
+// if (code == TRANS_TYPE_WITHDRAWAL_STR)
+// amt = amt - transAmount;
+// else if (code == TRANS_TYPE_DEPOSIT_STR)
+// amt = amt + transAmount;
+// }
+// st.Finalize();
+//
+// return amt;
+//}
- double amt = 0.0;
-
- wxSQLite3Statement st = db->PrepareStatement(sql.c_str());
- st.Bind(1, payeeID);
-
- wxSQLite3ResultSet q1 = st.ExecuteQuery();
-
- while (q1.NextRow())
- {
- wxString code = q1.GetString(wxT("TRANSCODE"));
- double transAmount = q1.GetDouble(wxT("TRANSAMOUNT"));
- wxString transStatus = q1.GetString(wxT("STATUS"));
- wxString dateString = q1.GetString(wxT("TRANSDATE"));
- wxDateTime dtdt = mmGetStorageStringAsDate(dateString);
-
- double dbRate = q1.GetDouble(wxT("BASECONVRATE"), g_defBASECONVRATE);
- transAmount = transAmount * dbRate;
-
- if (transStatus == wxT("V"))
- continue; // skip
-
- if (!ignoreDate)
- {
- if (!dtdt.IsBetween(dtBegin, dtEnd))
- continue; //skip
- }
-
- if (code == TRANS_TYPE_TRANSFER_STR)
- continue;
-
- if (code == TRANS_TYPE_WITHDRAWAL_STR)
- amt = amt - transAmount;
- else if (code == TRANS_TYPE_DEPOSIT_STR)
- amt = amt + transAmount;
- }
- st.Finalize();
-
- return amt;
-}
-
wxArrayString mmDBWrapper::filterPayees(wxSQLite3Database* db, const wxString& patt)
{
wxSQLite3Statement st = db->PrepareStatement("select PAYEENAME from PAYEE_V1 where PAYEENAME LIKE ? ORDER BY PAYEENAME");
Modified: trunk/mmex/src/dbwrapper.h
===================================================================
--- trunk/mmex/src/dbwrapper.h 2011-10-14 21:48:43 UTC (rev 1483)
+++ trunk/mmex/src/dbwrapper.h 2011-10-15 05:05:46 UTC (rev 1484)
@@ -27,9 +27,9 @@
const int BD_REPEATS_MULTIPLEX_BASE = 100;
-const wxString TRANS_TYPE_WITHDRAWAL_STR = wxT("Withdrawal");
-const wxString TRANS_TYPE_DEPOSIT_STR = wxT("Deposit");
-const wxString TRANS_TYPE_TRANSFER_STR = wxT("Transfer");
+const wxString TRANS_TYPE_WITHDRAWAL_STR = wxT("Withdrawal");
+const wxString TRANS_TYPE_DEPOSIT_STR = wxT("Deposit");
+const wxString TRANS_TYPE_TRANSFER_STR = wxT("Transfer");
enum {DEF_STATUS_NONE , DEF_STATUS_RECONCILED , DEF_STATUS_VOID , DEF_STATUS_FOLLOWUP , DEF_STATUS_DUPLICATE };
enum {DEF_WITHDRAWAL , DEF_DEPOSIT , DEF_TRANSFER};
@@ -84,7 +84,9 @@
double getTotalBalanceOnAccount(wxSQLite3Database* db, int accountID, bool ignoreFuture=false);
double getInitBalanceOnAccount(wxSQLite3Database* db, int accountID);
//double getReconciledBalanceOnAccount(wxSQLite3Database* db, int accountID);
-bool getExpensesIncome(wxSQLite3Database* db, int accountID, double& expenses, double& income, bool ignoreDate, wxDateTime dtbegin, wxDateTime dtEnd);
+
+// Obsolete Code
+//bool getExpensesIncome(wxSQLite3Database* db, int accountID, double& expenses, double& income, bool ignoreDate, wxDateTime dtbegin, wxDateTime dtEnd);
void removeSplitsForAccount(wxSQLite3Database* db, int accountID);
/* Payee Table API */
@@ -93,7 +95,9 @@
bool getPayeeID(wxSQLite3Database* db, const wxString &payee, int& payeeID, int& categID, int& subcategID );
bool updatePayee(wxSQLite3Database* db, const wxString& payeeName, int payeeID, int categID, int subcategID);
bool deletePayeeWithConstraints(wxSQLite3Database* db, int payeeID);
-double getAmountForPayee(wxSQLite3Database* db, int payeeID, bool ignoreDate, wxDateTime dtbegin, wxDateTime dtEnd);
+
+// Obsolete Code
+//double getAmountForPayee(wxSQLite3Database* db, int payeeID, bool ignoreDate, wxDateTime dtbegin, wxDateTime dtEnd);
wxArrayString filterPayees(wxSQLite3Database* db, const wxString& patt);
/* Category Table API */
Modified: trunk/mmex/src/mmcheckingpanel.cpp
===================================================================
--- trunk/mmex/src/mmcheckingpanel.cpp 2011-10-14 21:48:43 UTC (rev 1483)
+++ trunk/mmex/src/mmcheckingpanel.cpp 2011-10-15 05:05:46 UTC (rev 1484)
@@ -890,43 +890,45 @@
wxString infoStr = wxT("");
if (transcodeStr == TRANS_TYPE_TRANSFER_STR)
{
- int tocurrencyid = q1.GetInt(wxT("TOCURRENCYID"));
- double toamount = q1.GetDouble(wxT("TOTRANSAMOUNT"));
- wxString toamountStr;
- double convertion;
- convertion = ( convrate < toconvrate ? amount/toamount : toamount/amount);
- wxString convertionStr;
+ int tocurrencyid = q1.GetInt(wxT("TOCURRENCYID"));
+ double toamount = q1.GetDouble(wxT("TOTRANSAMOUNT"));
+ wxString toamountStr;
+ double convertion;
+ convertion = ( convrate < toconvrate ? amount/toamount : toamount/amount);
+ wxString convertionStr;
- boost::shared_ptr<mmCurrency> pCurrencyPtr = m_core->accountList_.getCurrencyWeakPtr(toaccountId).lock();
- wxASSERT(pCurrencyPtr);
- mmex::CurrencyFormatter::instance().loadSettings(*pCurrencyPtr);
- mmex::formatDoubleToCurrency(toamount, toamountStr);
- mmex::formatDoubleToCurrencyEdit(convertion, convertionStr);
+ boost::shared_ptr<mmCurrency> pCurrencyPtr = m_core->accountList_.getCurrencyWeakPtr(toaccountId).lock();
+ wxASSERT(pCurrencyPtr);
+ mmex::CurrencyFormatter::instance().loadSettings(*pCurrencyPtr);
+ mmex::formatDoubleToCurrency(toamount, toamountStr);
+ mmex::formatDoubleToCurrencyEdit(convertion, convertionStr);
- pCurrencyPtr = m_core->accountList_.getCurrencyWeakPtr(accountId).lock();
- wxASSERT(pCurrencyPtr);
- mmex::CurrencyFormatter::instance().loadSettings(*pCurrencyPtr);
- mmex::formatDoubleToCurrency(amount, amountStr);
- //if (currencyid == basecurrencyid)
- mmex::formatDoubleToCurrencyEdit(convertion, convertionStr);
+ pCurrencyPtr = m_core->accountList_.getCurrencyWeakPtr(accountId).lock();
+ wxASSERT(pCurrencyPtr);
+ mmex::CurrencyFormatter::instance().loadSettings(*pCurrencyPtr);
+ mmex::formatDoubleToCurrency(amount, amountStr);
+ //if (currencyid == basecurrencyid)
+ mmex::formatDoubleToCurrencyEdit(convertion, convertionStr);
- infoStr << amountStr << wxT(" ");
- if (amount!=toamount || tocurrencyid != currencyid)
- infoStr << wxT("-> ") << toamountStr << wxT(" ");
- infoStr << _("From") << wxT(" ") << fromaccStr << wxT(" ") << _("to ") << intoaccStr;
+ infoStr << amountStr << wxT(" ");
+ if (amount!=toamount || tocurrencyid != currencyid)
+ infoStr << wxT("-> ") << toamountStr << wxT(" ");
+ infoStr << _("From") << wxT(" ") << fromaccStr << wxT(" ") << _("to ") << intoaccStr;
if (tocurrencyid != currencyid)
{
- infoStr << wxT(" ( ");
- if (accountId == m_AccountID && convrate < toconvrate)
- {infoStr << tocurpfxStr << wxT("1") << tocursfxStr << wxT(" = ") << curpfxStr << convertionStr << cursfxStr << wxT(" ");}
- else if (accountId == m_AccountID && convrate > toconvrate)
- {infoStr << curpfxStr << wxT("1") << cursfxStr << wxT(" = ") << tocurpfxStr << convertionStr << tocursfxStr << wxT(" ");}
- else if (accountId != m_AccountID && convrate < toconvrate)
- {infoStr << tocurpfxStr << wxT("1") << tocursfxStr << wxT(" = ") << curpfxStr << convertionStr << cursfxStr << wxT(" ");}
- else
- {infoStr << curpfxStr << wxT("1") << cursfxStr << wxT(" = ") << tocurpfxStr << convertionStr << tocursfxStr << wxT(" ");}
- infoStr << wxT(" )");
+ infoStr << wxT(" ( ");
+ if (accountId == m_AccountID && convrate < toconvrate)
+ {
+ infoStr << tocurpfxStr << wxT("1") << tocursfxStr << wxT(" = ") << curpfxStr << convertionStr << cursfxStr << wxT(" ");
+ } else if (accountId == m_AccountID && convrate > toconvrate) {
+ infoStr << curpfxStr << wxT("1") << cursfxStr << wxT(" = ") << tocurpfxStr << convertionStr << tocursfxStr << wxT(" ");
+ } else if (accountId != m_AccountID && convrate < toconvrate) {
+ infoStr << tocurpfxStr << wxT("1") << tocursfxStr << wxT(" = ") << curpfxStr << convertionStr << cursfxStr << wxT(" ");
+ } else {
+ infoStr << curpfxStr << wxT("1") << cursfxStr << wxT(" = ") << tocurpfxStr << convertionStr << tocursfxStr << wxT(" ");
+ }
+ infoStr << wxT(" )");
}
}
else //For deposits and withdrawals calculates amount in base currency
Modified: trunk/mmex/src/reporttransactions.cpp
===================================================================
--- trunk/mmex/src/reporttransactions.cpp 2011-10-14 21:48:43 UTC (rev 1483)
+++ trunk/mmex/src/reporttransactions.cpp 2011-10-15 05:05:46 UTC (rev 1484)
@@ -79,7 +79,7 @@
double total = 0;
for (unsigned int index = 0; index < trans_->size(); index++)
{
- std::vector<wxString> data;
+ // std::vector<wxString> data;
std::vector<boost::shared_ptr<mmBankTransaction> >& refTrans = *trans_;
// For transfer transactions, we need to fix the data reference point first.
Modified: trunk/mmex/src/transdialog.cpp
===================================================================
--- trunk/mmex/src/transdialog.cpp 2011-10-14 21:48:43 UTC (rev 1483)
+++ trunk/mmex/src/transdialog.cpp 2011-10-15 05:05:46 UTC (rev 1484)
@@ -1,5 +1,6 @@
/*******************************************************
Copyright (C) 2006 Madhan Kanagavel
+ Copyright (C) 2011 Nikolay & Stefano Giorgio
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -978,9 +979,9 @@
return;
}
- fromAccountID = payeeID_;
- toAccountID = toID_;
- payeeID_ = -1;
+ fromAccountID = payeeID_;
+ toAccountID = toID_;
+ payeeID_ = -1;
}
else
{
@@ -1151,53 +1152,52 @@
//----------------------------------------------------------------------------
-void mmTransDialog::OnFrequentUsedNotes(wxCommandEvent& event)
+void mmTransDialog::OnFrequentUsedNotes(wxCommandEvent& /*event*/)
{
- wxCommandEvent ev(wxEVT_COMMAND_MENU_SELECTED, ID_DIALOG_TRANS_BUTTON_FREQENTNOTES) ;
- ev.SetEventObject( this );
+ wxCommandEvent ev(wxEVT_COMMAND_MENU_SELECTED, ID_DIALOG_TRANS_BUTTON_FREQENTNOTES) ;
+ ev.SetEventObject( this );
wxString notes = textNotes_->GetValue();
if (notes.IsEmpty ())
- {
-
- wxMenu menu;
-
- char sql[] =
- "select max (TRANSDATE) as TRANSDATE , count (notes) COUNT, "
- "(case when accountid = ? then '1' else '2' end) as ACC "
- ",replace (substr (notes, 1, 20), x'0A', ' ')||(case when length(notes)>20 then '...' else '' end) as NOTE, "
- "notes as NOTES "
- "from checkingaccount_v1 ca "
- "where notes is not '' "
- "and TRANSDATE< date ('now', '1 day', 'localtime') "
- "group by rtrim (notes) "
- "order by ACC, TRANSDATE desc, COUNT desc "
- "limit ? ";
-
- wxSQLite3Statement st = db_->PrepareStatement(sql);
- st.Bind(1, accountID_);
- st.Bind(2, NOTES_MENU_NUMBER);
- wxSQLite3ResultSet q1 = st.ExecuteQuery();
- int menu_id=1;
- while (q1.NextRow())
{
- freqnotes.Add(q1.GetString(wxT("NOTES")));
- wxString noteSTR = q1.GetString(wxT("NOTE"));
- menu.Append(menu_id++, noteSTR);
- }
- q1.Finalize();
+ wxMenu menu;
+
+ char sql[] =
+ "select max (TRANSDATE) as TRANSDATE , count (notes) COUNT, "
+ "(case when accountid = ? then '1' else '2' end) as ACC "
+ ",replace (substr (notes, 1, 20), x'0A', ' ')||(case when length(notes)>20 then '...' else '' end) as NOTE, "
+ "notes as NOTES "
+ "from checkingaccount_v1 ca "
+ "where notes is not '' "
+ "and TRANSDATE< date ('now', '1 day', 'localtime') "
+ "group by rtrim (notes) "
+ "order by ACC, TRANSDATE desc, COUNT desc "
+ "limit ? ";
+
+ wxSQLite3Statement st = db_->PrepareStatement(sql);
+ st.Bind(1, accountID_);
+ st.Bind(2, NOTES_MENU_NUMBER);
+ wxSQLite3ResultSet q1 = st.ExecuteQuery();
+ int menu_id=1;
+ while (q1.NextRow())
+ {
+ freqnotes.Add(q1.GetString(wxT("NOTES")));
+ wxString noteSTR = q1.GetString(wxT("NOTE"));
+ menu.Append(menu_id++, noteSTR);
+ }
+ q1.Finalize();
- if (menu_id>1)
- PopupMenu(&menu, 60, 30+((NOTES_MENU_NUMBER-menu_id-1)*23));
+ if (menu_id>1)
+ PopupMenu(&menu, 60, 30+((NOTES_MENU_NUMBER-menu_id-1)*23));
- }
+ }
}
//----------------------------------------------------------------------------
void mmTransDialog::onNoteSelected(wxCommandEvent& event)
{
- int i = event.GetId();
- if (i>0)
- textNotes_->SetValue (freqnotes.Item (i-1)) ;
+ int i = event.GetId();
+ if (i>0)
+ textNotes_->SetValue (freqnotes.Item (i-1)) ;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|