Removed unused nowEvent functions.

diff --git a/src/mvc/event.cpp b/src/mvc/event.cpp
index 76a3443c7e969f9ddc695200adf35867c6eea3ec..86968e7be930b08374417100136cf986d41d0a3f 100644 (file)
--- a/src/mvc/event.cpp
+++ b/src/mvc/event.cpp
@@ -77,22 +77,8 @@ QList<Event> Event::getByDateAndRoom(const QDate& date, int conferenceId)
     return load(query);
 }
 
-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
 
-    QSqlQuery query;
-    query.prepare(selectQuery() + QString("WHERE xid_conference = :conf AND start <= :now1 AND ( start + duration ) > :now2 ORDER BY %1").arg(orderBy));
-    query.bindValue(":conf", conferenceId);
-    query.bindValue(":now1", convertToDb(curTime_t, QVariant::DateTime));
-    query.bindValue(":now2", convertToDb(curTime_t, QVariant::DateTime));
-
-    return load(query);
-}
-
-QList<Event> Event::conflictEvents(int aEventId, int conferenceId)
-{
+QList<Event> Event::conflictEvents(int aEventId, int conferenceId) {
     QSqlQuery query;
     Event event = Event::getById(aEventId,conferenceId);
     query.prepare(selectQuery() + "WHERE xid_conference = :conf AND ( \
@@ -109,6 +95,7 @@ QList<Event> Event::conflictEvents(int aEventId, int conferenceId)
     return load(query);
 }
 
+
 QList<Event> Event::getFavByDate(const QDate& date, int conferenceId)
 {
     QSqlQuery query;

diff --git a/src/mvc/event.h b/src/mvc/event.h
index 8b63a29227e503d2741571594ed1c22334c75903..08c86f0bd939dda10acd290c0652befdc4d0cde9 100644 (file)
--- a/src/mvc/event.h
+++ b/src/mvc/event.h
@@ -46,7 +46,6 @@ public:
     static QList<Event> getByDate(const QDate & date, int conferenceId, QString orderBy);
     static QList<Event> getFavByDate(const QDate & date, int conferenceId); // get Favourities by Date
     static QList<Event> getSearchResultByDate(const QDate& date, int conferenceId, QString orderBy);
-    static QList<Event> nowEvents(int conferenceId, QString orderBy); // get events scheduled NOW
     static QList<Event> getByTrack(int id);
     static QList<Event> getByDateAndRoom(const QDate& date, int conferenceId);
     static QList<Event> conflictEvents(int aEventId, int conferenceId);

diff --git a/src/mvc/eventmodel.cpp b/src/mvc/eventmodel.cpp
index 280868f9374bfa75a3b2d3c0f6ac360186386197..f86b0470a1b46b876afea466c975d31b0954570b 100644 (file)
--- a/src/mvc/eventmodel.cpp
+++ b/src/mvc/eventmodel.cpp
@@ -300,19 +300,8 @@ void EventModel::loadEventsByRoom(const QDate &aDate, int aConferenceId)
     createRoomGroups();
 }
 
-void EventModel::loadNowEvents(int aConferenceId)
-{
-    clearModel();
-    // check for existence of the conference in the DB
-    if(Conference::getAll().count())
-    {
-        mEvents = Event::nowEvents(aConferenceId, "start");
-    }
-    createTimeGroups();
-}
 
-void EventModel::loadConflictEvents(int aEventId, int aConferenceId)
-{
+void EventModel::loadConflictEvents(int aEventId, int aConferenceId) {
     clearModel();
     // check for existence of the conference in the DB
     if(Conference::getAll().count())

diff --git a/src/mvc/eventmodel.h b/src/mvc/eventmodel.h
index 49d5dc7de01506b1bd97b08c8f6380ab3deae9c7..1383d247fec24596dcdf1f89c1e3beda59fe42e5 100644 (file)
--- a/src/mvc/eventmodel.h
+++ b/src/mvc/eventmodel.h
@@ -39,7 +39,6 @@ public:
     void loadFavEvents(const QDate &aDate, int aConferenceId); // loads Favourite events from the DB
     void loadEventsByTrack(const QDate &aDate, int aConferenceId); // loads Events sorted by Track id and Event start from the DB
     int loadSearchResultEvents(const QDate &aDate, int aConferenceId);
-    void loadNowEvents(int aConferenceId); // loads Now events from the DB
     void loadEventsByRoom(const QDate &aDate, int aConferenceId);
     void loadConflictEvents(int aEventId, int aConferenceId); // loads events in conflict
     void clearModel();