Changeset 412cef6 in confclerk_git

Timestamp:

01/28/10 13:43:19 (13 years ago)

Author:

pavelpa <pavelpa@…>

Branches:

master, qt5

Children:

8cb5c4f

Parents:

438699c

Message:

some 'delegate' drawing optimizations

• removed EVENT_CONFLICT table - used one SQL SELECT instead

Location:

src

Files:

• gui/eventdialog.cpp (modified) (2 diffs)
• mvc/delegate.cpp (modified) (1 diff)
• mvc/event.cpp (modified) (2 diffs)
• mvc/event.h (modified) (2 diffs)
• mvc/treeview.cpp (modified) (1 diff)
• sql/sqlengine.cpp (modified) (2 diffs)

src/gui/eventdialog.cpp

@@ -46 +46 @@
     Event event = Event::getById(mEventId,Conference::activeConference());
 
+    QList<Event> conflicts = Event::conflictEvents(event.id(),Conference::activeConference());
     if(event.isFavourite())
     {
@@ -57 +58 @@
     }
     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()));
 }
 

src/mvc/delegate.cpp

@@ -66 +66 @@
 
         //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))

src/mvc/event.cpp

@@ -72 +72 @@
 {
     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);
@@ -152 +162 @@
 }
 
-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();
-
-    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();
-        }
-    }
+    if(!isFavourite()) // if it's not favourite, it can't have time-conflict
+        return false;
+
+    return conflictEvents(id(),conferenceId()).count() > 0 ? true : false;
 }
 

src/mvc/event.h

@@ -49 +49 @@
     int roomId() const;
     QStringList persons() const;
-    QList<int> conflicts() const;
     QMap<QString,QString> links() const;
 
@@ -70 +69 @@
     void setPersons(const QStringList &persons);
     void setLinks(const QMap<QString,QString> &aLinks);
-    void updateConflicts();
 
 friend class EventTest;

src/mvc/treeview.cpp

@@ -58 +58 @@
 
                 qDebug() << " FAVOURITE [" << qVariantValue<QString>(aIndex.data()) << "] -> " << event.isFavourite();
-                // update EVENT_CONFLICT table
-                event.updateConflicts();
+
                 if(event.isFavourite())
                 {

src/sql/sqlengine.cpp

@@ -152 +152 @@
     }
 }
-
 
 void SqlEngine::addPersonToDB(QHash<QString,QString> &aPerson)
@@ -290 +289 @@
             "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, "