Add (XML) Export engine
Add Export Panel Factorise SearchBanner Bug fix : - (Import/Export engines initialization) - virtual field not set in Search method - when deleting on search results - Auto completion now does not require date
This commit is contained in:
153
src/view/ExportPanel.cpp
Normal file
153
src/view/ExportPanel.cpp
Normal file
@@ -0,0 +1,153 @@
|
||||
/*
|
||||
Copyright 2010-2011 Grégory Soutadé
|
||||
|
||||
This file is part of KissCount.
|
||||
|
||||
KissCount is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
KissCount is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with KissCount. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "ExportPanel.h"
|
||||
|
||||
enum {EXPORT_ID=1, SEARCH_ID, GRID_ID};
|
||||
|
||||
BEGIN_EVENT_TABLE(ExportPanel, wxPanel)
|
||||
EVT_BUTTON(EXPORT_ID, ExportPanel::OnButtonExport)
|
||||
EVT_BUTTON(SEARCH_ID, ExportPanel::OnButtonSearch)
|
||||
EVT_SHOW(ExportPanel::OnShow)
|
||||
END_EVENT_TABLE()
|
||||
|
||||
ExportPanel::ExportPanel(KissCount* kiss, wxUI *parent) : KissPanel(kiss, parent), _operations(NULL)
|
||||
{
|
||||
DEFAULT_FONT(font);
|
||||
std::vector<Account>::iterator accountIt;
|
||||
std::vector<Category>::iterator categoryIt;
|
||||
wxDateTime firstOfMonth;
|
||||
wxRect rect = wxDisplay().GetGeometry();
|
||||
|
||||
wxBoxSizer *vbox = new wxBoxSizer(wxVERTICAL);
|
||||
wxBoxSizer *vbox2 = new wxBoxSizer(wxVERTICAL);
|
||||
wxBoxSizer *hbox = new wxBoxSizer(wxHORIZONTAL);
|
||||
|
||||
SetSizer(vbox);
|
||||
|
||||
_searchButton = new wxButton(this, SEARCH_ID, _("Search"));
|
||||
|
||||
_banner = new SearchBanner(kiss, this, this, OnEnter);
|
||||
|
||||
vbox->Add(_banner, 0, wxGROW|wxALL, 5);
|
||||
vbox->Add(_searchButton, 0, wxALL, 5);
|
||||
|
||||
_grid = new GridAccount(_kiss, this, GRID_ID, false, false, false);
|
||||
|
||||
hbox->Add(_grid, 0, wxGROW|wxALL, 5);
|
||||
|
||||
_exportButton = new wxButton(this, EXPORT_ID, _("Export"));
|
||||
|
||||
vbox2->Add(_exportButton, wxALL, 15);
|
||||
|
||||
hbox->Add(vbox2, 0, wxALL, 15);
|
||||
|
||||
vbox->Add(hbox, 0, wxGROW|wxALL, 5);
|
||||
|
||||
Fit();
|
||||
|
||||
SetMinSize(wxSize(rect.width-rect.x-15, rect.height-rect.y-128-25));
|
||||
SetMaxSize(wxSize(rect.width-rect.x-15, rect.height-rect.y-128-25));
|
||||
SetScrollbars(10, 10, 100/10, 100/10);
|
||||
}
|
||||
|
||||
ExportPanel::~ExportPanel()
|
||||
{
|
||||
}
|
||||
|
||||
KissPanel* ExportPanel::CreatePanel()
|
||||
{
|
||||
return new ExportPanel(_kiss, _wxUI);
|
||||
}
|
||||
|
||||
wxBitmapButton* ExportPanel::GetButton(int id)
|
||||
{
|
||||
if (!_KissButton)
|
||||
_KissButton = new wxBitmapButton(_wxUI, id, wxBitmap(wxT(EXPORT_ICON), wxBITMAP_TYPE_PNG), wxDefaultPosition, wxSize(128, 128));
|
||||
|
||||
return _KissButton;
|
||||
}
|
||||
|
||||
wxString ExportPanel::GetToolTip()
|
||||
{
|
||||
return _("Export");
|
||||
}
|
||||
|
||||
void ExportPanel::OnEnter(void* caller, wxCommandEvent& event)
|
||||
{
|
||||
ExportPanel* _this = (ExportPanel*) caller;
|
||||
|
||||
_this->OnButtonExport(event);
|
||||
}
|
||||
|
||||
void ExportPanel::OnButtonSearch(wxCommandEvent& event)
|
||||
{
|
||||
_operations = _banner->Search();
|
||||
|
||||
if (!_operations) return;
|
||||
|
||||
if (_operations->size() > 1)
|
||||
wxMessageBox(wxString::Format(wxT("%d"), _operations->size()) + _(" entries found"), wxT("KissCount"), wxICON_INFORMATION | wxOK);
|
||||
else if (_operations->size() == 1)
|
||||
wxMessageBox(_("1 entry found"), wxT("KissCount"), wxICON_INFORMATION | wxOK);
|
||||
else
|
||||
{
|
||||
wxMessageBox(_("No entry found"), wxT("KissCount"), wxICON_INFORMATION | wxOK);
|
||||
return;
|
||||
}
|
||||
|
||||
_grid->LoadOperations(_operations, 0, 0);
|
||||
|
||||
_wxUI->Layout();
|
||||
}
|
||||
|
||||
void ExportPanel::OnButtonExport(wxCommandEvent& event)
|
||||
{
|
||||
if (!_operations || !_operations->size())
|
||||
{
|
||||
wxMessageBox(_("No operation to save"), wxT("Error"), wxICON_ERROR | wxOK);
|
||||
return;
|
||||
}
|
||||
|
||||
wxFileDialog saveFileDialog(this, _("Save as"), wxT(""), wxT(""),
|
||||
_kiss->GetExportEngineExtensions(), wxFD_SAVE|wxFD_OVERWRITE_PROMPT);
|
||||
|
||||
if (saveFileDialog.ShowModal() == wxID_CANCEL)
|
||||
return;
|
||||
|
||||
_exportEngine = _kiss->GetExportEngine(saveFileDialog.GetPath());
|
||||
|
||||
if (!_exportEngine)
|
||||
{
|
||||
wxMessageBox(_("Any engine can process this file !"), wxT("KissCount"), wxICON_INFORMATION | wxOK);
|
||||
|
||||
return ;
|
||||
}
|
||||
|
||||
if (_exportEngine->SaveFile(_operations))
|
||||
wxMessageBox(_("Operations successfuly saved"), wxT("KissCount"), wxICON_INFORMATION | wxOK);
|
||||
else
|
||||
wxMessageBox(_("Failed to save operations"), wxT("Error"), wxICON_ERROR | wxOK);
|
||||
|
||||
}
|
||||
|
||||
void ExportPanel::OnShow(wxShowEvent& event)
|
||||
{
|
||||
_wxUI->SetTitle(_("KissCount - Export"));
|
||||
}
|
65
src/view/ExportPanel.h
Normal file
65
src/view/ExportPanel.h
Normal file
@@ -0,0 +1,65 @@
|
||||
/*
|
||||
Copyright 2010-2011 Grégory Soutadé
|
||||
|
||||
This file is part of KissCount.
|
||||
|
||||
KissCount is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
KissCount is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with KissCount. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#ifndef EXPORTPANEL_H
|
||||
#define EXPORTPANEL_H
|
||||
|
||||
#include <wx/wx.h>
|
||||
#include <wx/grid.h>
|
||||
#include <wx/treectrl.h>
|
||||
#include <wx/scrolwin.h>
|
||||
#include "view.h"
|
||||
#include "grid/CalendarEditor.h"
|
||||
#include "grid/wxGridCellBitmapRenderer.h"
|
||||
#include "grid/GridAccount.h"
|
||||
#include "SearchBanner.h"
|
||||
#include <model/model.h>
|
||||
#include <model/export/ExportEngine.h>
|
||||
|
||||
class GridAccount;
|
||||
class SearchBanner;
|
||||
class ExportEngine;
|
||||
|
||||
class ExportPanel: public KissPanel
|
||||
{
|
||||
public:
|
||||
ExportPanel(KissCount* kiss, wxUI *parent);
|
||||
~ExportPanel();
|
||||
|
||||
KissPanel* CreatePanel();
|
||||
wxBitmapButton* GetButton(int id);
|
||||
wxString GetToolTip();
|
||||
void OnShow(wxShowEvent& event);
|
||||
|
||||
void OnButtonSearch(wxCommandEvent& event);
|
||||
void OnButtonExport(wxCommandEvent& event);
|
||||
|
||||
private:
|
||||
std::vector<Operation> *_operations;
|
||||
SearchBanner* _banner;
|
||||
GridAccount *_grid;
|
||||
wxButton* _searchButton, *_exportButton;
|
||||
ExportEngine* _exportEngine;
|
||||
|
||||
static void OnEnter(void* caller, wxCommandEvent& event);
|
||||
|
||||
DECLARE_EVENT_TABLE();
|
||||
};
|
||||
|
||||
#endif
|
226
src/view/SearchBanner.cpp
Normal file
226
src/view/SearchBanner.cpp
Normal file
@@ -0,0 +1,226 @@
|
||||
/*
|
||||
Copyright 2010-2011 Grégory Soutadé
|
||||
|
||||
This file is part of KissCount.
|
||||
|
||||
KissCount is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
KissCount is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with KissCount. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "SearchBanner.h"
|
||||
|
||||
enum {DESCRIPTION_ID=1, CALENDAR_FROM_ID, CALENDAR_TO_ID};
|
||||
|
||||
BEGIN_EVENT_TABLE(SearchBanner, wxPanel)
|
||||
EVT_CALENDAR_SEL_CHANGED(CALENDAR_TO_ID, SearchBanner::OnCalendarToChange)
|
||||
EVT_TEXT_ENTER(DESCRIPTION_ID, SearchBanner::OnEnter)
|
||||
END_EVENT_TABLE()
|
||||
|
||||
#define UNESCAPE_CHARS(s) { \
|
||||
s.Replace(wxT("\\\""), wxT("\""), true); \
|
||||
s.Replace(wxT("\\\'"), wxT("\'"), true); \
|
||||
}
|
||||
|
||||
SearchBanner::SearchBanner(KissCount* kiss, wxPanel *parent, void* caller, OnButtonEnter enterCallback) : wxPanel(parent), _kiss(kiss), _caller(caller), _enterCallback(enterCallback), _operations(NULL)
|
||||
{
|
||||
DEFAULT_FONT(font);
|
||||
User* user = _kiss->GetUser();
|
||||
std::vector<Account>::iterator accountIt;
|
||||
std::vector<Category>::iterator categoryIt;
|
||||
wxDateTime firstOfMonth;
|
||||
wxRect rect = wxDisplay().GetGeometry();
|
||||
|
||||
wxBoxSizer *vbox = new wxBoxSizer(wxVERTICAL);
|
||||
|
||||
SetSizer(vbox);
|
||||
|
||||
_checkDateFrom = new wxCheckBox(this, wxID_ANY, _("Date from"));
|
||||
_checkDateTo = new wxCheckBox(this, wxID_ANY, _("Date to"));
|
||||
|
||||
_checkDateFrom->SetValue(wxT("1"));
|
||||
_checkDateTo->SetValue(wxT("1"));
|
||||
|
||||
wxGridBagSizer *gridBagSizer = new wxGridBagSizer(3, 10);
|
||||
|
||||
firstOfMonth.SetToCurrent();
|
||||
firstOfMonth.SetDay(1);
|
||||
_calendarFrom = new wxCalendarCtrl(this, CALENDAR_FROM_ID, firstOfMonth, wxDefaultPosition, wxDefaultSize,
|
||||
wxCAL_MONDAY_FIRST);
|
||||
_calendarTo = new wxCalendarCtrl(this, CALENDAR_TO_ID, wxDefaultDateTime, wxDefaultPosition, wxDefaultSize,
|
||||
wxCAL_MONDAY_FIRST);
|
||||
|
||||
|
||||
_description = new wxTextCtrl(this, DESCRIPTION_ID);
|
||||
_description->SetWindowStyle(_description->GetWindowStyle() | wxTE_PROCESS_ENTER);
|
||||
wxSize size = _description->GetSize();
|
||||
size.SetWidth(size.GetWidth()*2);
|
||||
_description->SetMinSize(size);
|
||||
_amountFrom = new wxTextCtrl(this, wxID_ANY);
|
||||
_amountTo = new wxTextCtrl(this, wxID_ANY);
|
||||
|
||||
_category = new wxCheckListBox(this, wxID_ANY);
|
||||
_category->Append(_("Unknown"));
|
||||
for(categoryIt = user->_categories.begin(); categoryIt != user->_categories.end(); categoryIt++)
|
||||
_category->Append(wxGetTranslation(categoryIt->name));
|
||||
|
||||
wxString stypes[] = {_("Fix"), _("Non fix"), _("Checked"), _("Not checked")};
|
||||
_optype = new wxCheckListBox(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 4, stypes);
|
||||
|
||||
_account = new wxCheckListBox(this, wxID_ANY);
|
||||
_account->Append(_("Unknown"));
|
||||
for(accountIt = user->_accounts.begin(); accountIt != user->_accounts.end(); accountIt++)
|
||||
_account->Append(accountIt->name);
|
||||
|
||||
wxStaticText* labelDescription = new wxStaticText(this, wxID_ANY, _("Description"));
|
||||
wxStaticText* labelAmountFrom = new wxStaticText(this, wxID_ANY, _("Amount from"));
|
||||
wxStaticText* labelAmountTo = new wxStaticText(this, wxID_ANY, _("Amount to"));
|
||||
wxStaticText* labelCategory = new wxStaticText(this, wxID_ANY, _("Category"));
|
||||
wxStaticText* labelOperations = new wxStaticText(this, wxID_ANY, _("Operations"));
|
||||
wxStaticText* labelAccount = new wxStaticText(this, wxID_ANY, _("Account"));
|
||||
|
||||
gridBagSizer->Add(labelDescription, wxGBPosition(0, 0));
|
||||
gridBagSizer->Add(_description, wxGBPosition(1, 0));
|
||||
gridBagSizer->Add(_checkDateFrom, wxGBPosition(0, 1));
|
||||
gridBagSizer->Add(_calendarFrom, wxGBPosition(1, 1));
|
||||
gridBagSizer->Add(_checkDateTo, wxGBPosition(0, 2));
|
||||
gridBagSizer->Add(_calendarTo, wxGBPosition(1, 2));
|
||||
gridBagSizer->Add(labelAmountFrom, wxGBPosition(0, 3));
|
||||
gridBagSizer->Add(_amountFrom, wxGBPosition(1, 3));
|
||||
gridBagSizer->Add(labelAmountTo, wxGBPosition(0, 4));
|
||||
gridBagSizer->Add(_amountTo, wxGBPosition(1, 4));
|
||||
gridBagSizer->Add(labelCategory, wxGBPosition(0, 5));
|
||||
gridBagSizer->Add(_category, wxGBPosition(1, 5));
|
||||
gridBagSizer->Add(labelOperations, wxGBPosition(0, 6));
|
||||
gridBagSizer->Add(_optype, wxGBPosition(1, 6));
|
||||
gridBagSizer->Add(labelAccount, wxGBPosition(0, 7));
|
||||
gridBagSizer->Add(_account, wxGBPosition(1, 7));
|
||||
|
||||
vbox->Add(gridBagSizer, 0, wxGROW|wxALL, 5);
|
||||
}
|
||||
|
||||
SearchBanner::~SearchBanner()
|
||||
{
|
||||
if (_operations) delete _operations;
|
||||
}
|
||||
|
||||
std::vector<Operation> * SearchBanner::Search()
|
||||
{
|
||||
wxString *description=NULL, *amountFrom=NULL, *amountTo=NULL;
|
||||
std::vector<wxString> categories, accounts;
|
||||
wxDateTime *dateFrom=NULL, *dateTo=NULL;
|
||||
User* user= _kiss->GetUser();
|
||||
int i, types=0;
|
||||
std::vector<Operation>::iterator it;
|
||||
double af, at;
|
||||
|
||||
if (_operations)
|
||||
{
|
||||
delete _operations;
|
||||
_operations = NULL;
|
||||
}
|
||||
|
||||
if (_checkDateFrom->IsChecked())
|
||||
{
|
||||
dateFrom = new wxDateTime;
|
||||
*dateFrom = _calendarFrom->GetDate();
|
||||
}
|
||||
|
||||
if (_checkDateTo->IsChecked())
|
||||
{
|
||||
dateTo = new wxDateTime;
|
||||
*dateTo = _calendarTo->GetDate();
|
||||
}
|
||||
|
||||
if (dateFrom && dateTo && *dateFrom > *dateTo)
|
||||
{
|
||||
wxMessageBox(_("Invalid date range"), _("Error"), wxICON_ERROR | wxOK);
|
||||
goto end;
|
||||
}
|
||||
|
||||
if (_amountFrom->GetLineText(0).Length())
|
||||
{
|
||||
amountFrom = new wxString;
|
||||
*amountFrom = _amountFrom->GetLineText(0);
|
||||
if (!amountFrom->ToDouble(&af))
|
||||
{
|
||||
wxMessageBox(_("Invalid amount from"), _("Error"), wxICON_ERROR | wxOK);
|
||||
goto end;
|
||||
}
|
||||
|
||||
if (af < 0) af *= -1;
|
||||
}
|
||||
|
||||
if (_amountTo->GetLineText(0).Length())
|
||||
{
|
||||
amountTo = new wxString;
|
||||
*amountTo = _amountTo->GetLineText(0);
|
||||
if (!amountTo->ToDouble(&at))
|
||||
{
|
||||
wxMessageBox(_("Invalid amount to"), _("Error"), wxICON_ERROR | wxOK);
|
||||
goto end;
|
||||
}
|
||||
|
||||
if (at < 0) at *= -1;
|
||||
}
|
||||
|
||||
if (amountFrom && amountTo && af > at)
|
||||
{
|
||||
wxMessageBox(_("Invalid amount range"), _("Error"), wxICON_ERROR | wxOK);
|
||||
goto end;
|
||||
}
|
||||
|
||||
if (_description->GetLineText(0).Length())
|
||||
{
|
||||
description = new wxString;
|
||||
*description = _description->GetLineText(0);
|
||||
}
|
||||
|
||||
for(i=0; i<user->GetCategoriesNumber(); i++)
|
||||
if (_category->IsChecked(i))
|
||||
categories.push_back((i) ? user->_categories[i-1].id : wxT("0"));
|
||||
|
||||
types |= (_optype->IsChecked(0)) ? FIX_OP : 0;
|
||||
types |= (_optype->IsChecked(1)) ? NON_FIX_OP : 0;
|
||||
types |= (_optype->IsChecked(2)) ? CHECKED_OP : 0;
|
||||
types |= (_optype->IsChecked(3)) ? NOT_CHECKED_OP : 0;
|
||||
|
||||
for(i=0; i<user->GetAccountsNumber(); i++)
|
||||
if (_account->IsChecked(i))
|
||||
accounts.push_back((i) ? user->_accounts[i-1].id : wxT("0"));
|
||||
|
||||
_operations = _kiss->Search(description, dateFrom, dateTo, amountFrom, amountTo, categories,types, accounts);
|
||||
|
||||
end:
|
||||
delete dateFrom;
|
||||
delete dateTo;
|
||||
delete amountFrom;
|
||||
delete amountTo;
|
||||
|
||||
return _operations;
|
||||
}
|
||||
|
||||
void SearchBanner::OnEnter(wxCommandEvent& event)
|
||||
{
|
||||
if (_enterCallback)
|
||||
_enterCallback(_caller, event);
|
||||
}
|
||||
|
||||
void SearchBanner::OnCalendarFromChange(wxCalendarEvent& event)
|
||||
{
|
||||
_checkDateFrom->SetValue(true);
|
||||
}
|
||||
|
||||
void SearchBanner::OnCalendarToChange(wxCalendarEvent& event)
|
||||
{
|
||||
_checkDateTo->SetValue(true);
|
||||
}
|
60
src/view/SearchBanner.h
Normal file
60
src/view/SearchBanner.h
Normal file
@@ -0,0 +1,60 @@
|
||||
/*
|
||||
Copyright 2010-2011 Grégory Soutadé
|
||||
|
||||
This file is part of KissCount.
|
||||
|
||||
KissCount is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
KissCount is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with KissCount. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#ifndef SEARCHBANNER_H
|
||||
#define SEARCHBANNER_H
|
||||
|
||||
#include <wx/wx.h>
|
||||
#include <wx/grid.h>
|
||||
#include <wx/treectrl.h>
|
||||
#include <wx/scrolwin.h>
|
||||
#include "view.h"
|
||||
#include "grid/CalendarEditor.h"
|
||||
|
||||
#include <model/model.h>
|
||||
|
||||
typedef void (*OnButtonEnter)(void* caller, wxCommandEvent& event);
|
||||
|
||||
class SearchBanner: public wxPanel
|
||||
{
|
||||
public:
|
||||
SearchBanner(KissCount* kiss, wxPanel* parent, void* caller=NULL, OnButtonEnter enterCallback=NULL);
|
||||
~SearchBanner();
|
||||
|
||||
void OnEnter(wxCommandEvent& event);
|
||||
void OnButtonSearch(wxCommandEvent& event);
|
||||
void OnCalendarFromChange(wxCalendarEvent& event);
|
||||
void OnCalendarToChange(wxCalendarEvent& event);
|
||||
|
||||
std::vector<Operation> * Search();
|
||||
|
||||
private:
|
||||
KissCount* _kiss;
|
||||
void* _caller;
|
||||
OnButtonEnter _enterCallback;
|
||||
|
||||
std::vector<Operation> *_operations;
|
||||
wxCalendarCtrl* _calendarFrom, *_calendarTo;
|
||||
wxCheckBox *_checkDateFrom, *_checkDateTo;
|
||||
wxTextCtrl* _description, *_amountFrom, *_amountTo;
|
||||
wxCheckListBox* _category, *_account, *_optype;
|
||||
DECLARE_EVENT_TABLE();
|
||||
};
|
||||
|
||||
#endif
|
Reference in New Issue
Block a user