Sorted by duration additionally to start.

[toast/confclerk.git] / src / mvc / event.cpp

diff --git a/src/mvc/event.cpp b/src/mvc/event.cpp
index b70cf7aaa27ed8770188824a9ca64b1efd25bb6d..9c93928a6e73a00aea1bb2d0f12951b5fa12e919 100644 (file)
--- a/src/mvc/event.cpp
+++ b/src/mvc/event.cpp
@@ -43,8 +43,7 @@ Event::Event() :
 {
 }
 
-Event Event::getById(int id, int conferenceId)
-{
+Event Event::getById(int id, int conferenceId) {
     QSqlQuery query;
     query.prepare(selectQuery() + "WHERE id = :id AND xid_conference = :conf");
     query.bindValue(":id", id);
@@ -52,14 +51,13 @@ Event Event::getById(int id, int conferenceId)
     return loadOne(query);
 }
 
-QList<Event> Event::getByDate(const QDate& date, int conferenceId, QString orderBy)
-{
+
+QList<Event> Event::getByDate(const QDate& date, int conferenceId, QString orderBy) {
     QSqlQuery query;
     query.prepare(selectQuery() + QString("WHERE xid_conference = :conf AND start >= :start AND start < :end ORDER BY %1").arg(orderBy));
     query.bindValue(":conf", conferenceId);
     query.bindValue(":start", convertToDb(date, QVariant::DateTime));
     query.bindValue(":end", convertToDb(date.addDays(1), QVariant::DateTime));
-
     return load(query);
 }
 
@@ -68,7 +66,7 @@ QList<Event> Event::getByDateAndRoom(const QDate& date, int conferenceId)
     QSqlQuery query;
     QString aliasEvent("E");
     QString aliasEventRoom("R");
-    query.prepare(QString("SELECT %1 FROM %2 %3, %4 %5 WHERE %3.xid_conference = :conf AND %3.start >= :start AND %3.start < :end AND %3.id = R.xid_event ORDER BY %5.xid_room, %3.start").arg(
+    query.prepare(QString("SELECT %1 FROM %2 %3, %4 %5 WHERE %3.xid_conference = :conf AND %3.start >= :start AND %3.start < :end AND %3.id = R.xid_event ORDER BY %5.xid_room, %3.start, %3.duration").arg(
                     columnsForSelect(aliasEvent), Event::sTableName, aliasEvent, "EVENT_ROOM", aliasEventRoom));
     query.bindValue(":conf", conferenceId);
     query.bindValue(":start", convertToDb(date, QVariant::DateTime));
@@ -77,28 +75,14 @@ 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 ( \
            ( start >= :s1 AND ( start + duration ) < :e1 ) \
         OR ( ( start + duration ) > :s2 AND start < :e2 ) ) \
-        AND favourite = 1 AND NOT id = :id ORDER BY start");
+        AND favourite = 1 AND NOT id = :id ORDER BY start, duration");
     query.bindValue(":conf", event.conferenceId());
     query.bindValue(":s1", convertToDb(event.start(), QVariant::DateTime));
     query.bindValue(":e1", convertToDb(event.start().toTime_t()+event.duration(), QVariant::DateTime));
@@ -109,10 +93,11 @@ QList<Event> Event::conflictEvents(int aEventId, int conferenceId)
     return load(query);
 }
 
+
 QList<Event> Event::getFavByDate(const QDate& date, int conferenceId)
 {
     QSqlQuery query;
-    query.prepare(selectQuery() + QString("WHERE xid_conference = :conf AND start >= :start AND start < :end AND favourite = 1 ORDER BY start"));
+    query.prepare(selectQuery() + QString("WHERE xid_conference = :conf AND start >= :start AND start < :end AND favourite = 1 ORDER BY start, duration"));
     query.bindValue(":conf", conferenceId);
     query.bindValue(":start", convertToDb(date, QVariant::DateTime));
     query.bindValue(":end", convertToDb(date.addDays(1), QVariant::DateTime));
@@ -220,14 +205,23 @@ void Event::setLinks(const QMap<QString,QString> &aLinks)
     // TODO: implement
 }
 
-QList<Event> Event::getSearchResultByDate(const QDate& date, int conferenceId, QString orderBy)
-{
+QList<Event> Event::getSearchResultByDate(const QDate& date, int conferenceId, QString orderBy) {
+    QList<Event> list;
+
+    // Check whether the temporary table SEARCH_EVENT exists (http://www.sqlite.org/faq.html#q7)
+    QSqlQuery query("SELECT count(*) FROM sqlite_temp_master WHERE type='table' and name='SEARCH_EVENT'");
+    if (!query.exec()) {
+        qDebug() << "SQL Error: " << query.lastError().text();
+        return list;
+    }
+    query.first();
+    QVariant v = query.value(0);
+    if (v.toInt() != 1) return list;
+
     QString strQuery = QString("SELECT %1 FROM EVENT INNER JOIN SEARCH_EVENT USING (xid_conference, id) ").arg(columnsForSelect());
     strQuery += QString("WHERE xid_conference = :conf AND start >= :start AND start < :end ORDER BY %1").arg(orderBy);
-
-    QList<Event> list;
-    QSqlQuery query;
-    try{
+    query = QSqlQuery();
+    try {
         if( !query.prepare( strQuery ) ){
             qDebug() << "QSqlQuery.prepare error";
             throw OrmSqlException( query.lastError().text() );