Changeset d49254d in confclerk_git

Timestamp:

01/27/10 22:08:37 (13 years ago)

Author:

pavelpa <pavelpa@…>

Branches:

master, qt5

Children:

0401cc2

Parents:

21d7cc0

Message:

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

Location:

src

Files:

• gui/conflictdialogcontainer.cpp (modified) (1 diff)
• gui/conflictdialogcontainer.h (modified) (1 diff)
• gui/conflictsdialog.cpp (modified) (2 diffs)
• gui/conflictsdialog.h (modified) (1 diff)
• gui/favtabcontainer.cpp (modified) (1 diff)
• gui/tabcontainer.cpp (modified) (2 diffs)
• mvc/event.cpp (modified) (1 diff)
• mvc/event.h (modified) (1 diff)
• mvc/eventmodel.cpp (modified) (1 diff)
• mvc/eventmodel.h (modified) (1 diff)

src/gui/conflictdialogcontainer.cpp

@@ -9 +9 @@
 void ConflictDialogContainer::loadEvents( const QDate &aDate, const int aConferenceId )
 {
-    static_cast<EventModel*>(treeView->model())->loadEventsByRoom( aDate, aConferenceId );
-    //treeView->setAllExpanded(true);
+    static_cast<EventModel*>(treeView->model())->loadConflictEvents( mEventId, aConferenceId );
+    dayNavigator->hide();
 }
 
-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() );
-}
-

src/gui/conflictdialogcontainer.h

@@ -12 +12 @@
     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;
 };
 

src/gui/conflictsdialog.cpp

@@ -1 +1 @@
 #include "conflictsdialog.h"
 
-ConflictsDialog::ConflictsDialog(QWidget *aParent)
+ConflictsDialog::ConflictsDialog(int aEventId, QWidget *aParent)
     : QDialog(aParent)
 {
@@ -7 +7 @@
     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();

src/gui/conflictsdialog.h

@@ -9 +9 @@
     Q_OBJECT
 public:
-    ConflictsDialog(QWidget *aParent = NULL);
+    ConflictsDialog(int aEventId, QWidget *aParent = NULL);
     ~ConflictsDialog();
 signals:

src/gui/favtabcontainer.cpp

@@ -13 +13 @@
 void FavTabContainer::updateTreeViewModel(int aEventId)
 {
+    Q_UNUSED(aEventId);
+
     // requires special handling
     // we need to reload favourites, because some favourite could be deleted

src/gui/tabcontainer.cpp

@@ -34 +34 @@
     if(!Conference::getAll().count()) // no conference(s) in the DB
     {
-        dayNavigator->hide(); // hide DayNavigatorWidget
+        dayNavigator->hide();
     }
     else
@@ -86 +86 @@
 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();

src/mvc/event.cpp

@@ -69 +69 @@
 }
 
+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)
 {

src/mvc/event.h

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

src/mvc/eventmodel.cpp

@@ -275 +275 @@
 }
 
+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)
 {

src/mvc/eventmodel.h

@@ -23 +23 @@
     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: