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

Fix a bug in search engine and enhance grouped operations displays

This commit is contained in:
Grégory Soutadé 2011-01-29 11:41:14 +01:00
parent 81884250bc
commit 9c423efd83
4 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,9 +1,10 @@
v0.2_dev (23/01/2011)
v0.2_dev (29/01/2011)
** User **
Better use of sizers (so better interface!)
No further problems with scrollbar in AccountPanel when there is a lot of operations
Better fit of interface when displaying grouped operations
** Dev **
Use a factory to create panels (prepare for plug-in)
@ -15,3 +16,4 @@ v0.2_dev (23/01/2011)
Bad year range check
Unordered accounts (makes account selection points to bad indexes on account graph)
Bug in account creation (readonly fields)
Bug in search bad computation of month with start_date and end_date

6
src/model/Database.cpp
View File

@ -1291,7 +1291,8 @@ std::vector<Operation>* Database::Search(User* user, wxString* description, wxDa
if (firstCond) req += wxT(" AND ") ; else firstCond = true;
req += wxT("(");
req += wxT("year >= ") + yearFrom ;
req += wxT(" AND (month > '") + monthFrom + wxT("' OR (month == '") + monthFrom + wxT("' AND day >= '") + dayFrom + wxT("'))");
req += wxT(" AND (month > '") + monthFrom + wxT("' OR (month == '") + monthFrom + wxT("' AND day >= '") + dayFrom + wxT("')");
req += wxT(" OR (month < '") + monthFrom + wxT("' AND year > '") + yearFrom + wxT("'))");
req += wxT(")");
}
@ -1300,7 +1301,8 @@ std::vector<Operation>* Database::Search(User* user, wxString* description, wxDa
if (firstCond) req += wxT(" AND ") ; else firstCond = true;
req += wxT("(");
req += wxT("year <= ") + yearTo ;
req += wxT(" AND (month < '") + monthTo + wxT("' OR (month == '") + monthTo + wxT("' AND day <= '") + dayTo + wxT("'))");
req += wxT(" AND (month < '") + monthTo + wxT("' OR (month == '") + monthTo + wxT("' AND day <= '") + dayTo + wxT("')");
req += wxT(" OR (month > '") + monthTo + wxT("' AND year < '") + yearTo + wxT("'))");
req += wxT(")");
}

5
src/view/grid/GridAccount.cpp
View File

@ -40,8 +40,8 @@ EVT_GRID_CELL_LEFT_CLICK(GridAccount::OnCellLeftClick )
END_EVENT_TABLE()
enum {GRID_ID};
GridAccount::GridAccount(KissCount* kiss, wxWindow *parent, wxWindowID id) : wxGrid(parent, id), _fixCosts(0), _week1(0),
_week2(0), _week3(0), _week4(0), _kiss(kiss),
GridAccount::GridAccount(KissCount* kiss, wxWindow *parent, wxWindowID id) : wxGrid(parent, id), _fixCosts(0), _week1(0),
_week2(0), _week3(0), _week4(0), _parent(parent), _kiss(kiss),
_loadOperations(false),
_curMonth(0), _curYear(0)
{
@ -676,6 +676,7 @@ void GridAccount::OnOperationModified(wxGridEvent& event)
ComputeWeeks();
inModification = false;
_parent->Fit();
return;
}

1
src/view/grid/GridAccount.h
View File

@ -61,6 +61,7 @@ public:
std::vector<Operation> _displayedOperations;
private:
wxWindow* _parent;
KissCount* _kiss;
bool _displayLines;
wxString* _categories, *_accounts;