some 'delegate' drawing optimizations

 - removed EVENT_CONFLICT table - used one SQL SELECT instead

diff --git a/src/gui/eventdialog.cpp b/src/gui/eventdialog.cpp
index be98e2981276d33881d39d52658476a0f2302282..12838a55246a92d194814cd6454bcad61b0a3090 100644 (file)
--- a/src/gui/eventdialog.cpp
+++ b/src/gui/eventdialog.cpp
@@ -45,6 +45,7 @@ void EventDialog::favouriteClicked()
 {
     Event event = Event::getById(mEventId,Conference::activeConference());
 
+    QList<Event> conflicts = Event::conflictEvents(event.id(),Conference::activeConference());
     if(event.isFavourite())
     {
         event.setFavourite(false);
@@ -56,12 +57,22 @@ void EventDialog::favouriteClicked()
         favouriteButton->setIcon(QIcon(":/icons/favourite-onBig.png"));
     }
     event.update("favourite");
+
+    if(event.isFavourite())
+    {
+        // event has became 'favourite' and so 'conflicts' list may have changed
+        conflicts = Event::conflictEvents(event.id(),Conference::activeConference());
+    }
+
     qDebug() << " FAVOURITE [" << event.id() << "] -> " << event.isFavourite();
-    // update EVENT_CONFLICT table
-    event.updateConflicts();
+
     // since the Favourite icon has changed, update TreeViews accordingly
     // all TreeViews have to listen on this signal
     emit(eventHasChanged(event.id()));
+
+    // have to emit 'eventHasChanged' signal on all events in conflict
+    for(int i=0; i<conflicts.count(); i++)
+        emit(eventHasChanged(conflicts[i].id()));
 }
 
 void EventDialog::alarmClicked()

diff --git a/src/mvc/delegate.cpp b/src/mvc/delegate.cpp
index d7c6db1b57e0de6ea9245923c44248adad80542f..18dc1e345bf826f9edd14bd39ab0285a2fcdd5b0 100644 (file)
--- a/src/mvc/delegate.cpp
+++ b/src/mvc/delegate.cpp
@@ -65,11 +65,8 @@ void Delegate::paint(QPainter *painter, const QStyleOptionViewItem &option, cons
         //int spacer = (fmSmall.boundingRect("999").width() < SPACER) ? SPACER : fmSmall.boundingRect("999").width();
 
         //Time conflicts are colored differently
-        if(static_cast<Event*>(index.internalPointer())->isFavourite())
         if(static_cast<Event*>(index.internalPointer())->hasTimeConflict())
-        {
             bkgrColor = Qt::yellow;
-        }
 
         if(isLast(index))
         {

diff --git a/src/mvc/event.cpp b/src/mvc/event.cpp
index ba7bbc4bd75f2233574611a0e8fc3cea0395dd72..07001f1a29180fd97dff64f470b1369a76d051a6 100644 (file)
--- a/src/mvc/event.cpp
+++ b/src/mvc/event.cpp
@@ -71,9 +71,19 @@ 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 <= :start1 AND ( start + duration ) >= :start2 ) \
+        OR ( start >= :start3 AND ( start + duration ) <= :end1 ) \
+        OR ( start <= :end2  AND ( start + duration ) >= :end3 ) ) AND favourite = 1 AND NOT id = :id ORDER BY start");
+    query.bindValue(":conf", event.conferenceId());
+    query.bindValue(":start1", convertToDb(event.start(), QVariant::DateTime));
+    query.bindValue(":start2", convertToDb(event.start(), QVariant::DateTime));
+    query.bindValue(":start3", convertToDb(event.start(), QVariant::DateTime));
+    query.bindValue(":end1", convertToDb(event.start().toTime_t()+event.duration(), QVariant::DateTime));
+    query.bindValue(":end2", convertToDb(event.start().toTime_t()+event.duration(), QVariant::DateTime));
+    query.bindValue(":end3", convertToDb(event.start().toTime_t()+event.duration(), QVariant::DateTime));
+    query.bindValue(":id", event.id());
 
     return load(query);
 }
@@ -151,95 +161,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;
-}
-
-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();
+    if(!isFavourite()) // if it's not favourite, it can't have time-conflict
+        return false;
 
-    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)

diff --git a/src/mvc/event.h b/src/mvc/event.h
index 8d55cef91cd0949f2e86789ba3d62a867b9af132..6ddc4424d89ea1b9d0502b8b68a10f664c7db96c 100644 (file)
--- a/src/mvc/event.h
+++ b/src/mvc/event.h
@@ -48,7 +48,6 @@ public:
     QString room() const;
     int roomId() const;
     QStringList persons() const;
-    QList<int> conflicts() const;
     QMap<QString,QString> links() const;
 
     void setId(int id) { setValue("id", id); }
@@ -69,7 +68,6 @@ public:
     void setRoom(const QString& room);
     void setPersons(const QStringList &persons);
     void setLinks(const QMap<QString,QString> &aLinks);
-    void updateConflicts();
 
 friend class EventTest;
 };

diff --git a/src/mvc/treeview.cpp b/src/mvc/treeview.cpp
index 0b3b632c6c3cd5aa8951f98c9052a0bc585baaba..36f1f69fbfe33b8ffda702cee4f9fe41ea90a620 100644 (file)
--- a/src/mvc/treeview.cpp
+++ b/src/mvc/treeview.cpp
@@ -57,8 +57,7 @@ bool TreeView::testForControlClicked(const QModelIndex &aIndex, const QPoint &aP
                 event.update("favourite");
 
                 qDebug() << " FAVOURITE [" << qVariantValue<QString>(aIndex.data()) << "] -> " << event.isFavourite();
-                // update EVENT_CONFLICT table
-                event.updateConflicts();
+
                 if(event.isFavourite())
                 {
                     // event has became 'favourite' and so 'conflicts' list may have changed

diff --git a/src/sql/sqlengine.cpp b/src/sql/sqlengine.cpp
index ea56d7adf6f99efdb877d0dcbfe7fbb1942e8799..fcaceb2ea280701e114f60c28f789bc1888ea9e8 100644 (file)
--- a/src/sql/sqlengine.cpp
+++ b/src/sql/sqlengine.cpp
@@ -152,7 +152,6 @@ void SqlEngine::addEventToDB(QHash<QString,QString> &aEvent)
     }
 }
 
-
 void SqlEngine::addPersonToDB(QHash<QString,QString> &aPerson)
 {
     QSqlDatabase db = QSqlDatabase::database();
@@ -289,14 +288,6 @@ bool SqlEngine::createTables(QSqlDatabase &aDatabase)
             "FOREIGN KEY(xid_event) REFERENCES EVENT(id), "
             "FOREIGN KEY(xid_room) REFERENCES ROOM(id));");
 
-        query.exec("CREATE TABLE EVENT_CONFLICT ( "
-            "xid_conference INTEGER NOT NULL, "
-            "xid_event INTEGER NOT NULL, "
-            "conflict_event INTEGER NOT NULL, "
-            "UNIQUE ( xid_conference, xid_event, conflict_event ) ON CONFLICT IGNORE, "
-            "FOREIGN KEY(xid_conference) REFERENCES CONFERENCE(id), "
-            "FOREIGN KEY(xid_event) REFERENCES EVENT(id));");
-
         query.exec("CREATE TABLE LINK ( "
             "id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "
             "xid_conference INTEGER NOT NULL, "