Menu
▾
▴
[Moneymanagerex-commits] SF.net SVN: moneymanagerex:[1761] trunk/mmex/src
|
From: <gua...@us...> - 2012-02-08 06:38:34
|
Revision: 1761
http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1761&view=rev
Author: guanlisheng
Date: 2012-02-08 06:38:27 +0000 (Wed, 08 Feb 2012)
Log Message:
-----------
enhance mmCoreDB: change payeeList_ to private
Modified Paths:
--------------
trunk/mmex/src/billsdepositsdialog.cpp
trunk/mmex/src/mmcoredb.h
trunk/mmex/src/mmex.cpp
trunk/mmex/src/mmpayee.h
trunk/mmex/src/mmtransaction.cpp
trunk/mmex/src/payeedialog.cpp
trunk/mmex/src/qifimport.cpp
trunk/mmex/src/reportpayee.cpp
trunk/mmex/src/transdialog.cpp
trunk/mmex/src/univcsvdialog.cpp
Modified: trunk/mmex/src/billsdepositsdialog.cpp
===================================================================
--- trunk/mmex/src/billsdepositsdialog.cpp 2012-02-07 11:24:14 UTC (rev 1760)
+++ trunk/mmex/src/billsdepositsdialog.cpp 2012-02-08 06:38:27 UTC (rev 1761)
@@ -1173,7 +1173,7 @@
pTransaction->accountID_ = fromAccountID;
pTransaction->toAccountID_ = toAccountID;
- pTransaction->payee_ = core_->payeeList_.getSharedPtr(payeeID_);
+ pTransaction->payee_ = core_->getPayeeSharedPtr(payeeID_);
pTransaction->transType_ = transCode;
pTransaction->amt_ = amount;
pTransaction->status_ = status;
Modified: trunk/mmex/src/mmcoredb.h
===================================================================
--- trunk/mmex/src/mmcoredb.h 2012-02-07 11:24:14 UTC (rev 1760)
+++ trunk/mmex/src/mmcoredb.h 2012-02-08 06:38:27 UTC (rev 1761)
@@ -47,19 +47,27 @@
bool payeeExists(int id) const { return payeeList_.exists(id); }
bool payeeExists(const wxString& name) const { return payeeList_.exists(name); }
int addPayee(const wxString& name) { return payeeList_.add(name); }
+ bool removePayee(int id) { return payeeList_.remove(id); }
+ void updatePayee(int id, const wxString& name) { return payeeList_.update(id, name); }
+ boost::shared_ptr<mmPayee> getPayeeSharedPtr(int id) { return payeeList_.getSharedPtr(id); }
+ int numPayee() const { return payeeList_.num(); }
+ std::pair<mmPayeeList::const_iterator, mmPayeeList::const_iterator> rangePayee() const { return payeeList_.range(); }
public:
mmCoreDB(boost::shared_ptr<wxSQLite3Database>);
boost::shared_ptr<wxSQLite3Database> db_;
- mmPayeeList payeeList_;
mmCategoryList categoryList_;
mmAccountList accountList_;
mmCurrencyList currencyList_;
mmBankTransactionList bTransactionList_;
bool displayDatabaseError_;
+
+private:
+ mmPayeeList payeeList_;
+
};
//----------------------------------------------------------------------------
#endif // _MM_EX_COREDB_H_
Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp 2012-02-07 11:24:14 UTC (rev 1760)
+++ trunk/mmex/src/mmex.cpp 2012-02-08 06:38:27 UTC (rev 1761)
@@ -903,7 +903,7 @@
pTransaction->accountID_ = th.accountID_;
pTransaction->toAccountID_ = th.toAccountID_;
- pTransaction->payee_ = m_core.get()->payeeList_.getSharedPtr(th.payeeID_);
+ pTransaction->payee_ = m_core.get()->getPayeeSharedPtr(th.payeeID_);
pTransaction->transType_ = th.transType_;
pTransaction->amt_ = th.amt_;
pTransaction->status_ = q1.GetString(wxT("STATUS"));
Modified: trunk/mmex/src/mmpayee.h
===================================================================
--- trunk/mmex/src/mmpayee.h 2012-02-07 11:24:14 UTC (rev 1760)
+++ trunk/mmex/src/mmpayee.h 2012-02-08 06:38:27 UTC (rev 1761)
@@ -50,6 +50,9 @@
void sortPayeeList(void);
std::vector< boost::shared_ptr<mmPayee> > entities_;
+ int num() const {return entities_.size(); }
+ typedef std::vector< boost::shared_ptr<mmPayee> >::const_iterator const_iterator;
+ std::pair<const_iterator, const_iterator> range() const { return std::make_pair(entities_.begin(), entities_.end()); }
private:
boost::shared_ptr<wxSQLite3Database> db_;
Modified: trunk/mmex/src/mmtransaction.cpp
===================================================================
--- trunk/mmex/src/mmtransaction.cpp 2012-02-07 11:24:14 UTC (rev 1760)
+++ trunk/mmex/src/mmtransaction.cpp 2012-02-08 06:38:27 UTC (rev 1761)
@@ -152,7 +152,7 @@
transType_ = q1.GetString(wxT("TRANSCODE"));
accountID_ = q1.GetInt(wxT("ACCOUNTID"));
toAccountID_ = q1.GetInt(wxT("TOACCOUNTID"));
- payee_ = core->payeeList_.getSharedPtr(q1.GetInt(wxT("PAYEEID")));
+ payee_ = core->getPayeeSharedPtr(q1.GetInt(wxT("PAYEEID")));
amt_ = q1.GetDouble(wxT("TRANSAMOUNT"));
toAmt_ = q1.GetDouble(wxT("TOTRANSAMOUNT"));
category_ = core->categoryList_.getCategorySharedPtr(q1.GetInt(wxT("CATEGID")), q1.GetInt(wxT("SUBCATEGID")));
@@ -711,7 +711,7 @@
boost::shared_ptr<mmBankTransaction> pBankTransaction = *i;
if (pBankTransaction && (pBankTransaction->payeeID_ == payeeID))
{
- pBankTransaction->payee_ = core->payeeList_.getSharedPtr(payeeID);
+ pBankTransaction->payee_ = core->getPayeeSharedPtr(payeeID);
if (pBankTransaction->transType_ != TRANS_TYPE_TRANSFER_STR)
{
boost::shared_ptr<mmPayee> pPayee = pBankTransaction->payee_.lock();
Modified: trunk/mmex/src/payeedialog.cpp
===================================================================
--- trunk/mmex/src/payeedialog.cpp 2012-02-07 11:24:14 UTC (rev 1760)
+++ trunk/mmex/src/payeedialog.cpp 2012-02-08 06:38:27 UTC (rev 1761)
@@ -236,7 +236,7 @@
void mmPayeeDialog::OnDelete(wxCommandEvent& event)
{
- if (!m_core->payeeList_.remove(m_payee_id))
+ if (!m_core->removePayee(m_payee_id))
{
wxString deletePayeeErrMsg = _("Payee in use.");
deletePayeeErrMsg
@@ -272,7 +272,7 @@
wxString newName = wxGetTextFromUser(mesg, _("Edit Payee Name"), oldname);
if (newName != wxGetEmptyString())
{
- m_core->payeeList_.update(m_payee_id, newName);
+ m_core->updatePayee(m_payee_id, newName);
m_core->bTransactionList_.updateAllTransactionsForPayee(m_core, m_payee_id);
editButton->Disable();
fillControls();
Modified: trunk/mmex/src/qifimport.cpp
===================================================================
--- trunk/mmex/src/qifimport.cpp 2012-02-07 11:24:14 UTC (rev 1760)
+++ trunk/mmex/src/qifimport.cpp 2012-02-08 06:38:27 UTC (rev 1761)
@@ -737,7 +737,7 @@
boost::shared_ptr<mmBankTransaction> pTransaction(new mmBankTransaction(core->db_));
pTransaction->accountID_ = fromAccountID;
pTransaction->toAccountID_ = toAccountID;
- pTransaction->payee_ = core->payeeList_.getSharedPtr(payeeID);
+ pTransaction->payee_ = core->getPayeeSharedPtr(payeeID);
pTransaction->transType_ = type;
pTransaction->amt_ = val;
pTransaction->status_ = status;
Modified: trunk/mmex/src/reportpayee.cpp
===================================================================
--- trunk/mmex/src/reportpayee.cpp 2012-02-07 11:24:14 UTC (rev 1760)
+++ trunk/mmex/src/reportpayee.cpp 2012-02-08 06:38:27 UTC (rev 1761)
@@ -31,10 +31,9 @@
hb.startCenter();
- int numPayees = (int)core_->payeeList_.entities_.size();
// Add the graph
mmGraphPie gg;
- if (numPayees)
+ if (core_->numPayee())
{
hb.addImage(gg.getOutputFileName());
}
@@ -50,10 +49,11 @@
double positiveTotal = 0.0;
double negativeTotal = 0.0;
std::vector<ValuePair> valueList;
- for (int idx = 0; idx < numPayees; idx++)
+ std::pair<mmPayeeList::const_iterator, mmPayeeList::const_iterator> payee_range = core_->rangePayee();
+ for (mmPayeeList::const_iterator it = payee_range.first; it != payee_range.second; ++ it)
{
wxString balance;
- double amt = core_->bTransactionList_.getAmountForPayee(core_->payeeList_.entities_[idx]->id_,
+ double amt = core_->bTransactionList_.getAmountForPayee((*it)->id_,
ignoreDate_, dtBegin_, dtEnd_, mmIniOptions::ignoreFutureTransactions_
);
mmex::formatDoubleToCurrency(amt, balance);
@@ -70,12 +70,12 @@
negativeTotal += amt;
}
ValuePair vp;
- vp.label = core_->payeeList_.entities_[idx]->name_;
+ vp.label = (*it)->name_;
vp.amount = amt;
valueList.push_back(vp);
hb.startTableRow();
- hb.addTableCell(core_->payeeList_.entities_[idx]->name_, false, true);
+ hb.addTableCell((*it)->name_, false, true);
hb.addTableCell(balance, true, true, true, (amt<0.0 ? wxT("RED") : wxT("BLACK")));
hb.endTableRow();
Modified: trunk/mmex/src/transdialog.cpp
===================================================================
--- trunk/mmex/src/transdialog.cpp 2012-02-07 11:24:14 UTC (rev 1760)
+++ trunk/mmex/src/transdialog.cpp 2012-02-08 06:38:27 UTC (rev 1761)
@@ -1066,7 +1066,7 @@
pTransaction->accountID_ = fromAccountID;
pTransaction->toAccountID_ = toAccountID;
- pTransaction->payee_ = core_->payeeList_.getSharedPtr(payeeID_);
+ pTransaction->payee_ = core_->getPayeeSharedPtr(payeeID_);
pTransaction->transType_ = transCode;
pTransaction->amt_ = amount;
pTransaction->status_ = status;
Modified: trunk/mmex/src/univcsvdialog.cpp
===================================================================
--- trunk/mmex/src/univcsvdialog.cpp 2012-02-07 11:24:14 UTC (rev 1760)
+++ trunk/mmex/src/univcsvdialog.cpp 2012-02-08 06:38:27 UTC (rev 1761)
@@ -572,7 +572,7 @@
if (categID_ == -1)
{
- boost::shared_ptr<mmPayee> pPayee = core_->payeeList_.getSharedPtr(payeeID_);
+ boost::shared_ptr<mmPayee> pPayee = core_->getPayeeSharedPtr(payeeID_);
boost::shared_ptr<mmCategory> pCategory = pPayee->category_.lock();
if (!pCategory)
{
@@ -606,7 +606,7 @@
boost::shared_ptr<mmBankTransaction> pTransaction(new mmBankTransaction(core_->db_));
pTransaction->accountID_ = fromAccountID;
pTransaction->toAccountID_ = toAccountID;
- pTransaction->payee_ = core_->payeeList_.getSharedPtr(payeeID_);
+ pTransaction->payee_ = core_->getPayeeSharedPtr(payeeID_);
pTransaction->transType_ = type_;
pTransaction->amt_ = val_;
pTransaction->status_ = status;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|