ETM-Schurig/powersync-core
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix all repeating options

Browse Source
This commit is contained in:
Simon Stürz 2017-10-03 09:30:43 +02:00 committed by Michael Zanetti
parent 78f17180a5
commit ebc3d0e909
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libguh-core/time/calendaritem.cpp
View File

@ -167,13 +167,6 @@ bool CalendarItem::evaluateDaily(const QDateTime &dateTime) const
bool todayValid = dateTime >= startDateTime && dateTime < endDateTime; bool todayValid = dateTime >= startDateTime && dateTime < endDateTime;
bool yesterdayValid = dateTime >= startDateTimeYesterday && dateTime < endDateTimeYesterday; bool yesterdayValid = dateTime >= startDateTimeYesterday && dateTime < endDateTimeYesterday;
qCDebug(dcRuleEngine()) << "-------------------------------------------------------------------------------";
qCDebug(dcRuleEngine()) << "Evaluate daily: current time" << dateTime.toString("dd:MM:yyyy hh:mm") << dateTime.toTime_t();
qCDebug(dcRuleEngine()) << "Evaluate daily: start time" << startDateTime.toString("dd:MM:yyyy hh:mm") << startDateTime.toTime_t();
qCDebug(dcRuleEngine()) << "Evaluate daily: end time" << endDateTime.toString("dd:MM:yyyy hh:mm") << endDateTime.toTime_t();
qCDebug(dcRuleEngine()) << "Today valid" << todayValid;
qCDebug(dcRuleEngine()) << "Yesterday valid" << yesterdayValid;
return todayValid || yesterdayValid; return todayValid || yesterdayValid;
} }
@ -186,7 +179,7 @@ bool CalendarItem::evaluateWeekly(const QDateTime &dateTime) const
// Get the first day of this week with the correct start time // Get the first day of this week with the correct start time
QDateTime weekStartDateTime = dateTime.addDays(-dateTime.date().dayOfWeek()); QDateTime weekStartDateTime = dateTime.addDays(-dateTime.date().dayOfWeek());
weekStartDateTime.setTime(m_startTime); weekStartDateTime.setTime(startTime());
// Check each week day in the list // Check each week day in the list
foreach (const int &weekDay, repeatingOption().weekDays()) { foreach (const int &weekDay, repeatingOption().weekDays()) {
@ -219,7 +212,9 @@ bool CalendarItem::evaluateWeekly(const QDateTime &dateTime) const
bool CalendarItem::evaluateMonthly(const QDateTime &dateTime) const bool CalendarItem::evaluateMonthly(const QDateTime &dateTime) const
{ {
// Get the first day of this month with the correct start time // Get the first day of this month with the correct start time
QDateTime monthStartDateTime = QDateTime(QDate(dateTime.date().year(), dateTime.date().month(), 1), m_startTime); QDateTime monthStartDateTime = dateTime;
monthStartDateTime.setDate(QDate(dateTime.date().year(), dateTime.date().month(), 1));
monthStartDateTime.setTime(m_startTime);
// Check each month day in the list // Check each month day in the list
foreach (const int &monthDay, repeatingOption().monthDays()) { foreach (const int &monthDay, repeatingOption().monthDays()) {
@ -247,7 +242,9 @@ bool CalendarItem::evaluateMonthly(const QDateTime &dateTime) const
bool CalendarItem::evaluateYearly(const QDateTime &dateTime) const bool CalendarItem::evaluateYearly(const QDateTime &dateTime) const
{ {
// check for this year // check for this year
QDateTime startDateTimeThisYear = QDateTime(QDate(dateTime.date().year(), m_dateTime.date().month(), m_dateTime.date().day()), m_dateTime.time()); QDateTime startDateTimeThisYear = dateTime;
startDateTimeThisYear.setDate(QDate(dateTime.date().year(), m_dateTime.date().month(), m_dateTime.date().day()));
startDateTimeThisYear.setTime(m_dateTime.time());
QDateTime endDateTimeThisYear = startDateTimeThisYear.addSecs(duration() * 60); QDateTime endDateTimeThisYear = startDateTimeThisYear.addSecs(duration() * 60);
// check if we are in the interval of this year // check if we are in the interval of this year