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

Simplify UpdateNextMonths function

Browse Source 
Add "create_if_not_exsits" to Database::GetAccountAmount
This commit is contained in:
Grégory Soutadé 2013-02-17 18:58:32 +01:00
parent fcc7d09071
commit e0efe42b14
6 changed files with 48 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,4 +1,4 @@
v0.4 (17/01/2013)
v0.4 (17/02/2013)
** User **
Add icons for low resolution
Sort categories using translated names
@ -8,6 +8,8 @@ v0.4 (17/01/2013)
** Dev **
Primitive handle of low resolutions
Rework GridAccount
Simplify UpdateNextMonths function
Add "create_if_not_exsits" to Database::GetAccountAmount
** Bugs **
Remove some bugs in GridAccount

4
src/controller/KissCount.cpp
View File

@ -99,9 +99,9 @@ User* KissCount::GetUser()
return _user;
}
int KissCount::GetAccountAmount(int id, int month, int year, bool* had_value)
int KissCount::GetAccountAmount(int id, int month, int year, bool* had_value, bool create_if_not_exsits)
{
return _db->GetAccountAmount(id, month, year, had_value);
return _db->GetAccountAmount(id, month, year, had_value, create_if_not_exsits);
}
int KissCount::CalcAccountAmount(int id, int month, int year, bool* had_values)

2
src/controller/KissCount.hpp
View File

@ -77,7 +77,7 @@ public:
int MetaAmount(int id);
int MetaPositiveAmount(int id);
int GetAccountAmount(int id, int month, int year, bool* had_values=0);
int GetAccountAmount(int id, int month, int year, bool* had_values=0, bool create_if_not_exsits=true);
void SetAccountAmount(int accountId, int month, int year, int value);
int CalcAccountAmount(int id, int month, int year, bool* had_values);

3
src/model/Database.cpp
View File

@ -379,7 +379,7 @@ void Database::LoadYear(User* user, int year)
query.clear();
}
int Database::GetAccountAmount(int id, int month, int year, bool* had_value)
int Database::GetAccountAmount(int id, int month, int year, bool* had_value, bool create_if_not_exsits)
{
QSqlRecord set;
QString req;
@ -400,6 +400,7 @@ int Database::GetAccountAmount(int id, int month, int year, bool* had_value)
}
else
{
if (create_if_not_exsits)
SetAccountAmount(id, month, year, 0);
if (had_value)
*had_value = false;

2
src/model/Database.hpp
View File

@ -113,7 +113,7 @@ public:
int MetaAmount(int id);
int MetaPositiveAmount(int id);
int GetAccountAmount(int id, int month, int year, bool* had_value=0);
int GetAccountAmount(int id, int month, int year, bool* had_value=0, bool create_if_not_exsits=true);
void SetAccountAmount(int accountId, int month, int year, int amount);
int CalcAccountAmount(int id, int month, int year, bool* had_values);

120
src/view/AccountPanel.cpp
View File

@ -1054,112 +1054,65 @@ void AccountPanel::OnUnGroup()
void AccountPanel::OnUpdateNextMonths()
{
int* deltas, *cur_amounts, amount;
int i, a;
int *cur_amounts, amount, i;
User* user = _kiss->GetUser();
bool had_values, accounts_updated = false;
int last_month = 0, last_year = 0, account_updated = 0;
std::map<int, std::vector<int> > operations;
bool has_values, accounts_updated = false;
int cur_month = 0, cur_year = 0, delta_computed = 0;
int last_month, last_year;
bool *valid_account;
deltas = new int[user->_accounts.size()] ;
cur_amounts = new int[user->_accounts.size()] ;
valid_account = new bool[user->_accounts.size()] ;
operations = _kiss->GetAllOperations();
cur_month = _curMonth;
cur_year = _curYear;
if (_curMonth == 11)
{
last_month = 0;
last_year = _curYear+1;
}
else
{
last_month = _curMonth+1;
last_year = _curYear;
}
// Compute deltas
for (i=0; i<(int)user->_accounts.size(); i++)
{
deltas[i] = _kiss->GetAccountAmount(user->_accounts[i].id, _curMonth, _curYear);
cur_amounts[i] = deltas[i] += _kiss->CalcAccountAmount(user->_accounts[i].id, _curMonth, _curYear, &had_values);
for (a=0; a<(int)operations[last_year].size(); a++)
if (operations[last_year][a] == last_month) break;
if (a == (int)operations[last_year].size())
{
deltas[i] = 0;
continue;
cur_amounts[i] = _kiss->GetAccountAmount(user->_accounts[i].id, cur_month, cur_year, &has_values, false);
valid_account[i] = has_values;
}
amount = _kiss->GetAccountAmount(user->_accounts[i].id, last_month, last_year);
deltas[i] -= amount;
if (deltas[i])
account_updated++;
}
if (!account_updated)
goto end;
last_month = _curMonth;
last_year = _curYear;
// Apply deltas
while (1)
{
account_updated = 0;
delta_computed = 0;
if (last_month == 11)
for (i=0; i<(int)user->_accounts.size(); i++)
{
last_month = 0;
last_year = last_year+1;
if (!valid_account[i]) continue;
cur_amounts[i] += _kiss->CalcAccountAmount(user->_accounts[i].id, cur_month, cur_year, &has_values);
if (has_values)
delta_computed++;
}
if (!delta_computed) break;
if (cur_month == 11)
{
cur_month = 0;
cur_year++;
}
else
last_month++;
cur_month++;
for (i=0; i<(int)user->_accounts.size(); i++)
{
if (deltas[i] == 0.0) continue;
_kiss->CalcAccountAmount(user->_accounts[i].id, last_month, last_year, &had_values);
if (had_values)
account_updated++;
}
if (!account_updated) break;
account_updated = 0;
for (i=0; i<(int)user->_accounts.size(); i++)
if (!valid_account[i]) continue;
amount = _kiss->GetAccountAmount(user->_accounts[i].id, cur_month, cur_year, &has_values, false);
if (!has_values)
{
if (deltas[i] == 0.0) continue;
amount = _kiss->GetAccountAmount(user->_accounts[i].id, last_month, last_year);
if ((cur_amounts[i] - amount) != deltas[i]) continue;
cur_amounts[i] = amount + deltas[i];
_kiss->SetAccountAmount(user->_accounts[i].id, last_month, last_year, cur_amounts[i]);
cur_amounts[i] += _kiss->CalcAccountAmount(user->_accounts[i].id, last_month, last_year, &had_values);
account_updated++;
valid_account[i] = false;
continue;
}
if (!account_updated) break;
if (amount != cur_amounts[i])
{
accounts_updated = true;
_kiss->SetAccountAmount(user->_accounts[i].id, cur_month, cur_year, cur_amounts[i]);
last_month = cur_month; last_year = cur_year;
}
}
}
if (last_month == 0)
{
last_month = 11;
last_year--;
}
else
last_month--;
end:
if (accounts_updated)
{
QString message = _("Accounts updated until ") + wxUI::months[last_month] + " " + QString::number(last_year);
@ -1169,7 +1122,6 @@ end:
else
QMessageBox::information(0, "KissCount", _("Any account updated !"));
delete[] deltas;
delete[] cur_amounts;
}