Merge PR #318: Fix time filter
This commit is contained in:
commit
c5b52da69d
@ -273,18 +273,18 @@ QString LogFilter::createTimeFilterString(QPair<QDateTime, QDateTime> timeFilter
|
|||||||
if (startDate.isValid() && !endDate.isValid()) {
|
if (startDate.isValid() && !endDate.isValid()) {
|
||||||
// only start date is valid
|
// only start date is valid
|
||||||
query.append(QString("timestamp BETWEEN '%1' AND '%2' ")
|
query.append(QString("timestamp BETWEEN '%1' AND '%2' ")
|
||||||
.arg(startDate.toTime_t())
|
.arg(startDate.toMSecsSinceEpoch())
|
||||||
.arg(QDateTime::currentDateTime().toTime_t()));
|
.arg(QDateTime::currentDateTime().toMSecsSinceEpoch()));
|
||||||
} else if (!startDate.isValid() && endDate.isValid()) {
|
} else if (!startDate.isValid() && endDate.isValid()) {
|
||||||
// only end date is valid
|
// only end date is valid
|
||||||
query.append(QString("timestamp NOT BETWEEN '%1' AND '%2' ")
|
query.append(QString("timestamp NOT BETWEEN '%1' AND '%2' ")
|
||||||
.arg(endDate.toTime_t())
|
.arg(endDate.toMSecsSinceEpoch())
|
||||||
.arg(QDateTime::currentDateTime().toTime_t()));
|
.arg(QDateTime::currentDateTime().toMSecsSinceEpoch()));
|
||||||
} else if (startDate.isValid() && endDate.isValid()) {
|
} else if (startDate.isValid() && endDate.isValid()) {
|
||||||
// both dates are valid
|
// both dates are valid
|
||||||
query.append(QString("timestamp BETWEEN '%1' AND '%2' ")
|
query.append(QString("timestamp BETWEEN '%1' AND '%2' ")
|
||||||
.arg(startDate.toTime_t())
|
.arg(startDate.toMSecsSinceEpoch())
|
||||||
.arg(endDate.toTime_t()));
|
.arg(endDate.toMSecsSinceEpoch()));
|
||||||
}
|
}
|
||||||
query.append(") ");
|
query.append(") ");
|
||||||
return query;
|
return query;
|
||||||
|
|||||||
Reference in New Issue
Block a user