soutade
/
KissCount
1
0
Fork 0
Code Issues Pull Requests Packages Releases 1 Wiki Activity

Show hidden accounts at the end in the list 

Simplify statistics computation in AccountPanel
Don't take in account simple credit on blocked accounts
This commit is contained in:
Grégory Soutadé 2012-05-05 16:49:24 +02:00
parent aff6e14072
commit c565c7740d
2 changed files with 49 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/model/Database.cpp
View File

@ -266,7 +266,7 @@ User* Database::LoadUser(const QString& name)
query.clear(); query.clear();
req = QString("SELECT * FROM account WHERE user='%1' ORDER BY default_account DESC, blocked, virtual, name ASC").arg(user->_id); req = QString("SELECT * FROM account WHERE user='%1' ORDER BY default_account DESC, hidden, blocked, virtual, name ASC").arg(user->_id);
EXECUTE_SQL_QUERY_WITH_CODE(req, 0, {delete user;}, {delete user;}); EXECUTE_SQL_QUERY_WITH_CODE(req, 0, {delete user;}, {delete user;});
@ -279,7 +279,7 @@ User* Database::LoadUser(const QString& name)
query.clear(); query.clear();
req = QString("SELECT * FROM account WHERE id IN (SELECT account FROM shared_account WHERE user='%1') ORDER BY name, blocked, virtual ASC").arg(user->_id); req = QString("SELECT * FROM account WHERE id IN (SELECT account FROM shared_account WHERE user='%1') ORDER BY default_account DESC, hidden, blocked, virtual, name ASC").arg(user->_id);
EXECUTE_SQL_QUERY_WITH_CODE(req, 0, {delete user;}, {delete user;}); EXECUTE_SQL_QUERY_WITH_CODE(req, 0, {delete user;}, {delete user;});

166
src/view/AccountPanel.cpp
View File

@ -619,133 +619,61 @@ void AccountPanel::UpdateStats()
op = *it; op = *it;
blocked_account = false; blocked_account = false;
// A credit on a blocked account must be considered as a debit if ((mode == REAL_MODE || mode == CHECK_MODE) && op._virtual)
if (op.transfert && op.amount > 0) continue;
{
account = user->GetAccount(op.account);
if (account.blocked) if (mode == CHECK_MODE && !op.checked)
{ continue;
op.amount = -op.amount;
op.transfert = 0; account = user->GetAccount(op.account);
blocked_account = true;
} if (account.blocked)
{
if (op.transfert && op.amount > 0)
{
// A Transfert on a blocked account must be considered as a debit
op.amount = -op.amount;
// op.transfert = 0;
blocked_account = true;
}
// else
// continue;
} }
if (op.amount >= 0)
{
if (!op.transfert && !account.blocked)
totalCredit += op.amount;
switch(mode) if (day >= op.day)
{ {
case VIRTUAL_MODE: if (!op.transfert && !account.blocked)
if (op.amount >= 0) curCredit += op.amount;
{ curAccountAmount[op.account] += op.amount;
if (!op.transfert) }
totalCredit += op.amount; finalAccountAmount[op.account] += op.amount;
}
else
{
if ((!op.transfert || account.blocked) && user->GetCategoryName(op.category) != _("Unknown"))
_categoriesValues[_categoriesIndexes[user->GetCategoryName(op.category)]] += -op.amount ;
if (day >= op.day) if (!op.transfert || account.blocked)
{ totalDebit += -op.amount;
if (!op.transfert)
curCredit += op.amount;
curAccountAmount[op.account] += op.amount;
}
finalAccountAmount[op.account] += op.amount;
}
else
{
if (!op.transfert && user->GetCategoryName(op.category) != _("Unknown"))
_categoriesValues[_categoriesIndexes[user->GetCategoryName(op.category)]] += -op.amount ;
if (!op.transfert) if (day >= op.day)
totalDebit += -op.amount; {
if (!op.transfert || account.blocked)
curDebit += -op.amount;
}
if (blocked_account) if (blocked_account)
op.amount = -op.amount; op.amount = -op.amount;
if (day >= op.day) if (day >= op.day)
{ curAccountAmount[op.account] += op.amount;
if (!op.transfert) finalAccountAmount[op.account] += op.amount;
curDebit += -op.amount; }
curAccountAmount[op.account] += op.amount;
}
finalAccountAmount[op.account] += op.amount;
}
break;
case REAL_MODE:
if (op.amount >= 0)
{
if (!op.transfert)
totalCredit += op.amount;
if (day >= op.day)
{
if (!op.transfert)
curCredit += op.amount;
if (!op._virtual)
curAccountAmount[op.account] += op.amount;
}
if (!op._virtual)
finalAccountAmount[op.account] += op.amount;
}
else
{
if (!op.transfert && user->GetCategoryName(op.category) != _("Unknown"))
_categoriesValues[_categoriesIndexes[user->GetCategoryName(op.category)]] += -op.amount ;
if (!op.transfert && !op._virtual)
totalDebit += -op.amount;
if (blocked_account)
op.amount = -op.amount;
if (day >= op.day)
{
if (!op.transfert && !op._virtual)
curDebit += -op.amount;
if (!op._virtual)
curAccountAmount[op.account] += op.amount;
}
if (!op._virtual)
finalAccountAmount[op.account] += op.amount;
}
break;
case CHECK_MODE:
if (op.amount >= 0)
{
if (!op.transfert && !op._virtual)
totalCredit += op.amount;
if (day >= op.day)
{
if (!op.transfert && !op._virtual)
curCredit += op.amount;
if (op.checked && !op._virtual)
curAccountAmount[op.account] += op.amount;
}
if (op.checked && !op._virtual)
finalAccountAmount[op.account] += op.amount;
}
else
{
if (!op.transfert && user->GetCategoryName(op.category) != _("Unknown"))
_categoriesValues[_categoriesIndexes[user->GetCategoryName(op.category)]] += -op.amount ;
if (!op.transfert && !op._virtual)
totalDebit += -op.amount;
if (blocked_account)
op.amount = -op.amount;
if (day >= op.day)
{
if (!op.transfert && !op._virtual)
curDebit += -op.amount;
if (op.checked && !op._virtual)
curAccountAmount[op.account] += op.amount;
}
if (op.checked && !op._virtual)
finalAccountAmount[op.account] += op.amount;
}
break;
}
} }
balance = totalCredit - totalDebit; balance = totalCredit - totalDebit;