Menu
▾
▴
[Moneymanagerex-commits] SF.net SVN: moneymanagerex:[4715] trunk/src
|
From: <vo...@us...> - 2013-10-05 18:22:54
|
Revision: 4715
http://sourceforge.net/p/moneymanagerex/code/4715
Author: vomikan
Date: 2013-10-05 18:22:51 +0000 (Sat, 05 Oct 2013)
Log Message:
-----------
more Model_Splittransaction
Modified Paths:
--------------
trunk/src/billsdepositsdialog.cpp
trunk/src/mmcheckingpanel.cpp
trunk/src/splittransactionsdialog.cpp
trunk/src/splittransactionsdialog.h
trunk/src/transdialog.cpp
Modified: trunk/src/billsdepositsdialog.cpp
===================================================================
--- trunk/src/billsdepositsdialog.cpp 2013-10-05 14:49:14 UTC (rev 4714)
+++ trunk/src/billsdepositsdialog.cpp 2013-10-05 18:22:51 UTC (rev 4715)
@@ -1331,7 +1331,9 @@
void mmBDDialog::activateSplitTransactionsDlg()
{
- SplitTransactionDialog dlg(core_, split_.get(),transaction_type_->GetSelection(), this);
+ Model_Checking::Data *transaction = Model_Checking::instance().get(transID_);
+ Model_Splittransaction::Data_Set split = Model_Checking::splittransaction(transaction);
+ SplitTransactionDialog dlg(split, this, transaction_type_->GetSelection(), core_, split_.get());
if (dlg.ShowModal() == wxID_OK)
{
double amount = split_->getTotalSplits();
Modified: trunk/src/mmcheckingpanel.cpp
===================================================================
--- trunk/src/mmcheckingpanel.cpp 2013-10-05 14:49:14 UTC (rev 4714)
+++ trunk/src/mmcheckingpanel.cpp 2013-10-05 18:22:51 UTC (rev 4715)
@@ -1900,11 +1900,14 @@
if (transTypeStr== TRANS_TYPE_DEPOSIT_STR) transType = 1;
if (transTypeStr== TRANS_TYPE_TRANSFER_STR) transType = 2;
+ Model_Checking::Data *transaction = Model_Checking::instance().get(transID);
+ Model_Splittransaction::Data_Set split = Model_Checking::splittransaction(transaction);
SplitTransactionDialog splitTransDialog(
- core_,
- core_->bTransactionList_.getBankTransactionPtr(transID)->splitEntries_,
- transType,
- this
+ split
+ , this
+ , transType
+ , core_
+ , core_->bTransactionList_.getBankTransactionPtr(transID)->splitEntries_
);
splitTransDialog.SetDisplaySplitCategories();
splitTransDialog.ShowModal();
Modified: trunk/src/splittransactionsdialog.cpp
===================================================================
--- trunk/src/splittransactionsdialog.cpp 2013-10-05 14:49:14 UTC (rev 4714)
+++ trunk/src/splittransactionsdialog.cpp 2013-10-05 18:22:51 UTC (rev 4715)
@@ -41,23 +41,22 @@
}
SplitTransactionDialog::SplitTransactionDialog(
- mmCoreDB* core,
- mmSplitTransactionEntries* split,
- int transType,
- wxWindow* parent, wxWindowID id,
- const wxString& caption,
- const wxPoint& pos,
- const wxSize& size,
- long style )
+ Model_Splittransaction::Data_Set &split
+ , wxWindow* parent
+ , int transType
+ , mmCoreDB* core
+ , mmSplitTransactionEntries* splt)
{
- core_ = core;
+ core_ = core;
+ splt_ = splt;
split_ = split;
-
transType_ = transType;
if (transType_ == DEF_TRANSFER)
transType_ = DEF_WITHDRAWAL;
- Create(parent, id, caption, pos, size, style);
+ long style = wxCAPTION|wxRESIZE_BORDER|wxSYSTEM_MENU|wxCLOSE_BOX;
+ Create(parent, wxID_ANY, _("Split Transaction Dialog")
+ , wxDefaultPosition, wxSize(400, 300), style);
}
bool SplitTransactionDialog::Create( wxWindow* parent, wxWindowID id,
@@ -84,13 +83,13 @@
{
lcSplit_->DeleteAllItems();
long idx = 0;
- for (const auto & entry : split_->entries_)
+ for (const auto & entry : split_)
{
lcSplit_->InsertItem((long)idx
- , core_->categoryList_.GetFullCategoryString(entry->categID_, entry->subCategID_)
+ , core_->categoryList_.GetFullCategoryString(entry.CATEGID, entry.SUBCATEGID)
, -1);
- lcSplit_->SetItem((long)idx++, 1, CurrencyFormatter::float2String(entry->splitAmount_));
+ lcSplit_->SetItem((long)idx++, 1, CurrencyFormatter::float2String(entry.SPLITTRANSAMOUNT));
}
UpdateSplitTotal();
itemButtonNew_->SetFocus();
@@ -186,7 +185,7 @@
pSplitEntry->splitAmount_ = *sdd.m_amount_;
pSplitEntry->categID_ = categID;
pSplitEntry->subCategID_ = subcategID;
- split_->addSplit(pSplitEntry);
+ splt_->addSplit(pSplitEntry);
UpdateSplitTotal();
}
@@ -203,7 +202,7 @@
if (item >= 0) // Item found in list
{
lcSplit_->DeleteItem(item);
- split_->removeSplitByIndex(item);
+ splt_->removeSplitByIndex(item);
UpdateSplitTotal();
}
}
@@ -225,7 +224,7 @@
void SplitTransactionDialog::UpdateSplitTotal()
{
- transAmount_->SetLabel(CurrencyFormatter::float2String(split_->getTotalSplits()));
+ transAmount_->SetLabel(CurrencyFormatter::float2String(splt_->getTotalSplits()));
}
long SplitTransactionDialog::GetSelectedItem()
@@ -251,17 +250,17 @@
long item = this->GetSelectedItem();
if (item == wxNOT_FOUND) return;
- int categID = split_->entries_[item]->categID_;
- int subCategID = split_->entries_[item]->subCategID_;
- double amount = split_->entries_[item]->splitAmount_;
+ int categID = splt_->entries_[item]->categID_;
+ int subCategID = splt_->entries_[item]->subCategID_;
+ double amount = splt_->entries_[item]->splitAmount_;
wxString category = core_->categoryList_.GetFullCategoryString(categID,subCategID);
SplitDetailDialog sdd(core_, category, &categID, &subCategID, &amount, transType_, this);
if (sdd.ShowModal() == wxID_OK)
{
- split_->entries_[item]->categID_ = categID;
- split_->entries_[item]->subCategID_ = subCategID;
- split_->entries_[item]->splitAmount_ = amount;
+ splt_->entries_[item]->categID_ = categID;
+ splt_->entries_[item]->subCategID_ = subCategID;
+ splt_->entries_[item]->splitAmount_ = amount;
DataToControls();
UpdateSplitTotal();
}
Modified: trunk/src/splittransactionsdialog.h
===================================================================
--- trunk/src/splittransactionsdialog.h 2013-10-05 14:49:14 UTC (rev 4714)
+++ trunk/src/splittransactionsdialog.h 2013-10-05 18:22:51 UTC (rev 4715)
@@ -21,6 +21,7 @@
#include "guiid.h"
#include "mmtransaction.h"
+#include "model\Model_Splittransaction.h"
////@end includes
/*!
@@ -31,22 +32,7 @@
class wxListCtrl;
////@end forward declarations
-/*!
- * Control identifiers
- */
-
-////@begin control identifiers
-#define ID_SPLITTRANSACTIONS_DIALOG 10117
-#define SYMBOL_SPLITTRANSACTIONDIALOG_STYLE wxCAPTION|wxRESIZE_BORDER|wxSYSTEM_MENU|wxCLOSE_BOX
-#define SYMBOL_SPLITTRANSACTIONDIALOG_TITLE _("Split Transaction Dialog")
-#define SYMBOL_SPLITTRANSACTIONDIALOG_IDNAME ID_SPLITTRANSACTIONS_DIALOG
-#define SYMBOL_SPLITTRANSACTIONDIALOG_SIZE wxSize(400, 300)
-#define SYMBOL_SPLITTRANSACTIONDIALOG_POSITION wxDefaultPosition
#define ID_LISTCTRL3 10118
-//#define ID_BUTTONADD 10119
-//#define ID_BUTTONREMOVE 10120
-//#define ID_BUTTONCLOSE 10121
-////@end control identifiers
/*!
* Compatibility
@@ -72,24 +58,20 @@
/// Constructors
SplitTransactionDialog( );
SplitTransactionDialog(
+ Model_Splittransaction::Data_Set &split,
+ wxWindow* parent,
+ int transType,
mmCoreDB* core,
- mmSplitTransactionEntries* split,
- int transType,
- wxWindow* parent,
- wxWindowID id = SYMBOL_SPLITTRANSACTIONDIALOG_IDNAME,
- const wxString& caption = SYMBOL_SPLITTRANSACTIONDIALOG_TITLE,
- const wxPoint& pos = SYMBOL_SPLITTRANSACTIONDIALOG_POSITION,
- const wxSize& size = SYMBOL_SPLITTRANSACTIONDIALOG_SIZE,
- long style = SYMBOL_SPLITTRANSACTIONDIALOG_STYLE );
+ mmSplitTransactionEntries* splt);
/// Creation
bool Create(
wxWindow* parent,
- wxWindowID id = SYMBOL_SPLITTRANSACTIONDIALOG_IDNAME,
- const wxString& caption = SYMBOL_SPLITTRANSACTIONDIALOG_TITLE,
- const wxPoint& pos = SYMBOL_SPLITTRANSACTIONDIALOG_POSITION,
- const wxSize& size = SYMBOL_SPLITTRANSACTIONDIALOG_SIZE,
- long style = SYMBOL_SPLITTRANSACTIONDIALOG_STYLE );
+ wxWindowID id,
+ const wxString& caption,
+ const wxPoint& pos,
+ const wxSize& size,
+ long style);
/// Creates the controls and sizers
void CreateControls();
@@ -122,10 +104,12 @@
void SetDisplaySplitCategories();
private:
- mmCoreDB* core_;
- mmSplitTransactionEntries* split_;
+ Model_Splittransaction::Data_Set split_;
int transType_;
+ mmCoreDB* core_;
+ mmSplitTransactionEntries* splt_;
+
wxButton* itemButtonNew_;
wxButton* itemButtonEdit_;
wxButton* itemButtonDelete_;
Modified: trunk/src/transdialog.cpp
===================================================================
--- trunk/src/transdialog.cpp 2013-10-05 14:49:14 UTC (rev 4714)
+++ trunk/src/transdialog.cpp 2013-10-05 18:22:51 UTC (rev 4715)
@@ -1062,7 +1062,7 @@
transaction_->CATEGID = -1;
transaction_->SUBCATEGID = -1;
- SplitTransactionDialog dlg(core_, split_, transaction_type_->GetSelection(), this);
+ SplitTransactionDialog dlg(splt_, this, transaction_type_->GetSelection(), core_, split_);
if (dlg.ShowModal() == wxID_OK)
{
double amount = split_->getTotalSplits();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|