'conflict' dialog now contains list of events in conflict with given eventId

diff --git a/src/gui/conflictdialogcontainer.cpp b/src/gui/conflictdialogcontainer.cpp
index b09eda7f053df8f191f3afdde042fd27d4fe791e..b83bb8f73626de66a4b97ac05a4eb487df50b2c1 100644 (file)
--- a/src/gui/conflictdialogcontainer.cpp
+++ b/src/gui/conflictdialogcontainer.cpp
@@ -8,19 +8,7 @@ ConflictDialogContainer::ConflictDialogContainer(QWidget *aParent)
 
 void ConflictDialogContainer::loadEvents( const QDate &aDate, const int aConferenceId )
 {
-    static_cast<EventModel*>(treeView->model())->loadEventsByRoom( aDate, aConferenceId );
-    //treeView->setAllExpanded(true);
-}
-
-void ConflictDialogContainer::updateTreeViewModel(int aEventId)
-{
-    // requires special handling
-    // we need to reload favourites, because some favourite could be deleted
-    //static_cast<EventModel*>(favTreeView->model())->updateModel(aEventId);
-    int confId = Conference::activeConference();
-    QDate startDate = Conference::getById(confId).start();
-    QDate endDate = Conference::getById(confId).end();
-    dayNavigator->setDates(startDate, endDate);
-    updateTreeView( Conference::getById(confId).start() );
+    static_cast<EventModel*>(treeView->model())->loadConflictEvents( mEventId, aConferenceId );
+    dayNavigator->hide();
 }
 

diff --git a/src/gui/conflictdialogcontainer.h b/src/gui/conflictdialogcontainer.h
index 2f5c5384d1ef0b5a8106b8f090987706c5735c0e..44b34b2974dc22712aea13ca17f165da23839e19 100644 (file)
--- a/src/gui/conflictdialogcontainer.h
+++ b/src/gui/conflictdialogcontainer.h
@@ -11,11 +11,13 @@ public:
     ConflictDialogContainer(QWidget *aParent);
     virtual ~ConflictDialogContainer(){}
 
-public slots:
-    virtual void updateTreeViewModel(int aEventId);
+    void setEventId(int aEventId) { mEventId = aEventId; }
 
 protected:
     virtual void loadEvents( const QDate &aDate, const int aConferenceId );
+
+private:
+    int mEventId;
 };
 
 #endif /* CONFLICTDIALOGCONTAINER_H */

diff --git a/src/gui/conflictsdialog.cpp b/src/gui/conflictsdialog.cpp
index 070dc9df8a7b566fadc1d887add98459b237a074..674375e5e5f89b294f95fcea7a1361b16a968ab6 100644 (file)
--- a/src/gui/conflictsdialog.cpp
+++ b/src/gui/conflictsdialog.cpp
@@ -1,12 +1,14 @@
 #include "conflictsdialog.h"
 
-ConflictsDialog::ConflictsDialog(QWidget *aParent)
+ConflictsDialog::ConflictsDialog(int aEventId, QWidget *aParent)
     : QDialog(aParent)
 {
     setupUi(this);
     connect(container, SIGNAL(eventHasChanged(int)), this, SIGNAL(eventHasChanged(int)));
     connect(container, SIGNAL(eventHasChanged(int)), container, SLOT(updateTreeViewModel(int)));
 
+    container->setEventId(aEventId);
+
     int confId = Conference::activeConference();
     QDate startDate = Conference::getById(confId).start();
     QDate endDate = Conference::getById(confId).end();

diff --git a/src/gui/conflictsdialog.h b/src/gui/conflictsdialog.h
index 40114ab91c72e2970a30f86c01d1424116f4498a..cd28c7c70e12da60901ba69a5ee21d99529f6686 100644 (file)
--- a/src/gui/conflictsdialog.h
+++ b/src/gui/conflictsdialog.h
@@ -8,7 +8,7 @@ class ConflictsDialog : public QDialog, Ui::ConflictsDialog
 {
     Q_OBJECT
 public:
-    ConflictsDialog(QWidget *aParent = NULL);
+    ConflictsDialog(int aEventId, QWidget *aParent = NULL);
     ~ConflictsDialog();
 signals:
     void eventHasChanged(int aEventId);

diff --git a/src/gui/favtabcontainer.cpp b/src/gui/favtabcontainer.cpp
index 341dd9f784e481c43216bed9509260c1b195606e..80bd6bb924063f5771efb80eea64dc40baada5db 100644 (file)
--- a/src/gui/favtabcontainer.cpp
+++ b/src/gui/favtabcontainer.cpp
@@ -12,6 +12,8 @@ void FavTabContainer::loadEvents( const QDate &aDate, const int aConferenceId )
 
 void FavTabContainer::updateTreeViewModel(int aEventId)
 {
+    Q_UNUSED(aEventId);
+
     // requires special handling
     // we need to reload favourites, because some favourite could be deleted
     //static_cast<EventModel*>(favTreeView->model())->updateModel(aEventId);

diff --git a/src/gui/tabcontainer.cpp b/src/gui/tabcontainer.cpp
index a7338240eec878ce09ba7523b7e687e258ae33ee..8f30a96519b8bf65588d7aedde6ed0dabc2c5d73 100644 (file)
--- a/src/gui/tabcontainer.cpp
+++ b/src/gui/tabcontainer.cpp
@@ -33,7 +33,7 @@ TabContainer::TabContainer(QWidget *aParent)
 
     if(!Conference::getAll().count()) // no conference(s) in the DB
     {
-        dayNavigator->hide(); // hide DayNavigatorWidget
+        dayNavigator->hide();
     }
     else
     {
@@ -85,9 +85,7 @@ void TabContainer::displayMap(const QModelIndex &aIndex)
 
 void TabContainer::displayConflicts(const QModelIndex &aIndex)
 {
-    Q_UNUSED(aIndex);
-
-    ConflictsDialog dialog;
+    ConflictsDialog dialog(static_cast<Event*>(aIndex.internalPointer())->id(),this);
     connect(&dialog, SIGNAL(eventHasChanged(int)), this, SIGNAL(eventHasChanged(int)));
     dialog.exec();
     disconnect(&dialog, SIGNAL(eventHasChanged(int)), this, SIGNAL(eventHasChanged(int)));

diff --git a/src/mvc/event.cpp b/src/mvc/event.cpp
index d587a3679cb02991e5610cd116a63f9521d278d3..ba7bbc4bd75f2233574611a0e8fc3cea0395dd72 100644 (file)
--- a/src/mvc/event.cpp
+++ b/src/mvc/event.cpp
@@ -68,6 +68,16 @@ QList<Event> Event::nowEvents(int conferenceId, QString orderBy)
     return load(query);
 }
 
+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);
+
+    return load(query);
+}
+
 QList<Event> Event::getFavByDate(const QDate& date, int conferenceId)
 {
     QSqlQuery query;

diff --git a/src/mvc/event.h b/src/mvc/event.h
index 822694d3c45020a5c5408f36736cde290688e49a..8d55cef91cd0949f2e86789ba3d62a867b9af132 100644 (file)
--- a/src/mvc/event.h
+++ b/src/mvc/event.h
@@ -27,6 +27,7 @@ public:
     static QList<Event> nowEvents(int conferenceId, QString orderBy); // get events scheduled NOW
     static QList<Event> getByTrack(int id);
     static QList<Event> getByDateAndRoom(const QDate& date, int conferenceId);
+    static QList<Event> conflictEvents(int aEventId, int conferenceId);
 public:
     int id() const { return value("id").toInt(); }
     int conferenceId() const { return value("xid_conference").toInt(); }

diff --git a/src/mvc/eventmodel.cpp b/src/mvc/eventmodel.cpp
index c64c75800a7f1c625fdcbca7301bad3dfd61f507..23568a14e4f27fff43f7f29ebaffe2f71518177d 100644 (file)
--- a/src/mvc/eventmodel.cpp
+++ b/src/mvc/eventmodel.cpp
@@ -274,6 +274,18 @@ void EventModel::loadNowEvents(int aConferenceId)
     createTimeGroups();
 }
 
+void EventModel::loadConflictEvents(int aEventId, int aConferenceId)
+{
+    clearModel();
+    // check for existence of the conference in the DB
+    if(Conference::getAll().count())
+    {
+        qDebug() << "Loading Conference Data: [" << Conference::getById(aConferenceId).title() << "] in conflict with " << aEventId;
+        mEvents = Event::conflictEvents(aEventId, aConferenceId);
+    }
+    createTimeGroups();
+}
+
 void EventModel::updateModel(int aEventId)
 {
     for(int i=0; i<mEvents.count(); i++)

diff --git a/src/mvc/eventmodel.h b/src/mvc/eventmodel.h
index 67d1820e0e3124fc7c9cae4540bdd29c6bf0f640..26d1bdfa1d6a6ee0318d8430603efffc6548ddf1 100644 (file)
--- a/src/mvc/eventmodel.h
+++ b/src/mvc/eventmodel.h
@@ -22,6 +22,7 @@ public:
     int loadSearchResultEvents(const QDate &aDate, int aConferenceId);
     void loadNowEvents(int aConferenceId); // loads Now events from the DB
     void loadEventsByRoom(const QDate &aDate, int aConferenceId);
+    void loadConflictEvents(int aEventId, int aConferenceId); // loads events in conflict
 
 private:
     struct Group