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

Warn user when some operation dates are modified due to month restriction

Browse Source
This commit is contained in:
Grégory Soutadé
2014-02-08 15:14:04 +01:00
parent 34bbd08de6
commit 2cea83f22b
7 changed files with 378 additions and 432 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/controller/KissCount.cpp
View File

@@ -256,11 +256,12 @@ std::map<int, std::vector<int> > KissCount::GetAllOperations()
return _db->GetAllOperations(_user);
}
void KissCount::GenerateMonth(int monthFrom, int yearFrom, int monthTo, int yearTo)
int KissCount::GenerateMonth(int monthFrom, int yearFrom, int monthTo, int yearTo)
{
std::vector<Operation>::iterator it, it2;
std::map<int, int> meta;
Operation op;
int nb_update_days = 0;
_db->GenerateMonth(_user, monthFrom, yearFrom, monthTo, yearTo);
@@ -290,6 +291,7 @@ void KissCount::GenerateMonth(int monthFrom, int yearFrom, int monthTo, int year
{
QDate d(op.year, op.month+1, 1);
op.day = d.daysInMonth()-1;
nb_update_days++;
}
(*_user->_operations[yearTo])[monthTo].push_back(op);
@@ -317,6 +319,8 @@ void KissCount::GenerateMonth(int monthFrom, int yearFrom, int monthTo, int year
}
}
_wxUI->GenerateMonth(monthTo, yearTo);
return nb_update_days;
}
void KissCount::ChangePassword(const QString& password)

2
src/controller/KissCount.hpp
View File

@@ -95,7 +95,7 @@ public:
std::map<int, std::vector<int> > GetAllOperations();
void GenerateMonth(int monthFrom, int yearFrom, int monthTo, int yearTo);
int GenerateMonth(int monthFrom, int yearFrom, int monthTo, int yearTo);
void KillMe();
void SetLanguage(QString language);

5
src/view/GenerateDialog.cpp
View File

@@ -18,6 +18,7 @@
*/
#include "GenerateDialog.hpp"
#include <QLabel>
#include <QMessageBox>
GenerateDialog::GenerateDialog(KissCount* kiss, wxUI *parent, int month, int year) : QDialog(0, Qt::Dialog), _kiss(kiss), _wxUI(parent)
{
@@ -210,7 +211,9 @@ void GenerateDialog::OnOK()
QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
close();
_kiss->GenerateMonth(monthFrom, yearFrom, monthTo, yearTo);
if (_kiss->GenerateMonth(monthFrom, yearFrom, monthTo, yearTo))
QMessageBox::warning(0, _("Warning"), _("Some operations date has been updated"));
QApplication::restoreOverrideCursor();
}