From: <ste...@us...> - 2011-10-08 09:44:48
|
Revision: 1477 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1477&view=rev Author: stef145g Date: 2011-10-08 09:44:42 +0000 (Sat, 08 Oct 2011) Log Message: ----------- Allow new transaction filter to search for empty note and/or empty number fields Modified Paths: -------------- trunk/mmex/src/transactionfilterdialog.cpp trunk/mmex/src/transactionfilterdialog.h Modified: trunk/mmex/src/transactionfilterdialog.cpp =================================================================== --- trunk/mmex/src/transactionfilterdialog.cpp 2011-10-07 22:42:10 UTC (rev 1476) +++ trunk/mmex/src/transactionfilterdialog.cpp 2011-10-08 09:44:42 UTC (rev 1477) @@ -434,33 +434,30 @@ return result; } -bool TransFilterDialog::byTransNumber(wxString trNum) +bool TransFilterDialog::searchResult( wxCheckBox* chkBox, wxTextCtrl* txtCtrl, wxString sourceStr) { bool result = false; - if ( cbTransNumber_->GetValue() ) - { - wxString trNumFilter = txtTransNumber_->GetValue().Trim().Lower(); - if (trNum.Trim().Lower() == trNumFilter ) - { + if ( chkBox->GetValue() ) { + if (txtCtrl->GetValue().IsEmpty()) { + if (sourceStr.IsEmpty()) { + result = true; + } + } else if (sourceStr.Trim().Lower().Find(txtCtrl->GetValue().Trim().Lower()) != wxNOT_FOUND ) { result = true; } - } - else + } else { result = true; + } return result; } -bool TransFilterDialog::byNotes(wxString notes) +bool TransFilterDialog::byTransNumber(wxString trNum) { - bool result = false; - if ( cbNotes_->GetValue() ) - { - if (notes.Lower().Find(txtNotes_->GetValue().Lower()) != wxNOT_FOUND ) - result = true; - } - else - result = true; + return searchResult(cbTransNumber_,txtTransNumber_,trNum); +} - return result; +bool TransFilterDialog::byNotes(wxString notes) +{ + return searchResult(cbNotes_,txtNotes_,notes); } Modified: trunk/mmex/src/transactionfilterdialog.h =================================================================== --- trunk/mmex/src/transactionfilterdialog.h 2011-10-07 22:42:10 UTC (rev 1476) +++ trunk/mmex/src/transactionfilterdialog.h 2011-10-08 09:44:42 UTC (rev 1477) @@ -104,7 +104,7 @@ void OnButtonOK( wxCommandEvent& event ); void OnButtonCancel( wxCommandEvent& event ); - + bool searchResult( wxCheckBox* chkBox, wxTextCtrl* txtCtrl, wxString sourceStr); }; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |