'conflicts' modifications

 - preparing for the dialog showing also list of events in the conflict
 - created 'EVENT_CONFLICT' for flaging events in conflict state
 - TODO: not finished

diff --git a/src/mvc/delegate.cpp b/src/mvc/delegate.cpp
index 79d94db87f3d714efe09ac32a4cd3cc5795abe5a..d7c6db1b57e0de6ea9245923c44248adad80542f 100644 (file)
--- a/src/mvc/delegate.cpp
+++ b/src/mvc/delegate.cpp
@@ -65,7 +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
         //int spacer = (fmSmall.boundingRect("999").width() < SPACER) ? SPACER : fmSmall.boundingRect("999").width();
 
         //Time conflicts are colored differently

-        if(hasTimeConflict(index, index.parent()))
+        if(static_cast<Event*>(index.internalPointer())->isFavourite())
+        if(static_cast<Event*>(index.internalPointer())->hasTimeConflict())

         {
             bkgrColor = Qt::yellow;
         }
         {
             bkgrColor = Qt::yellow;
         }


@@ -132,9 +133,7 @@ void Delegate::paint(QPainter *painter, const QStyleOptionViewItem &option, cons
         // map
         painter->drawImage(mControls[MapControl]->drawPoint(option.rect),*mControls[MapControl]->image());
         // Time conflict
         // map
         painter->drawImage(mControls[MapControl]->drawPoint(option.rect),*mControls[MapControl]->image());
         // Time conflict

-        //if(static_cast<Event*>(index.internalPointer())->hasTimeConflict())
-
-        if(hasTimeConflict(index, index.parent()))
+        if(static_cast<Event*>(index.internalPointer())->hasTimeConflict())

             painter->drawImage(mControls[WarningControl]->drawPoint(option.rect),*mControls[WarningControl]->image());
 
         // draw texts
             painter->drawImage(mControls[WarningControl]->drawPoint(option.rect),*mControls[WarningControl]->image());
 
         // draw texts


@@ -311,7 +310,7 @@ Delegate::ControlId Delegate::whichControlClicked(const QModelIndex &aIndex, con
         {
             if(id == WarningControl)
             {
         {
             if(id == WarningControl)
             {

-                if(mControls[id]->hasConflict)
+                if(static_cast<Event*>(aIndex.internalPointer())->hasTimeConflict())

                     return id;
             }
             else
                     return id;
             }
             else


@@ -373,7 +372,6 @@ void Delegate::defineControls()
     // WARNING ICON
     control = new Control(WarningControl,QString(":icons/exclamation.png"));
     p = mControls[MapControl]->drawPoint();
     // WARNING ICON
     control = new Control(WarningControl,QString(":icons/exclamation.png"));
     p = mControls[MapControl]->drawPoint();

-    control->hasConflict = false;

     p.setX(p.x()-control->image()->width()-SPACER);
     control->setDrawPoint(p);
     mControls.insert(WarningControl,control);
     p.setX(p.x()-control->image()->width()-SPACER);
     control->setDrawPoint(p);
     mControls.insert(WarningControl,control);


@@ -413,29 +411,3 @@ int Delegate::numberOfAlarms(const QModelIndex &index) const
     return nrofAlarms;
 }
 
     return nrofAlarms;
 }
 

-bool Delegate::hasTimeConflict(const QModelIndex &index, const QModelIndex &parent) const
-{
-    Event *event = static_cast<Event*>(index.internalPointer());
-    QTime start = event->start().time();
-    QTime end = start.addSecs(event->duration());
-    for(int i=0; i<parent.model()->rowCount(parent); i++)
-    {
-        if((event->id()!=static_cast<Event*>(parent.child(i,0).internalPointer())->id())
-        &&
-        (static_cast<Event*>(parent.child(i,0).internalPointer())->isFavourite()))
-        {
-            if (((start >= static_cast<Event*>(parent.child(i,0).internalPointer())->start().time())
-            &&
-            (start < static_cast<Event*>(parent.child(i,0).internalPointer())->start().time().addSecs(static_cast<Event*>(parent.child(i,0).internalPointer())->duration())))
-            ||
-            ((end > static_cast<Event*>(parent.child(i,0).internalPointer())->start().time())
-            &&
-            (end <= static_cast<Event*>(parent.child(i,0).internalPointer())->start().time().addSecs(static_cast<Event*>(parent.child(i,0).internalPointer())->duration()))))
-            {
-                return true;
-            }
-        }
-    }
-    return false;
-}
-

diff --git a/src/mvc/delegate.h b/src/mvc/delegate.h
index 42cce9429e5080f19868601b5f444ac458fbc3cf..3f544f7e10fc35b7b41e35cac1d7c4f32712d8be 100644 (file)
--- a/src/mvc/delegate.h
+++ b/src/mvc/delegate.h
@@ -43,7 +43,6 @@ class Delegate : public QItemDelegate
                 {
                     return QRect(drawPoint(aRect), drawPoint(aRect)+QPoint(mImage->size().width(),mImage->size().height()));
                 }
                 {
                     return QRect(drawPoint(aRect), drawPoint(aRect)+QPoint(mImage->size().width(),mImage->size().height()));
                 }

-                bool hasConflict;

             private:
                 ControlId mId;
                 QImage *mImage;
             private:
                 ControlId mId;
                 QImage *mImage;


@@ -71,7 +70,6 @@ class Delegate : public QItemDelegate
         // every time it requires them
         int numberOfFavourities(const QModelIndex &index) const;
         int numberOfAlarms(const QModelIndex &index) const;
         // every time it requires them
         int numberOfFavourities(const QModelIndex &index) const;
         int numberOfAlarms(const QModelIndex &index) const;

-        bool hasTimeConflict(const QModelIndex &index, const QModelIndex &parent) const;

 
     private:
         QPointer<QTreeView> mViewPtr;
 
     private:
         QPointer<QTreeView> mViewPtr;

diff --git a/src/mvc/event.cpp b/src/mvc/event.cpp
index 1af20d5b9a7053eb92b9f9757fe960e9fdcbb311..1dc3af73e3e39645b9d800e63a007d556710dc62 100644 (file)
--- a/src/mvc/event.cpp
+++ b/src/mvc/event.cpp
@@ -124,6 +124,97 @@ QStringList Event::persons() const
     return persons;
 }
 
     return persons;
 }
 

+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();
+        }
+    }
+}
+

 void Event::setRoom(const QString &room)
 {
     Q_UNUSED(room);
 void Event::setRoom(const QString &room)
 {
     Q_UNUSED(room);

diff --git a/src/mvc/event.h b/src/mvc/event.h
index 6c82a2bea3d58bd5214edddc42bd84847a85a304..a96ed19210608f7999d3568c512d9605cf12eea1 100644 (file)
--- a/src/mvc/event.h
+++ b/src/mvc/event.h
@@ -37,7 +37,7 @@ public:
     QString language() const { return value("language").toString(); }
     bool isFavourite() const { return value("favourite").toBool(); }
     bool hasAlarm() const { return value("alarm").toBool(); }
     QString language() const { return value("language").toString(); }
     bool isFavourite() const { return value("favourite").toBool(); }
     bool hasAlarm() const { return value("alarm").toBool(); }

-    bool hasTimeConflict() const { return true; /*return value("warning").toBool()*/; } //TODO
+    bool hasTimeConflict() const;

     QString tag() const { return value("tag").toString(); }
     QString title() const { return value("title").toString(); }
     QString subtitle() const { return value("subtitle").toString(); }
     QString tag() const { return value("tag").toString(); }
     QString title() const { return value("title").toString(); }
     QString subtitle() const { return value("subtitle").toString(); }


@@ -47,6 +47,7 @@ public:
     QString room() const;
     int roomId() const;
     QStringList persons() const;
     QString room() const;
     int roomId() const;
     QStringList persons() const;

+    QList<int> conflicts() const;

 
     void setId(int id) { setValue("id", id); }
     void setConferenceId(int conferenceId) { setValue("xid_conference", conferenceId); }
 
     void setId(int id) { setValue("id", id); }
     void setConferenceId(int conferenceId) { setValue("xid_conference", conferenceId); }


@@ -65,6 +66,7 @@ public:
     // records from other tables associated with 'id'
     void setRoom(const QString& room);
     void setPersons(const QStringList &persons);
     // records from other tables associated with 'id'
     void setRoom(const QString& room);
     void setPersons(const QStringList &persons);

+    void updateConflicts();

 
 friend class EventTest;
 };
 
 friend class EventTest;
 };

diff --git a/src/mvc/treeview.cpp b/src/mvc/treeview.cpp
index d18c8733bcbd927249bffa5bbbc7047f3f0a121a..e1dc9b7ba4447b05ed5b40b7bfc00854981376c4 100644 (file)
--- a/src/mvc/treeview.cpp
+++ b/src/mvc/treeview.cpp
@@ -53,6 +53,8 @@ bool TreeView::testForControlClicked(const QModelIndex &aIndex, const QPoint &aP
                     event.setFavourite(true);
                 event.update("favourite");
                 qDebug() << " FAVOURITE [" << qVariantValue<QString>(aIndex.data()) << "] -> " << event.isFavourite();
                     event.setFavourite(true);
                 event.update("favourite");
                 qDebug() << " FAVOURITE [" << qVariantValue<QString>(aIndex.data()) << "] -> " << 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()));
                 // since the Favourite icon has changed, update TreeViews accordingly
                 // all TreeViews have to listen on this signal
                 emit(eventHasChanged(event.id()));

diff --git a/src/sql/sqlengine.cpp b/src/sql/sqlengine.cpp
index faed16744752d5f846f8c91f3f432f9c86ba7a50..14c68fc8b82f5361c67e400996d8173619d0c754 100644 (file)
--- a/src/sql/sqlengine.cpp
+++ b/src/sql/sqlengine.cpp
@@ -291,6 +291,14 @@ bool SqlEngine::createTables(QSqlDatabase &aDatabase)
             "FOREIGN KEY(xid_event) REFERENCES EVENT(id), "
             "FOREIGN KEY(xid_room) REFERENCES ROOM(id));");
 
             "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, "
         query.exec("CREATE TABLE LINK ( "
             "id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "
             "xid_conference INTEGER NOT NULL, "


@@ -362,3 +370,4 @@ bool SqlEngine::execQuery(QSqlDatabase &aDatabase, const QString &aQuery)
        return true;
     }
 }
        return true;
     }
 }

+