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

Fix a regression : only first month was shown at startupt (not current)

Browse Source 
Display all categories in chart (AccountPanel)
Fix a bug : curDate was wrong if you come back from another month to current month
This commit is contained in:
Grégory Soutadé 2012-02-04 13:43:01 +01:00
parent 37f03a1da0
commit 3fe6d0ad28
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/view/AccountPanel.cpp
View File

@ -322,7 +322,7 @@ void AccountPanel::ChangeUser()
if (curYear != -1) if (curYear != -1)
{ {
_tree->setCurrentItem(curNode); _tree->setCurrentItem(curNode);
LoadYear(curYear); LoadYear(curYear, true);
} }
} }
else else
@ -340,6 +340,7 @@ void AccountPanel::LoadYear(int year, bool showMonth)
QTreeWidgetItem* parentNode, *curMonthNode = 0; QTreeWidgetItem* parentNode, *curMonthNode = 0;
std::map<int, std::vector<int> > ops ; std::map<int, std::vector<int> > ops ;
std::vector<int>::iterator it; std::vector<int>::iterator it;
QDate curDate = QDate::currentDate();
if (user->_operations[year] && _tree->currentItem()->childCount()) if (user->_operations[year] && _tree->currentItem()->childCount())
{ {
@ -359,7 +360,7 @@ void AccountPanel::LoadYear(int year, bool showMonth)
for (it = ops[year].begin(); it != ops[year].end(); it++) for (it = ops[year].begin(); it != ops[year].end(); it++)
{ {
if (!curMonthNode) if (!curMonthNode || (curDate.year() == _curYear && *it <= curDate.month()-1))
{ {
curMonth = *it; curMonth = *it;
curMonthNode = new QTreeWidgetItem(QStringList(wxUI::months[*it])); curMonthNode = new QTreeWidgetItem(QStringList(wxUI::months[*it]));
@ -398,7 +399,7 @@ void AccountPanel::ShowMonth(int month, int year)
{ {
for (monthIt = user->_operations[year]->begin(); monthIt != user->_operations[year]->end(); monthIt++) for (monthIt = user->_operations[year]->begin(); monthIt != user->_operations[year]->end(); monthIt++)
{ {
if ((int)monthIt->first <= curDate.month()) if ((int)monthIt->first+1 <= curDate.month())
{ {
month = monthIt->first; month = monthIt->first;
} }
@ -437,8 +438,8 @@ void AccountPanel::ShowMonth(int month, int year)
dateStart.setDate(_curYear, _curMonth+1, 1); dateStart.setDate(_curYear, _curMonth+1, 1);
dateEnd.setDate(_curYear, _curMonth+1, dateStart.daysInMonth()); dateEnd.setDate(_curYear, _curMonth+1, dateStart.daysInMonth());
_calendar->setDateRange(dateStart, dateEnd); _calendar->setDateRange(dateStart, dateEnd);
if ((curDate.month()-1) == month && curDate.year() == year) if (curDate.month() == (_curMonth+1) && curDate.year() == year)
_calendar->showToday(); _calendar->setSelectedDate (curDate) ;
else if ((curDate.month()-1) > month || curDate.year() > year) else if ((curDate.month()-1) > month || curDate.year() > year)
_calendar->setSelectedDate (dateEnd) ; _calendar->setSelectedDate (dateEnd) ;
else if ((curDate.month()-1) < month || curDate.year() < year) else if ((curDate.month()-1) < month || curDate.year() < year)
@ -719,7 +720,7 @@ void AccountPanel::UpdateStats()
_statsGrid->item(BALANCE, 1)->setText(v.sprintf("%.2lf", balance)); _statsGrid->item(BALANCE, 1)->setText(v.sprintf("%.2lf", balance));
_statsGrid->item(BALANCE, 1)->setForeground((balance >= 0) ? QBrush(Qt::green) : QBrush(Qt::red)); _statsGrid->item(BALANCE, 1)->setForeground((balance >= 0) ? QBrush(Qt::green) : QBrush(Qt::red));
KDChart::Legend* legend = _pie->legend(); // KDChart::Legend* legend = _pie->legend();
for(i=0; i<user->GetCategoriesNumber(); i++) for(i=0; i<user->GetCategoriesNumber(); i++)
{ {
if (totalDebit != 0) if (totalDebit != 0)
@ -734,10 +735,10 @@ void AccountPanel::UpdateStats()
QVector< double > vec; QVector< double > vec;
vec << _categoriesValues[i]; vec << _categoriesValues[i];
_pie->setDataset( i, vec, _categories[i] ); _pie->setDataset( i, vec, _categories[i] );
if (_categoriesValues[i] == 0.0) // if (_categoriesValues[i] == 0.0)
legend->setDatasetHidden(i, true); // legend->setDatasetHidden(i, true);
else // else
legend->setDatasetHidden(i, false); // legend->setDatasetHidden(i, false);
// _dataset->setData(_dataset->index(i, 1, QModelIndex()), _categoriesValues[i]); // _dataset->setData(_dataset->index(i, 1, QModelIndex()), _categoriesValues[i]);
} }