Changeset d1fb9ee

Timestamp:

01/20/10 14:18:49 (12 years ago)

Author:

korrco <korrco@…>

Branches:

master, qt5

Children:

b1a201a

Parents:

a3f6b00

Message:

activities viewed ordered by activity id and start time

Location:

src

Files:

• gui/mainwindow.cpp (modified) (1 diff)
• mvc/eventmodel.cpp (modified) (2 diffs)
• mvc/eventmodel.h (modified) (1 diff)

src/gui/mainwindow.cpp

@@ -40 +40 @@
     statusBar()->showMessage(tr("Ready"));
 
-    //create activity map
+    //update activity map
     Activity::updateActivityMap();
 

src/mvc/eventmodel.cpp

@@ -2 +2 @@
 #include <conference.h>
 #include <activity.h>
+
+const QString EventModel::COMMA_SEPARATOR = ", ";
 
 EventModel::EventModel()
@@ -189 +191 @@
     {
         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();

src/mvc/eventmodel.h

@@ -8 +8 @@
 class EventModel : public QAbstractItemModel
 {
+public:
+    static const QString COMMA_SEPARATOR;
 public:
     EventModel();