* Remove all Operation's pointers because they are dereferenced when an element of operation's vector is suppressed : so group delete works !!! (whouhou).
This commit is contained in:
parent
6e0b51c9fe
commit
5245ec2623
|
|
@ -263,7 +263,7 @@ void KissCount::GenerateMonth(int monthFrom, int yearFrom, int monthTo, int year
|
|||
it2++)
|
||||
if (it2->id == it->parent)
|
||||
{
|
||||
it2->childs.push_back(&(*it));
|
||||
it2->childs.push_back(it->id);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ public:
|
|||
wxString transfert;
|
||||
wxString formula;
|
||||
bool meta;
|
||||
std::vector<Operation*> childs;
|
||||
std::vector<wxString> childs;
|
||||
} ;
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -161,42 +161,41 @@ void User::LinkOrUnlinkOperation(Operation& op)
|
|||
}
|
||||
}
|
||||
|
||||
void User::Group(Operation* op)
|
||||
void User::Group(const Operation& op)
|
||||
{
|
||||
std::vector<Operation>::iterator it;
|
||||
std::vector<Operation*>::iterator it2;
|
||||
std::vector<wxString>::iterator it2;
|
||||
|
||||
for (it = (*_operations[op->year])[op->month].begin(); it != (*_operations[op->year])[op->month].end(); it++)
|
||||
for (it = (*_operations[op.year])[op.month].begin(); it != (*_operations[op.year])[op.month].end(); it++)
|
||||
{
|
||||
if (it->id == op->parent)
|
||||
if (it->id == op.parent)
|
||||
{
|
||||
for (it2 = it->childs.begin(); it2 != it->childs.end(); it2++)
|
||||
if ((*it2)->id == op->id)
|
||||
if (*it2 == op.id)
|
||||
break;
|
||||
// Already into childs
|
||||
if (it2 != it->childs.end()) return;
|
||||
it->childs.push_back(op);
|
||||
it->childs.push_back(op.id);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void User::UnGroup(Operation* op)
|
||||
void User::UnGroup(const Operation& op)
|
||||
{
|
||||
std::vector<Operation>::iterator it;
|
||||
std::vector<Operation*>::iterator it2;
|
||||
std::vector<wxString>::iterator it2;
|
||||
|
||||
for (it = (*_operations[op->year])[op->month].begin(); it != (*_operations[op->year])[op->month].end(); it++)
|
||||
for (it = (*_operations[op.year])[op.month].begin(); it != (*_operations[op.year])[op.month].end(); it++)
|
||||
{
|
||||
if (it->id == op->parent)
|
||||
if (it->id == op.parent)
|
||||
{
|
||||
for (it2 = it->childs.begin(); it2 != it->childs.end(); it2++)
|
||||
if ((*it2)->id == op->id)
|
||||
if (*it2 == op.id)
|
||||
{
|
||||
it->childs.erase(it2);
|
||||
return;
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -210,6 +209,6 @@ void User::ResolveGroups(int year)
|
|||
{
|
||||
for (i=0; i<it->second.size(); i++)
|
||||
if (it->second[i].parent.Length())
|
||||
Group(&((*_operations[year])[it->first])[i]);
|
||||
Group(((*_operations[year])[it->first])[i]);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -54,8 +54,8 @@ public:
|
|||
int GetOperationsNumber(int month, int year);
|
||||
wxLanguage GetLanguage();
|
||||
void LinkOrUnlinkOperation(Operation& op);
|
||||
void Group(Operation* op);
|
||||
void UnGroup(Operation* op);
|
||||
void Group(const Operation& op);
|
||||
void UnGroup(const Operation& op);
|
||||
void ResolveGroups(int year);
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -131,18 +131,30 @@ void GridAccount::SetWeek(int week, int line) {
|
|||
}
|
||||
}
|
||||
|
||||
Operation& GridAccount::GetOperation(const wxString& id)
|
||||
{
|
||||
std::vector<Operation>::iterator it;
|
||||
|
||||
for(it=_operations->begin(); it!=_operations->end(); it++)
|
||||
if (it->id == id)
|
||||
return *it;
|
||||
}
|
||||
|
||||
void GridAccount::LoadOperations(std::vector<Operation>* operations, bool canAddOperation, bool setWeek, int month, int year)
|
||||
{
|
||||
std::vector<Operation>::iterator it;
|
||||
User* user = _kiss->GetUser();
|
||||
int curLine = 0;
|
||||
Operation NULLop;
|
||||
|
||||
NULLop.id = wxT("");
|
||||
|
||||
_operations = operations;
|
||||
_canAddOperation = canAddOperation;
|
||||
_curMonth = month;
|
||||
_curYear = year;
|
||||
_displayedOperations.clear();
|
||||
_displayedOperations.push_back(NULL); // Header
|
||||
_displayedOperations.push_back(NULLop); // Header
|
||||
_fixCosts = 0;
|
||||
|
||||
it = _operations->begin();
|
||||
|
|
@ -152,26 +164,26 @@ void GridAccount::LoadOperations(std::vector<Operation>* operations, bool canAdd
|
|||
if (it->parent.Length()) continue;
|
||||
|
||||
if (setWeek)
|
||||
InsertOperationWithWeek(user, &(*it), ++curLine, true, it->month, it->year);
|
||||
InsertOperationWithWeek(user, *it, ++curLine, true, it->month, it->year);
|
||||
else
|
||||
InsertOperation(user, &(*it), ++curLine, true, it->month, it->year);
|
||||
InsertOperation(user, *it, ++curLine, true, it->month, it->year);
|
||||
}
|
||||
|
||||
if (canAddOperation)
|
||||
InsertOperation(user, NULL, ++curLine, true, month, year);
|
||||
InsertOperation(user, NULLop, ++curLine, true, month, year);
|
||||
|
||||
for (; it != _operations->end(); it++)
|
||||
{
|
||||
if (it->parent.Length()) continue;
|
||||
|
||||
if (setWeek)
|
||||
InsertOperationWithWeek(user, &(*it), ++curLine, false, it->month, it->year);
|
||||
InsertOperationWithWeek(user, *it, ++curLine, false, it->month, it->year);
|
||||
else
|
||||
InsertOperation(user, &(*it), ++curLine, false, it->month, it->year);
|
||||
InsertOperation(user, *it, ++curLine, false, it->month, it->year);
|
||||
}
|
||||
|
||||
if (canAddOperation)
|
||||
InsertOperation(user, NULL, ++curLine, false, month, year);
|
||||
InsertOperation(user, NULLop, ++curLine, false, month, year);
|
||||
|
||||
AutoSizeColumn(TREE, false);
|
||||
AutoSizeColumn(CATEGORY, false);
|
||||
|
|
@ -181,32 +193,32 @@ void GridAccount::LoadOperations(std::vector<Operation>* operations, bool canAdd
|
|||
AutoSizeColumn(CHECKED, false);
|
||||
}
|
||||
|
||||
void GridAccount::InsertOperationWithWeek(User* user, Operation* op, int line, bool fix, int month, int year)
|
||||
void GridAccount::InsertOperationWithWeek(User* user, Operation& op, int line, bool fix, int month, int year)
|
||||
{
|
||||
std::vector<Operation*>::iterator it;
|
||||
std::vector<Operation>::iterator it;
|
||||
int curLine, curWeek, week, i;
|
||||
|
||||
InsertOperation(user, op, line, fix, month, year);
|
||||
|
||||
if (op && !fix)
|
||||
if (op.id.Length() && !fix)
|
||||
{
|
||||
for (it = _displayedOperations.begin(), curLine=0;
|
||||
it != _displayedOperations.end();
|
||||
it++, curLine++)
|
||||
{
|
||||
if (*it && !(*it)->fix_cost) break;
|
||||
if (it->id.Length() && !it->fix_cost) break;
|
||||
}
|
||||
|
||||
if (it == _displayedOperations.end()) return;
|
||||
|
||||
ResetWeeks();
|
||||
|
||||
curWeek = wxDateTime((*it)->day+1, (wxDateTime::Month)(*it)->month, (*it)->year).GetWeekOfMonth();
|
||||
curWeek = wxDateTime(it->day+1, (wxDateTime::Month)it->month, it->year).GetWeekOfMonth();
|
||||
it++;
|
||||
for (i=1; it != _displayedOperations.end(); it++, curLine++)
|
||||
{
|
||||
if (!*it) continue;
|
||||
week = wxDateTime((*it)->day+1, (wxDateTime::Month)(*it)->month, (*it)->year).GetWeekOfMonth();
|
||||
if (!it->id.Length()) continue;
|
||||
week = wxDateTime(it->day+1, (wxDateTime::Month)it->month, it->year).GetWeekOfMonth();
|
||||
if (week != curWeek)
|
||||
{
|
||||
SetWeek(i++, curLine);
|
||||
|
|
@ -216,16 +228,17 @@ void GridAccount::InsertOperationWithWeek(User* user, Operation* op, int line, b
|
|||
}
|
||||
}
|
||||
|
||||
void GridAccount::InsertOperation(User* user, Operation* op, int line, bool fix, int month, int year)
|
||||
void GridAccount::InsertOperation(User* user, Operation& op, int line, bool fix, int month, int year)
|
||||
{
|
||||
std::vector<Operation>::iterator it;
|
||||
std::vector<Operation*>::iterator it2;
|
||||
std::vector<wxString>::iterator it2;
|
||||
int r, g, b, amount;
|
||||
wxColour color;
|
||||
wxDateTime curDate;
|
||||
wxString description;
|
||||
wxFont font;
|
||||
Category cat ;
|
||||
Operation op2;
|
||||
|
||||
curDate.SetToCurrent();
|
||||
|
||||
|
|
@ -237,7 +250,7 @@ void GridAccount::InsertOperation(User* user, Operation* op, int line, bool fix,
|
|||
|
||||
InsertRows(line, 1);
|
||||
|
||||
if (op && op->meta)
|
||||
if (op.id.Length() && op.meta)
|
||||
{
|
||||
SetCellRenderer(line, TREE, new wxGridCellTreeButtonRenderer());
|
||||
SetCellEditor(line, TREE, new wxGridCellTreeButtonEditor());
|
||||
|
|
@ -265,22 +278,22 @@ void GridAccount::InsertOperation(User* user, Operation* op, int line, bool fix,
|
|||
_fixCosts++;
|
||||
}
|
||||
|
||||
if (op)
|
||||
if (op.id.Length())
|
||||
{
|
||||
cat = user->GetCategory(op->category);
|
||||
cat = user->GetCategory(op.category);
|
||||
|
||||
SetCellEditor(line, DATE, new CalendarEditor(op->day, month, year));
|
||||
description = op->description;
|
||||
SetCellEditor(line, DATE, new CalendarEditor(op.day, month, year));
|
||||
description = op.description;
|
||||
UNESCAPE_CHARS(description);
|
||||
SetCellValue(line, DESCRIPTION, description);
|
||||
SetCellValue(line, DATE, wxString::Format(wxT("%02d/%02d/%d"), op->day+1, month+1, year));
|
||||
if (op->amount < 0)
|
||||
SetCellValue(line, DEBIT, wxString::Format(wxT("%.2lf"), -op->amount));
|
||||
SetCellValue(line, DATE, wxString::Format(wxT("%02d/%02d/%d"), op.day+1, month+1, year));
|
||||
if (op.amount < 0)
|
||||
SetCellValue(line, DEBIT, wxString::Format(wxT("%.2lf"), -op.amount));
|
||||
else
|
||||
SetCellValue(line, CREDIT, wxString::Format(wxT("%.2lf"), op->amount));
|
||||
if (!op->meta)
|
||||
SetCellValue(line, ACCOUNT, user->GetAccountName(op->account));
|
||||
if (!fix && !op->meta)
|
||||
SetCellValue(line, CREDIT, wxString::Format(wxT("%.2lf"), op.amount));
|
||||
if (!op.meta)
|
||||
SetCellValue(line, ACCOUNT, user->GetAccountName(op.account));
|
||||
if (!fix && !op.meta)
|
||||
SetCellValue(line, CATEGORY, cat.name);
|
||||
SetCellRenderer(line, DELETE, new wxGridCellBoolRenderer ());
|
||||
SetCellEditor(line, DELETE, new wxGridCellBoolEditor ());
|
||||
|
|
@ -289,7 +302,7 @@ void GridAccount::InsertOperation(User* user, Operation* op, int line, bool fix,
|
|||
|
||||
color = cat.backcolor;
|
||||
|
||||
if (op->checked)
|
||||
if (op.checked)
|
||||
{
|
||||
r = ((color.Red()*1.5) >= 0xFF) ? 0xFF : color.Red()*1.5 ;
|
||||
g = ((color.Green()*1.5) >= 0xFF) ? 0xFF : color.Green()*1.5 ;
|
||||
|
|
@ -305,13 +318,14 @@ void GridAccount::InsertOperation(User* user, Operation* op, int line, bool fix,
|
|||
SET_ROW_FONT(line, font);
|
||||
}
|
||||
|
||||
if (op->meta && !op->amount)
|
||||
if (op.meta && !op.amount)
|
||||
{
|
||||
amount = 0;
|
||||
for(it2=op->childs.begin(); it2!=op->childs.end(); it2++)
|
||||
for(it2=op.childs.begin(); it2!=op.childs.end(); it2++)
|
||||
{
|
||||
if ((*it2)->amount > 0)
|
||||
amount += (*it2)->amount;
|
||||
op2 = GetOperation(*it2);
|
||||
if (op2.amount > 0)
|
||||
amount += op2.amount;
|
||||
}
|
||||
|
||||
SetCellValue(line, DEBIT, wxString::Format(wxT("%.2lf"), amount));
|
||||
|
|
@ -405,18 +419,18 @@ void GridAccount::InsertIntoGrid(Operation& op)
|
|||
|
||||
for(i=0; i<(int)_displayedOperations.size(); i++)
|
||||
{
|
||||
if (_displayedOperations[i] == NULL) continue;
|
||||
if ((_displayedOperations)[i]->fix_cost && !op.fix_cost) continue;
|
||||
if (!(_displayedOperations)[i]->fix_cost && op.fix_cost) break;
|
||||
if (!_displayedOperations[i].id.Length()) continue;
|
||||
if ((_displayedOperations)[i].fix_cost && !op.fix_cost) continue;
|
||||
if (!(_displayedOperations)[i].fix_cost && op.fix_cost) break;
|
||||
if (user->_preferences[wxT("operation_order")] == wxT("ASC"))
|
||||
{
|
||||
if ((_displayedOperations)[i]->day > op.day)
|
||||
if ((_displayedOperations)[i].day > op.day)
|
||||
break;
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
if ((_displayedOperations)[i]->day < op.day)
|
||||
if ((_displayedOperations)[i].day < op.day)
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
@ -424,42 +438,44 @@ void GridAccount::InsertIntoGrid(Operation& op)
|
|||
if (i == (int)_displayedOperations.size() ||
|
||||
i == _fixCosts)
|
||||
i--;
|
||||
else if (!(_displayedOperations)[i]->fix_cost && op.fix_cost)
|
||||
else if (!(_displayedOperations)[i].fix_cost && op.fix_cost)
|
||||
i --;
|
||||
|
||||
_operations->push_back(op);
|
||||
|
||||
InsertOperationWithWeek(user, &((*_operations)[_operations->size()-1]), i, op.fix_cost, _curMonth, _curYear);
|
||||
InsertOperationWithWeek(user, (*_operations)[_operations->size()-1], i, op.fix_cost, _curMonth, _curYear);
|
||||
}
|
||||
|
||||
/* !!! op must not be a reference because we modify _displayedOerations !!! */
|
||||
void GridAccount::RemoveMeta(Operation op, int line, bool removeRoot, bool deleteOp)
|
||||
void GridAccount::RemoveMeta(Operation& op, int line, bool removeRoot, bool deleteOp)
|
||||
{
|
||||
std::vector<Operation*>::iterator it, it2;
|
||||
wxGridCellTreeButtonRenderer* treeRenderer;
|
||||
int i;
|
||||
Operation op2;
|
||||
|
||||
treeRenderer = (wxGridCellTreeButtonRenderer*) GetCellRenderer(line, TREE);
|
||||
|
||||
if (treeRenderer->IsCollapsed())
|
||||
for(i=0; i<(int)op.childs.size(); i++)
|
||||
{
|
||||
for(i=0; i<(int)op.childs.size(); i++)
|
||||
op2 = GetOperation(op.childs[i]);
|
||||
if (op2.meta)
|
||||
RemoveMeta(op2, line+1, true, deleteOp);
|
||||
else
|
||||
{
|
||||
if (op.childs[i]->meta)
|
||||
RemoveMeta(*op.childs[i], line+1, true, deleteOp);
|
||||
else
|
||||
if (treeRenderer->IsCollapsed())
|
||||
{
|
||||
DeleteRows(line+1, 1);
|
||||
if (_displayedOperations[line+1]->fix_cost) _fixCosts--;
|
||||
if (_displayedOperations[line+1].fix_cost) _fixCosts--;
|
||||
_displayedOperations.erase(_displayedOperations.begin()+line+1);
|
||||
if (deleteOp)
|
||||
{
|
||||
DeleteOperation(*op.childs[i]);
|
||||
_kiss->DeleteOperation(*op.childs[i]);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if (deleteOp)
|
||||
{
|
||||
DeleteOperation(op2);
|
||||
_kiss->DeleteOperation(op2);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
op.childs.clear();
|
||||
|
|
@ -492,8 +508,8 @@ void GridAccount::OnOperationModified(wxGridEvent& event)
|
|||
wxColour color ;
|
||||
unsigned char r, g, b;
|
||||
wxGridCellTreeButtonRenderer* treeRenderer;
|
||||
std::vector<Operation*>::iterator it;
|
||||
Operation* op;
|
||||
std::vector<wxString>::iterator it;
|
||||
Operation op, op2;
|
||||
|
||||
// Avoid recursives calls
|
||||
if (inModification) return;
|
||||
|
|
@ -508,14 +524,15 @@ void GridAccount::OnOperationModified(wxGridEvent& event)
|
|||
|
||||
if (!treeRenderer->IsCollapsed())
|
||||
{
|
||||
for (i=1, it=op->childs.begin(); it!=op->childs.end(); it++, i++)
|
||||
for (i=1, it=op.childs.begin(); it!=op.childs.end(); it++, i++)
|
||||
{
|
||||
InsertOperation(user, *it, row+i, (*it)->fix_cost, _curMonth, _curYear);
|
||||
op2 = GetOperation(*it);
|
||||
InsertOperation(user, op2, row+i, op2.fix_cost, _curMonth, _curYear);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
RemoveMeta(*op, row, false, false);
|
||||
RemoveMeta(op, row, false, false);
|
||||
}
|
||||
|
||||
treeRenderer->DecRef();
|
||||
|
|
@ -626,7 +643,7 @@ void GridAccount::OnOperationModified(wxGridEvent& event)
|
|||
// Modify a fix operation
|
||||
if (row < _fixCosts)
|
||||
{
|
||||
cur_op = *(_displayedOperations)[row] ;
|
||||
cur_op = (_displayedOperations)[row] ;
|
||||
|
||||
if (col == DELETE)
|
||||
{
|
||||
|
|
@ -634,7 +651,7 @@ void GridAccount::OnOperationModified(wxGridEvent& event)
|
|||
user->UnGroup(_displayedOperations[row]);
|
||||
|
||||
if (cur_op.meta)
|
||||
RemoveMeta(*_displayedOperations[row], row, true, true);
|
||||
RemoveMeta(_displayedOperations[row], row, true, true);
|
||||
else
|
||||
{
|
||||
DeleteRows(row, 1);
|
||||
|
|
@ -667,7 +684,7 @@ void GridAccount::OnOperationModified(wxGridEvent& event)
|
|||
else
|
||||
{
|
||||
_kiss->UpdateOperation(new_op);
|
||||
*(_displayedOperations)[row] = new_op;
|
||||
(_displayedOperations)[row] = new_op;
|
||||
}
|
||||
|
||||
fix_op = true;
|
||||
|
|
@ -700,7 +717,7 @@ void GridAccount::OnOperationModified(wxGridEvent& event)
|
|||
// Modify an operation
|
||||
else if (row < (int)(_displayedOperations.size()-1))
|
||||
{
|
||||
cur_op = *(_displayedOperations)[row] ;
|
||||
cur_op = (_displayedOperations)[row] ;
|
||||
new_op.id = cur_op.id;
|
||||
new_op.fix_cost = false;
|
||||
new_op.transfert = cur_op.transfert;
|
||||
|
|
@ -714,7 +731,7 @@ void GridAccount::OnOperationModified(wxGridEvent& event)
|
|||
user->UnGroup(_displayedOperations[row]);
|
||||
|
||||
if (cur_op.meta)
|
||||
RemoveMeta(*_displayedOperations[row], row, true, true);
|
||||
RemoveMeta(_displayedOperations[row], row, true, true);
|
||||
else
|
||||
{
|
||||
DeleteRows(row, 1);
|
||||
|
|
@ -738,7 +755,7 @@ void GridAccount::OnOperationModified(wxGridEvent& event)
|
|||
else
|
||||
{
|
||||
_kiss->UpdateOperation(new_op);
|
||||
*(_displayedOperations)[row] = new_op;
|
||||
(_displayedOperations)[row] = new_op;
|
||||
}
|
||||
}
|
||||
// Add an operation
|
||||
|
|
@ -773,10 +790,10 @@ void GridAccount::OnOperationModified(wxGridEvent& event)
|
|||
event.Skip();
|
||||
}
|
||||
|
||||
void GridAccount::UpdateMeta(Operation& op, std::vector<Operation*>& ops)
|
||||
void GridAccount::UpdateMeta(Operation& op, std::vector<Operation>& ops)
|
||||
{
|
||||
std::vector<Operation*>::iterator it;
|
||||
Operation* op_ ;
|
||||
std::vector<Operation>::iterator it;
|
||||
Operation op_ ;
|
||||
wxString category = wxT("");
|
||||
bool updateCat = false ;
|
||||
|
||||
|
|
@ -785,29 +802,29 @@ void GridAccount::UpdateMeta(Operation& op, std::vector<Operation*>& ops)
|
|||
for(it=ops.begin(); it!=ops.end(); it++)
|
||||
{
|
||||
op_ = *it;
|
||||
if (op_->year <= op.year && op_->month <= op.month && op_->day < op.day)
|
||||
if (op_.year <= op.year && op_.month <= op.month && op_.day < op.day)
|
||||
{
|
||||
op.year = op_->year;
|
||||
op.month = op_->month;
|
||||
op.day = op_->day;
|
||||
op.year = op_.year;
|
||||
op.month = op_.month;
|
||||
op.day = op_.day;
|
||||
}
|
||||
op.amount += op_->amount;
|
||||
if (!op.description.Length() && op_->description.Length())
|
||||
op.description = op_->description;
|
||||
op.amount += op_.amount;
|
||||
if (!op.description.Length() && op_.description.Length())
|
||||
op.description = op_.description;
|
||||
if (!category.Length())
|
||||
{
|
||||
if (op_->category.Length())
|
||||
if (op_.category.Length())
|
||||
{
|
||||
category = op_->category;
|
||||
category = op_.category;
|
||||
updateCat = true;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (op_->category.Length() && op_->category != category)
|
||||
if (op_.category.Length() && op_.category != category)
|
||||
updateCat = false;
|
||||
}
|
||||
op_->parent = op.id;
|
||||
op_.parent = op.id;
|
||||
}
|
||||
|
||||
if (updateCat)
|
||||
|
|
@ -818,12 +835,13 @@ void GridAccount::Group()
|
|||
{
|
||||
std::vector<int> rows;
|
||||
std::vector<int>::iterator it;
|
||||
std::vector<Operation*> ops;
|
||||
std::vector<Operation*>::iterator it2, it3;
|
||||
std::vector<Operation> ops;
|
||||
std::vector<Operation>::iterator it2;
|
||||
std::vector<wxString>::iterator it3;
|
||||
wxString parent = wxT("");
|
||||
Operation* op=NULL;
|
||||
Operation op, op2;
|
||||
int fix = -1, i;
|
||||
|
||||
|
||||
// Singly selected cells.
|
||||
const wxGridCellCoordsArray& cells(GetSelectedCells());
|
||||
for (size_t i = 0; i < cells.size(); ++i)
|
||||
|
|
@ -838,35 +856,35 @@ void GridAccount::Group()
|
|||
|
||||
op = _displayedOperations[c.GetRow()] ;
|
||||
|
||||
if (op)
|
||||
if (op.id.Length())
|
||||
{
|
||||
if (!parent.Length())
|
||||
{
|
||||
if (op->parent.Length())
|
||||
if (op.parent.Length())
|
||||
{
|
||||
parent = op->parent;
|
||||
parent = op.parent;
|
||||
continue;
|
||||
}
|
||||
else if(op->meta)
|
||||
parent = op->id;
|
||||
else if(op.meta)
|
||||
parent = op.id;
|
||||
}
|
||||
else
|
||||
{
|
||||
if ((parent.Length() && op->parent.Length() && op->parent != parent))
|
||||
if ((parent.Length() && op.parent.Length() && op.parent != parent))
|
||||
{
|
||||
wxMessageBox(_("Cannot group these operations"), _("Error"), wxICON_ERROR | wxOK);
|
||||
return ;
|
||||
}
|
||||
}
|
||||
|
||||
if (fix != -1 && ((!fix && op->fix_cost) || (fix && !op->fix_cost)))
|
||||
if (fix != -1 && ((!fix && op.fix_cost) || (fix && !op.fix_cost)))
|
||||
{
|
||||
wxMessageBox(_("Cannot group these operations"), _("Error"), wxICON_ERROR | wxOK);
|
||||
return ;
|
||||
}
|
||||
|
||||
if (fix == -1)
|
||||
fix = op->fix_cost ? 1 : 0;
|
||||
fix = op.fix_cost ? 1 : 0;
|
||||
|
||||
ops.push_back(op);
|
||||
rows.push_back(c.GetRow());
|
||||
|
|
@ -877,36 +895,36 @@ void GridAccount::Group()
|
|||
{
|
||||
if (rows.size() < 2) return;
|
||||
|
||||
op = new Operation;
|
||||
op->parent = wxT("");
|
||||
op->day = ops[0]->day;
|
||||
op->month = ops[0]->month;
|
||||
op->year = ops[0]->year;
|
||||
op->amount = 0;
|
||||
op->description = wxT("");
|
||||
op->category = wxT("");
|
||||
op->fix_cost = fix;
|
||||
op->account = wxT("");
|
||||
op->checked = false;
|
||||
op->transfert = wxT("");
|
||||
op->formula = wxT("");
|
||||
op->meta = true;
|
||||
op.parent = wxT("");
|
||||
op.day = ops[0].day;
|
||||
op.month = ops[0].month;
|
||||
op.year = ops[0].year;
|
||||
op.amount = 0;
|
||||
op.description = wxT("");
|
||||
op.category = wxT("");
|
||||
op.fix_cost = fix;
|
||||
op.account = wxT("");
|
||||
op.checked = false;
|
||||
op.transfert = wxT("");
|
||||
op.formula = wxT("");
|
||||
op.meta = true;
|
||||
op.childs.clear();
|
||||
|
||||
op->id = _kiss->AddOperation(*op);
|
||||
op.id = _kiss->AddOperation(op);
|
||||
}
|
||||
else
|
||||
{
|
||||
if (rows.size() < 1) return;
|
||||
|
||||
for(i=0, it2=_displayedOperations.begin(); it2!=_displayedOperations.end(); it2++, i++)
|
||||
if (*it2 && (*it2)->id == parent)
|
||||
if (it2->id.Length() && it2->id == parent)
|
||||
{
|
||||
RemoveMeta(**it2, i, true, false);
|
||||
RemoveMeta(*it2, i, true, false);
|
||||
op = *it2;
|
||||
break;
|
||||
}
|
||||
|
||||
if (!op) return;
|
||||
if (op.id.Length()) return;
|
||||
}
|
||||
|
||||
std::sort(rows.begin(), rows.end());
|
||||
|
|
@ -915,8 +933,8 @@ void GridAccount::Group()
|
|||
{
|
||||
if (rows[i] >= i)
|
||||
{
|
||||
if (ops[i]->meta)
|
||||
RemoveMeta(*ops[i], rows[i]-i, true, false);
|
||||
if (ops[i].meta)
|
||||
RemoveMeta(ops[i], rows[i]-i, true, false);
|
||||
else
|
||||
{
|
||||
DeleteRows(rows[i]-i, 1);
|
||||
|
|
@ -925,8 +943,8 @@ void GridAccount::Group()
|
|||
}
|
||||
else
|
||||
{
|
||||
if (ops[i]->meta)
|
||||
RemoveMeta(*ops[i], rows[i], true, false);
|
||||
if (ops[i].meta)
|
||||
RemoveMeta(ops[i], rows[i], true, false);
|
||||
else
|
||||
{
|
||||
DeleteRows(rows[i], 1);
|
||||
|
|
@ -935,30 +953,33 @@ void GridAccount::Group()
|
|||
}
|
||||
}
|
||||
|
||||
UpdateMeta(*op, ops);
|
||||
UpdateMeta(op, ops);
|
||||
|
||||
for(it2=ops.begin(); it2!=ops.end(); it2++)
|
||||
{
|
||||
for (i=0, it3=op->childs.begin(); it3!=op->childs.end(); it3++, i++)
|
||||
if ((*it3)->id == (*it2)->id ||
|
||||
(*it3)->day > (*it2)->day)
|
||||
for (i=0, it3=op.childs.begin(); it3!=op.childs.end(); it3++, i++)
|
||||
{
|
||||
op2 = GetOperation(*it3);
|
||||
if (*it3 == it2->id ||
|
||||
op2.day > it2->day)
|
||||
break;
|
||||
}
|
||||
|
||||
if (i) i--;
|
||||
|
||||
if (it3 == op->childs.end())
|
||||
op->childs.push_back(*it2);
|
||||
else if ((*it3)->id == (*it2)->id)
|
||||
if (it3 == op.childs.end())
|
||||
op.childs.push_back(it2->id);
|
||||
else if (*it3 == it2->id)
|
||||
continue;
|
||||
else
|
||||
op->childs.insert(op->childs.begin()+i, *it2);
|
||||
op.childs.insert(op.childs.begin()+i, it2->id);
|
||||
|
||||
(*it2)->parent = op->id;
|
||||
_kiss->UpdateOperation(**it2);
|
||||
it2->parent = op.id;
|
||||
_kiss->UpdateOperation(*it2);
|
||||
}
|
||||
|
||||
_kiss->UpdateOperation(*op);
|
||||
InsertIntoGrid(*op);
|
||||
_kiss->UpdateOperation(op);
|
||||
InsertIntoGrid(op);
|
||||
}
|
||||
|
||||
void GridAccount::UnGroup()
|
||||
|
|
|
|||
|
|
@ -45,8 +45,8 @@ public:
|
|||
wxPen GetRowGridLinePen (int row);
|
||||
|
||||
void LoadOperations(std::vector<Operation>* operations, bool canAddOperation, bool setWeek, int month, int year);
|
||||
void InsertOperationWithWeek(User* user, Operation* op, int line, bool fix, int month, int year) ;
|
||||
void InsertOperation(User* user, Operation* op, int line, bool fix, int month, int year) ;
|
||||
void InsertOperationWithWeek(User* user, Operation& op, int line, bool fix, int month, int year) ;
|
||||
void InsertOperation(User* user, Operation& op, int line, bool fix, int month, int year) ;
|
||||
|
||||
void Group();
|
||||
void UnGroup();
|
||||
|
|
@ -62,15 +62,17 @@ private:
|
|||
std::vector<Operation>* _operations;
|
||||
bool _canAddOperation;
|
||||
int _curMonth, _curYear;
|
||||
std::vector<Operation*> _displayedOperations;
|
||||
std::vector<Operation> _displayedOperations;
|
||||
|
||||
void SetWeek(int week, int line);
|
||||
void ResetWeeks();
|
||||
void InsertIntoGrid(Operation& op);
|
||||
void DeleteOperation(const Operation& op);
|
||||
void UpdateMeta(Operation& op, std::vector<Operation*>& ops);
|
||||
void RemoveMeta(Operation op, int line, bool removeRoot, bool deleteOp);
|
||||
|
||||
void UpdateMeta(Operation& op, std::vector<Operation>& ops);
|
||||
void RemoveMeta(Operation& op, int line, bool removeRoot, bool deleteOp);
|
||||
|
||||
Operation& GetOperation(const wxString& id);
|
||||
|
||||
DECLARE_EVENT_TABLE();
|
||||
};
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user