search fixed

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

diff --git a/src/mvc/event.cpp b/src/mvc/event.cpp
index ba7bbc4bd75f2233574611a0e8fc3cea0395dd72..d3c69209d8bc4150169e3dc066a7e063436eee41 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)
 {
-    //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));
@@ -71,9 +71,17 @@ QList<Event> Event::nowEvents(int conferenceId, QString orderBy)
 QList<Event> Event::conflictEvents(int aEventId, int conferenceId)
 {
     QSqlQuery query;
-    query.prepare( selectQuery() + QString("WHERE id IN ( SELECT conflict_event FROM event_conflict WHERE xid_event = :id AND xid_conference = :conf ) ORDER BY %1").arg("start"));
-    query.bindValue(":id", aEventId);
-    query.bindValue(":conf", conferenceId);
+    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");
+    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));
+    query.bindValue(":s2", convertToDb(event.start(), QVariant::DateTime));
+    query.bindValue(":e2", convertToDb(event.start().toTime_t()+event.duration(), QVariant::DateTime));
+    query.bindValue(":id", event.id());
 
     return load(query);
 }
@@ -151,95 +159,12 @@ QMap<QString,QString> Event::links() const
     return links;
 }
 
-QList<int> Event::conflicts() const
-{
-    QSqlQuery query;
-    // TODO: conference ID isn't used here
-    query.prepare("SELECT conflict_event FROM event_conflict WHERE xid_event = :id AND xid_conference = :conf");
-    query.bindValue(":id", id());
-    query.bindValue(":conf", conferenceId());
-    query.exec();
-    // TODO: handle qeury error
-    //qDebug() << query.lastError();
-
-    QList<int> conflicts;
-    while(query.next())
-        conflicts.append(query.record().value("conflict_event").toInt());
-
-    return conflicts;
-}
-
 bool Event::hasTimeConflict() const
 {
-    return conflicts().count() > 0 ? true : false;
-}
+    if(!isFavourite()) // if it's not favourite, it can't have time-conflict
+        return false;
 
-void Event::updateConflicts()
-{
-    qDebug() << "updating conflicts";
-    QSqlQuery query;
-    query.prepare("SELECT id FROM event WHERE xid_conference = :conf AND ( \
-           ( start <= :start1 AND ( start + duration ) >= :start2 ) \
-        OR ( start >= :start3 AND ( start + duration ) <= :end1 ) \
-        OR ( start <= :end2  AND ( start + duration ) >= :end3 ) ) AND favourite = 1 ORDER BY start");
-    query.bindValue(":conf", conferenceId());
-    query.bindValue(":start1", convertToDb(start(), QVariant::DateTime));
-    query.bindValue(":start2", convertToDb(start(), QVariant::DateTime));
-    query.bindValue(":start3", convertToDb(start(), QVariant::DateTime));
-    query.bindValue(":end1", convertToDb(start().toTime_t()+duration(), QVariant::DateTime));
-    query.bindValue(":end2", convertToDb(start().toTime_t()+duration(), QVariant::DateTime));
-    query.bindValue(":end3", convertToDb(start().toTime_t()+duration(), QVariant::DateTime));
-    query.exec();
-
-    QList<int> conflicts;
-    while(query.next())
-    {
-        int idx = query.record().value("id").toInt();
-        if(idx != id())
-            conflicts.append(idx);
-    }
-
-    if(isFavourite()) // event became favourite
-    {
-        for(int i=0; i<conflicts.count(); i++)
-        {
-            QSqlQuery query;
-            query.prepare("INSERT INTO event_conflict (xid_conference, xid_event, conflict_event) VALUES ( ? , ? , ? )");
-            query.bindValue(0, conferenceId());
-            query.bindValue(1, id());
-            query.bindValue(2, conflicts[i]);
-            query.exec();
-
-            QSqlQuery query2;
-            query2.prepare("INSERT INTO event_conflict (xid_conference, xid_event, conflict_event) VALUES ( ? , ? , ? )");
-            query2.bindValue(0, conferenceId());
-            query2.bindValue(1, conflicts[i]);
-            query2.bindValue(2, id());
-            query2.exec();
-        }
-    }
-    else // event removed from favourities
-    {
-        qDebug() << "removing";
-
-        QSqlQuery queryRemove;
-        queryRemove.prepare("DELETE FROM event_conflict WHERE xid_event = :id AND xid_conference = :conf");
-        queryRemove.bindValue(":id",id());
-        queryRemove.bindValue(":conf",conferenceId());
-        queryRemove.exec();
-
-        for(int i=0; i<conflicts.count(); i++)
-        {
-            qDebug() << "removing: " << id() << " -> " << conflicts[i];
-
-            QSqlQuery queryRemove;
-            queryRemove.prepare("DELETE FROM event_conflict WHERE xid_event = :id1 AND xid_conference = :conf AND conflict_event = :id2");
-            queryRemove.bindValue(":id1",conflicts[i]);
-            queryRemove.bindValue(":conf",conferenceId());
-            queryRemove.bindValue(":id2",id());
-            queryRemove.exec();
-        }
-    }
+    return conflictEvents(id(),conferenceId()).count() > 0 ? true : false;
 }
 
 void Event::setRoom(const QString &room)
@@ -268,10 +193,9 @@ void Event::setLinks(const QMap<QString,QString> &aLinks)
 
 QList<Event> Event::getSearchResultByDate(const QDate& date, int conferenceId, QString orderBy)
 {
-
     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);
-    qDebug() << strQuery;
+    //qDebug() << strQuery;
     QList<Event> list;
     QSqlQuery query;
     try{