diff --git a/src/model/Database.cpp b/src/model/Database.cpp index 3b6b754..ea9b9d0 100644 --- a/src/model/Database.cpp +++ b/src/model/Database.cpp @@ -1291,7 +1291,8 @@ std::vector* 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* 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(")"); }