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

Forbid database upgrade from version 2 to version 3 

Always display date in insertion and fix a bug in day display
This commit is contained in:
Grégory Soutadé 2012-05-01 10:25:19 +02:00
parent aafc26c768
commit 3f428ab7c2
2 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/model/DatabaseUpdate.cpp
View File

@ -90,6 +90,8 @@ static void Version_2_to_3(QSqlDatabase& _db)
req = "UPDATE account SET hidden='0'";
UPDATE_TABLE("2", "3", "2");
ON_ERROR(_("Cannot update database version 2 to version 3 because some columns needs to be deleted."));
}
static update_func updates[] = {

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

@ -441,7 +441,23 @@ void GridAccount::InsertOperation(User* user, Operation& op, int line, bool fix,
}
else
{
setItem(line, OP_DATE, new QTableWidgetItem(_kiss->FormatDate(curDate.day(), month+1, year)));
int day;
if (curDate.year() == year)
{
if (curDate.month() > (month+1))
day = QDate(year, month+1, 1).daysInMonth();
else if (curDate.month() < (month+1))
day = 1;
else
day = curDate.day();
}
else if (curDate.year() > year)
day = QDate(year, month+1, 1).daysInMonth();
else
day = 1;
setItem(line, OP_DATE, new QTableWidgetItem(_kiss->FormatDate(day, month+1, year)));
SET_ROW_COLOR(line, view::OWN_GREEN, Qt::black);
}
@ -1051,9 +1067,22 @@ void GridAccount::OnOperationModified(int row, int col)
}
if (!fix_cost)
{
if (_curMonth+1 == curDate.month() &&
_curYear == curDate.year())
setItem(row, OP_DATE, new QTableWidgetItem(_kiss->FormatDate(curDate.day(), _curMonth+1, _curYear)));
int day;
if (curDate.year() == _curYear)
{
if (curDate.month() > (_curMonth+1))
day = QDate(_curYear, _curMonth+1, 1).daysInMonth();
else if (curDate.month() < (_curMonth+1))
day = 1;
else
day = curDate.day();
}
else if (curDate.year() > _curYear)
day = QDate(_curYear, _curMonth+1, 1).daysInMonth();
else
day = 1;
setItem(row, OP_DATE, new QTableWidgetItem(_kiss->FormatDate(day, _curMonth+1, _curYear)));
}
DEFAULT_FONT(font);