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

Update TODO

Browse Source 
Add Documentation
Add KissCount URL into about
Add Fix, non fix, both criteria into search
Fix a bug (modifying language and go to another panel than main)
This commit is contained in:
Grégory Soutadé
2010-10-30 20:52:53 +02:00
parent 6cb7b0ccf0
commit 521596abd5
12 changed files with 170 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/model/Database.cpp
View File

@@ -1221,7 +1221,7 @@ void Database::UpdatePreference(User* user, const wxString& preference)
std::vector<Operation>* Database::Search(User* user, wxString* description, wxDateTime* dateFrom, wxDateTime* dateTo,
wxString* amountFrom, wxString* amountTo,
std::vector<wxString> categories, std::vector<wxString> accounts, bool wildcards)
std::vector<wxString> categories, int Fix, std::vector<wxString> accounts, bool wildcards)
{
wxSQLite3ResultSet set;
wxString req;
@@ -1310,6 +1310,13 @@ std::vector<Operation>* Database::Search(User* user, wxString* description, wxDa
if (firstCond) req += wxT(" AND ") ; else firstCond = true;
if (Fix == FIX_OP)
req += wxT(" AND fix_cost='1'");
else if (Fix == NON_FIX_OP)
req += wxT(" AND fix_cost='0'");
if (firstCond) req += wxT(" AND ") ; else firstCond = true;
if (accounts.size())
{
req += wxT("(account IN ('");

4
src/model/Database.h
View File

@@ -33,6 +33,8 @@
#define BDD_FILE "kc.bdd"
#define INIT_SCRIPT "init.sql"
enum {BOTH, FIX_OP, NON_FIX_OP};
class KissCount;
class User;
@@ -81,7 +83,7 @@ public:
std::vector<Operation>* Search(User* user, wxString* description, wxDateTime* dateFrom, wxDateTime* dateTo,
wxString* amountFrom, wxString* amountTo,
std::vector<wxString> categories, std::vector<wxString> accounts, bool wildcards);
std::vector<wxString> categories, int Fix, std::vector<wxString> accounts, bool wildcards);
void GetStats(User* user, const wxString& monthFrom, const wxString& yearFrom, const wxString& monthTo,
const wxString& yearTo, std::map<wxString, std::map<int, std::map<int, double> > >* accountAmounts,