'now' events - displayed real now events, not just the testing ones

diff --git a/src/mvc/event.cpp b/src/mvc/event.cpp
index a65bb4ba1709eedf6db1b85a175c5ce9372225c7..fa09ec4f9a579e0a66b1b3561b208e4924e882f9 100644 (file)
--- a/src/mvc/event.cpp
+++ b/src/mvc/event.cpp
@@ -56,8 +56,8 @@ QList<Event> Event::getByDateAndRoom(const QDate& date, int conferenceId)
 
 QList<Event> Event::nowEvents(int conferenceId, QString orderBy)
 {
 
 QList<Event> Event::nowEvents(int conferenceId, QString orderBy)
 {

-    //uint curTime_t =  QDateTime(QDate::currentDate(),QTime::currentTime(),Qt::UTC).toTime_t();
-    uint curTime_t = 1265457610; // for testing
+    uint curTime_t =  QDateTime(QDate::currentDate(),QTime::currentTime(),Qt::UTC).toTime_t();
+    //uint curTime_t = 1265457610; // for testing

 
     QSqlQuery query;
     query.prepare(selectQuery() + QString("WHERE xid_conference = :conf AND start <= :now1 AND ( start + duration ) > :now2 ORDER BY %1").arg(orderBy));
 
     QSqlQuery query;
     query.prepare(selectQuery() + QString("WHERE xid_conference = :conf AND start <= :now1 AND ( start + duration ) > :now2 ORDER BY %1").arg(orderBy));