ETM-Schurig
/
nymea
mirror of https://github.com/nymea/nymea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge PR #318: Fix time filter

pull/317/head
Jenkins nymea 2020-07-14 11:26:14 +02:00
parent 3aac5df9f9 16f80aa24c
commit c5b52da69d
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libnymea-core/logging/logfilter.cpp
View File

@ -273,18 +273,18 @@ QString LogFilter::createTimeFilterString(QPair<QDateTime, QDateTime> timeFilter
if (startDate.isValid() && !endDate.isValid()) {
// only start date is valid
query.append(QString("timestamp BETWEEN '%1' AND '%2' ")
.arg(startDate.toTime_t())
.arg(QDateTime::currentDateTime().toTime_t()));
.arg(startDate.toMSecsSinceEpoch())
.arg(QDateTime::currentDateTime().toMSecsSinceEpoch()));
} else if (!startDate.isValid() && endDate.isValid()) {
// only end date is valid
query.append(QString("timestamp NOT BETWEEN '%1' AND '%2' ")
.arg(endDate.toTime_t())
.arg(QDateTime::currentDateTime().toTime_t()));
.arg(endDate.toMSecsSinceEpoch())
.arg(QDateTime::currentDateTime().toMSecsSinceEpoch()));
} else if (startDate.isValid() && endDate.isValid()) {
// both dates are valid
query.append(QString("timestamp BETWEEN '%1' AND '%2' ")
.arg(startDate.toTime_t())
.arg(endDate.toTime_t()));
.arg(startDate.toMSecsSinceEpoch())
.arg(endDate.toMSecsSinceEpoch()));
}
query.append(") ");
return query;