activities viewed ordered by activity id and start time

diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
index 4abb6724baaae3cf0dfaf987d1ea0ddd4506aa8c..241cf9f3e99b411b94a686bde00f97b885e57f7b 100644 (file)
--- a/src/gui/mainwindow.cpp
+++ b/src/gui/mainwindow.cpp
@@ -39,7 +39,7 @@ MainWindow::MainWindow(QWidget *parent)
     connect(mXmlParser, SIGNAL(progressStatus(int)), this, SLOT(showParsingProgress(int)));
     statusBar()->showMessage(tr("Ready"));
 
-    //create activity map
+    //update activity map
     Activity::updateActivityMap();
 
     connect(dayNavigator, SIGNAL(dateChanged(const QDate &)), SLOT(updateDayView(const QDate &)));

diff --git a/src/mvc/eventmodel.cpp b/src/mvc/eventmodel.cpp
index cefea46a8e74697be7334556b00690c368060953..498677c5109b89b81948167ffe404b16ed1fd835 100644 (file)
--- a/src/mvc/eventmodel.cpp
+++ b/src/mvc/eventmodel.cpp
@@ -2,6 +2,8 @@
 #include <conference.h>
 #include <activity.h>
 
+const QString EventModel::COMMA_SEPARATOR = ", ";
+
 EventModel::EventModel()
 {
     mEvents.clear();
@@ -188,7 +190,7 @@ void EventModel::loadEventsByActivities(const QDate &aDate, int aConferenceId)
     if(Conference::getAll().count())
     {
         qDebug() << "Loading Conference Data (by Activities): [" << Conference::getById(aConferenceId).title() << "] " << aDate;
-        mEvents = Event::getByDate(QDate(aDate.year(), aDate.month(), aDate.day()), aConferenceId, Event::XID_ACTIVITY);
+        mEvents = Event::getByDate(QDate(aDate.year(), aDate.month(), aDate.day()), aConferenceId, Event::XID_ACTIVITY + COMMA_SEPARATOR + Event::START);
     }
     createActivityGroups();
 }

diff --git a/src/mvc/eventmodel.h b/src/mvc/eventmodel.h
index 962d13049da47b3adaeee408dbe3e12f3040968d..55c38407ae5584f4507f7d709501bd3f43537ecd 100644 (file)
--- a/src/mvc/eventmodel.h
+++ b/src/mvc/eventmodel.h
@@ -7,6 +7,8 @@
 
 class EventModel : public QAbstractItemModel
 {
+public:
+    static const QString COMMA_SEPARATOR;
 public:
     EventModel();
     QVariant data(const QModelIndex& index, int role) const;