From: <gua...@us...> - 2013-09-28 12:11:53
|
Revision: 4611 http://sourceforge.net/p/moneymanagerex/code/4611 Author: guanlisheng Date: 2013-09-28 12:11:51 +0000 (Sat, 28 Sep 2013) Log Message: ----------- cleanup Modified Paths: -------------- trunk/src/categdialog.cpp trunk/src/mmtransaction.cpp trunk/src/mmtransaction.h trunk/src/model/Model_Billsdeposits.h trunk/src/model/Model_Category.h Modified: trunk/src/categdialog.cpp =================================================================== --- trunk/src/categdialog.cpp 2013-09-28 11:43:30 UTC (rev 4610) +++ trunk/src/categdialog.cpp 2013-09-28 12:11:51 UTC (rev 4611) @@ -24,6 +24,7 @@ #include "paths.h" #include "model/Model_Setting.h" #include "model/Model_Infotable.h" +#include "model/Model_Category.h" IMPLEMENT_DYNAMIC_CLASS( mmCategDialog, wxDialog ) @@ -400,7 +401,7 @@ selectButton_->Enable(bEnableSelect_); bool bIncome = false; bool bUsed = core_->bTransactionList_.IsCategoryUsed(categID_, subcategID_, bIncome, subcategID_ == -1) - || core_->bTransactionList_.IsCategoryUsedBD(categID_, subcategID_, subcategID_ == -1); + || Model_Category::is_used(categID_, subcategID_); deleteButton_->Enable(!bUsed); editButton_->Enable(); if (subcategID_ != -1) Modified: trunk/src/mmtransaction.cpp =================================================================== --- trunk/src/mmtransaction.cpp 2013-09-28 11:43:30 UTC (rev 4610) +++ trunk/src/mmtransaction.cpp 2013-09-28 12:11:51 UTC (rev 4611) @@ -1292,27 +1292,3 @@ return bTrxUsed; } -bool mmBankTransactionList::IsCategoryUsedBD(int iCatID, int iSubCatID, bool bIgnor_subcat) const -{ - bool found = false; - - wxSQLite3Statement st = core_->db_->PrepareStatement( (bIgnor_subcat ? SELECT_CATEGID_FROM_BILLSDEPOSITS_V1 : SELECT_SUBCATEGID_FROM_BILLSDEPOSITS_V1) ); - st.Bind(1, iCatID); - if (!bIgnor_subcat) - st.Bind(2, iSubCatID); - - try - { - wxSQLite3ResultSet q1 = st.ExecuteQuery(); - found = q1.NextRow(); - st.Finalize(); - } - catch(const wxSQLite3Exception& e) - { - wxLogDebug("select BILLSDEPOSITS_V1 union BUDGETSPLITTRANSACTIONS_V1 : %s", e.GetMessage()); - wxLogError(wxString::Format(_("Error: %s"), e.GetMessage())); - } - - return found; -} - Modified: trunk/src/mmtransaction.h =================================================================== --- trunk/src/mmtransaction.h 2013-09-28 11:43:30 UTC (rev 4610) +++ trunk/src/mmtransaction.h 2013-09-28 12:11:51 UTC (rev 4611) @@ -192,7 +192,6 @@ int getLastUsedPayeeID(int accountID, const wxString& sType, int& categID, int& subcategID) const; wxArrayString getTransactionNumber(int accountID, const wxDateTime& transaction_date) const; bool IsCategoryUsed(int iCatID, int iSubCatID, bool& bIncome, bool bIgnor_subcat = true) const; - bool IsCategoryUsedBD(int iCatID, int iSubCatID, bool bIgnor_subcat = true) const; bool getDailyBalance(int accountID, std::map<wxDateTime, double>& daily_balance, bool ignoreFuture = false) const; Modified: trunk/src/model/Model_Billsdeposits.h =================================================================== --- trunk/src/model/Model_Billsdeposits.h 2013-09-28 11:43:30 UTC (rev 4610) +++ trunk/src/model/Model_Billsdeposits.h 2013-09-28 12:11:51 UTC (rev 4611) @@ -61,6 +61,11 @@ { return find(db_, col, v); } + template<class V1, class V2> + Data_Set find(COLUMN col1, const V1& v1, COLUMN col2, const V2& v2) + { + return find(db_, col1, v1, col2, v2); + } Data* get(int id) { return this->get(id, this->db_); Modified: trunk/src/model/Model_Category.h =================================================================== --- trunk/src/model/Model_Category.h 2013-09-28 11:43:30 UTC (rev 4610) +++ trunk/src/model/Model_Category.h 2013-09-28 12:11:51 UTC (rev 4611) @@ -23,6 +23,7 @@ #include "Model_Subcategory.h" #include "Model_Checking.h" #include "Model_Account.h" +#include "Model_Billsdeposits.h" class Model_Category : public Model, public DB_Table_CATEGORY_V1 { @@ -60,6 +61,11 @@ { return find(db_, col, v); } + template<class V1, class V2> + Data_Set find(COLUMN col1, const V1& v1, COLUMN col2, const V2& v2) + { + return find(db_, col1, v1, col2, v2); + } Data* get(int id) { return this->get(id, this->db_); @@ -104,10 +110,10 @@ } } - static bool is_used(int id) + static bool is_used(int id, int sub_id = -1) { - // TODO - return true; + Model_Billsdeposits::Data_Set deposits = Model_Billsdeposits::instance().find(Model_Billsdeposits::COL_CATEGID, id, Model_Billsdeposits::COL_SUBCATEGID, sub_id); + return !deposits.empty(); } }; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |