Menu
▾
▴
[Moneymanagerex-commits] SF.net SVN: moneymanagerex:[3111] trunk/mmex/src
|
From: <vo...@us...> - 2012-11-05 18:16:15
|
Revision: 3111
http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=3111&view=rev
Author: vomikan
Date: 2012-11-05 18:16:05 +0000 (Mon, 05 Nov 2012)
Log Message:
-----------
update
Modified Paths:
--------------
trunk/mmex/src/filtertransdialog.cpp
trunk/mmex/src/filtertransdialog.h
trunk/mmex/src/mmex.cpp
trunk/mmex/src/reporttransactions.cpp
Modified: trunk/mmex/src/filtertransdialog.cpp
===================================================================
--- trunk/mmex/src/filtertransdialog.cpp 2012-11-05 15:41:25 UTC (rev 3110)
+++ trunk/mmex/src/filtertransdialog.cpp 2012-11-05 18:16:05 UTC (rev 3111)
@@ -91,6 +91,7 @@
accountCheckBox_ ->SetValue(status);
accountDropDown_ ->Enable(status);
accountDropDown_ ->SetStringSelection(value);
+ refAccountID_ = core_->accountList_.GetAccountId(value);
status = get_next_value(tkz, value);
dateRangeCheckBox_ ->SetValue(status);
@@ -186,6 +187,9 @@
accountDropDown_ = new wxChoice( itemPanel, wxID_STATIC, wxDefaultPosition, wxSize(fieldWidth,-1), as, 0 );
itemPanelSizer->Add(accountDropDown_, flags);
+ accountDropDown_ -> Connect(wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED,
+ wxCommandEventHandler(mmFilterTransactionsDialog::accountSelected), NULL, this);
+
//--End of Row --------------------------------------------------------
dateRangeCheckBox_ = new wxCheckBox( itemPanel, wxID_STATIC, _("Date Range"),
@@ -210,7 +214,8 @@
btnPayee_ = new wxButton( itemPanel, wxID_STATIC, _("Select Payee"),
wxDefaultPosition, wxSize(fieldWidth,-1), 0 );
- btnPayee_->Connect(wxID_STATIC, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(mmFilterTransactionsDialog::OnPayee), NULL, this);
+ btnPayee_->Connect(wxID_STATIC, wxEVT_COMMAND_BUTTON_CLICKED,
+ wxCommandEventHandler(mmFilterTransactionsDialog::OnPayee), NULL, this);
itemPanelSizer->Add(btnPayee_, flags);
//--End of Row --------------------------------------------------------
@@ -222,7 +227,8 @@
btnCategory_ = new wxButton( itemPanel, wxID_STATIC, wxT(""),
wxDefaultPosition, wxSize(fieldWidth,-1));
- btnCategory_->Connect(wxID_STATIC, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(mmFilterTransactionsDialog::OnCategs), NULL, this);
+ btnCategory_->Connect(wxID_STATIC, wxEVT_COMMAND_BUTTON_CLICKED,
+ wxCommandEventHandler(mmFilterTransactionsDialog::OnCategs), NULL, this);
itemPanelSizer->Add(btnCategory_, flags);
//--End of Row --------------------------------------------------------
@@ -427,6 +433,12 @@
}
}
+wxString mmFilterTransactionsDialog::getAccountName()
+{
+ wxString accountName = core_->accountList_.GetAccountName(refAccountID_);
+ return accountName;
+}
+
bool mmFilterTransactionsDialog::getDateRange(wxDateTime& startDate, wxDateTime& endDate) const
{
if (dateRangeCheckBox_->IsChecked())
@@ -496,13 +508,6 @@
return withdraval+wxT(";")+deposit+wxT(";")+transfer;
}
-wxString mmFilterTransactionsDialog::userStatusStr() const
-{
- if (statusCheckBox_->IsChecked())
- return choiceStatus_->GetStringSelection();
- return wxT("");
-}
-
wxString mmFilterTransactionsDialog::userTypeStr() const
{
wxString transCode = wxEmptyString;
@@ -511,18 +516,18 @@
if (cbTypeWithdrawal_->GetValue())
transCode = wxGetTranslation(TRANS_TYPE_WITHDRAWAL_STR);
if (cbTypeDeposit_->GetValue())
- transCode << (transCode.IsEmpty() ? wxT("") : wxT(", "))
- << wxGetTranslation(TRANS_TYPE_DEPOSIT_STR);
+ transCode << (transCode.IsEmpty() ? wxT("") : wxT(", ")) << wxGetTranslation(TRANS_TYPE_DEPOSIT_STR);
if (cbTypeTransfer_->GetValue())
- transCode << (transCode.IsEmpty() ? wxT("") : wxT(", "))
- << wxGetTranslation(TRANS_TYPE_TRANSFER_STR);
+ transCode << (transCode.IsEmpty() ? wxT("") : wxT(", ")) << wxGetTranslation(TRANS_TYPE_TRANSFER_STR);
}
return transCode;
}
-int mmFilterTransactionsDialog::getAccountID()
+wxString mmFilterTransactionsDialog::userStatusStr() const
{
- return core_->accountList_.GetAccountId(accountDropDown_->GetStringSelection());
+ if (statusCheckBox_->IsChecked())
+ return choiceStatus_->GetStringSelection();
+ return wxT("");
}
double mmFilterTransactionsDialog::getAmountMin()
@@ -555,20 +560,6 @@
return amountRangeStr;
}
-wxString mmFilterTransactionsDialog::userTransNumberStr() const
-{
- if (transNumberCheckBox_->IsChecked())
- return transNumberEdit_->GetValue().Trim().Lower();
- return wxT("");
-}
-
-wxString mmFilterTransactionsDialog::userNotesStr() const
-{
- if (notesCheckBox_->IsChecked())
- return notesEdit_->GetValue().Trim().Lower();
- return wxT("");
-}
-
void mmFilterTransactionsDialog::OnButtonSaveClick( wxCommandEvent& /*event*/ )
{
int i = m_radio_box_->GetSelection();
@@ -643,3 +634,11 @@
return settings_string_;
}
+
+void mmFilterTransactionsDialog::accountSelected(wxCommandEvent& event)
+{
+ int id = event.GetId();
+ wxString accountName = accountDropDown_->GetStringSelection();
+ refAccountStr_ = accountName;
+ refAccountID_ = core_->accountList_.GetAccountId(accountName);
+}
Modified: trunk/mmex/src/filtertransdialog.h
===================================================================
--- trunk/mmex/src/filtertransdialog.h 2012-11-05 15:41:25 UTC (rev 3110)
+++ trunk/mmex/src/filtertransdialog.h 2012-11-05 18:16:05 UTC (rev 3111)
@@ -44,11 +44,9 @@
long style = SYMBOL_MMFILTERTRANSACTIONSDIALOG_STYLE
);
- int getRefAccountID() {return refAccountID_;}
- wxString getRefAccountStr() {return refAccountStr_;}
-
bool getAccountCheckBox() {return accountCheckBox_->GetValue();}
- int getAccountID();
+ int getAccountID() {return refAccountID_;}
+ wxString getAccountName();
bool getDateRangeCheckBox() {return dateRangeCheckBox_->GetValue();}
wxDateTime getFromDateCtrl() {return fromDateCtrl_->GetValue();}
@@ -85,14 +83,9 @@
wxString userDateRangeStr() const;
/// Returns the Status string, when Status is selected.
wxString userStatusStr() const;
- /// Returns the Type string, when Type is selected.
- wxString userTypeStr() const;
/// Returns the amount range string, when Amount Range is selected.
wxString userAmountRangeStr() const;
- /// Returns the transaction Number string, when Number is selected.
- wxString userTransNumberStr() const;
- /// Returns the user Note string, when Notes is selected.
- wxString userNotesStr() const;
+ wxString userTypeStr() const;
/// Returns true with valid dates, when the dialog date range is selected.
bool getDateRange(wxDateTime& startDate, wxDateTime& endDate) const;
@@ -160,6 +153,7 @@
int payeeID_;
int refAccountID_;
wxString refAccountStr_;
+ void accountSelected(wxCommandEvent& event);
};
Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp 2012-11-05 15:41:25 UTC (rev 3110)
+++ trunk/mmex/src/mmex.cpp 2012-11-05 18:16:05 UTC (rev 3111)
@@ -3397,10 +3397,7 @@
//std::sort((*trans).begin(), (*trans).end(), sortTransactionsByDate1);
-
-
-
- mmReportTransactions* rs = new mmReportTransactions(trans, m_core.get(), dlg->getRefAccountID(), dlg->getRefAccountStr(), dlg);
+ mmReportTransactions* rs = new mmReportTransactions(trans, m_core.get(), dlg->getAccountID(), dlg->getAccountName(), dlg);
menuPrintingEnable(true);
createReportsPage(rs);
}
Modified: trunk/mmex/src/reporttransactions.cpp
===================================================================
--- trunk/mmex/src/reporttransactions.cpp 2012-11-05 15:41:25 UTC (rev 3110)
+++ trunk/mmex/src/reporttransactions.cpp 2012-11-05 18:16:05 UTC (rev 3111)
@@ -185,18 +185,18 @@
// Extract the parameters from the transaction dialog and add them to the report.
wxString filterDetails;
- if ( !transDialog_->getRefAccountStr().IsEmpty())
- filterDetails << wxT("<b>") << _("Account:") << wxT(" </b>") << transDialog_->getRefAccountStr() << wxT("<br>");
+ if ( transDialog_->getAccountCheckBox())
+ filterDetails << wxT("<b>") << _("Account:") << wxT(" </b>") << transDialog_->getAccountName() << wxT("<br>");
//Date range
- if ( !transDialog_->userDateRangeStr().IsEmpty())
+ if ( transDialog_->getDateRangeCheckBox())
filterDetails << wxT("<b>") << _("Date Range:") << wxT(" </b>") << transDialog_->userDateRangeStr() << wxT("<br>");
//Payees
- if ( !transDialog_->userPayeeStr().IsEmpty())
+ if ( transDialog_->getPayeeCheckBox())
filterDetails << wxT("<b>") << _("Payee:") << wxT(" </b>") <<transDialog_->userPayeeStr() << wxT("<br>");
//Category
- if ( !transDialog_->userCategoryStr().IsEmpty())
+ if ( transDialog_->getCategoryCheckBox())
filterDetails << wxT("<b>") << _("Category:") << wxT(" </b>") <<transDialog_->userCategoryStr() << wxT("<br>");
//Status
@@ -206,14 +206,14 @@
if ( transDialog_->getTypeCheckBox() )
filterDetails << wxT("<b>") << _("Type:") << wxT(" </b>") <<transDialog_->userTypeStr() << wxT("<br>");
//Amount Range
- if ( !transDialog_->userAmountRangeStr().IsEmpty())
+ if ( transDialog_->getAmountRangeCheckBox())
filterDetails << wxT("<b>") << _("Amount Range:") << wxT(" </b>") <<transDialog_->userAmountRangeStr() << wxT("<br>");
//Number
- if ( !transDialog_->userTransNumberStr().IsEmpty())
- filterDetails << wxT("<b>") << _("Number:") << wxT(" </b>") <<transDialog_->userTransNumberStr() << wxT("<br>");
+ if ( transDialog_->getNumberCheckBox())
+ filterDetails << wxT("<b>") << _("Number:") << wxT(" </b>") <<transDialog_->getNumber() << wxT("<br>");
//Notes
- if ( !transDialog_->userNotesStr().IsEmpty())
- filterDetails << wxT("<b>") << _("Notes:") << wxT(" </b>") <<transDialog_->userNotesStr() << wxT("<br>");
+ if ( transDialog_->getNotesCheckBox())
+ filterDetails << wxT("<b>") << _("Notes:") << wxT(" </b>") <<transDialog_->getNotes() << wxT("<br>");
if ( !filterDetails.IsEmpty())
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|