Changeset 4693fa6 for src/mvc/eventmodel.cpp

Timestamp:

01/20/10 22:02:30 (13 years ago)

Author:

pavelpa <pavelpa@…>

Branches:

master, qt5

Children:

8fe9bd2

Parents:

926f106

Message:

changed 'Activity' -> 'Track'

File:

• src/mvc/eventmodel.cpp (modified) (5 diffs)

src/mvc/eventmodel.cpp

@@ -1 +1 @@
 #include "eventmodel.h"
 #include <conference.h>
-#include <activity.h>
-
-const QString EventModel::COMMA_SEPARATOR = ", ";
+#include <track.h>
 
 EventModel::EventModel()
@@ -46 +44 @@
 }
 
-void EventModel::createActivityGroups() {
+void EventModel::createTrackGroups() {
     mGroups.clear();
     mParents.clear();
@@ -53 +51 @@
         return;
     }
-    int activityId = mEvents.first().activityId();
-
-    mGroups << EventModel::Group(Activity::getActivityName(activityId), 0);
-    int nextActivityId = activityId;
+    int trackId = mEvents.first().trackId();
+
+    mGroups << EventModel::Group(Track::getTrackName(trackId), 0);
+    int nextTrackId = trackId;
 
     for (int i=0; i<mEvents.count(); i++)
     {
-        activityId = mEvents.at(i).activityId();
-        if (nextActivityId != activityId)
+        trackId = mEvents.at(i).trackId();
+        if (nextTrackId != trackId)
         {
             mGroups.last().mChildCount = i - mGroups.last().mFirstEventIndex;
-            mGroups << EventModel::Group(Activity::getActivityName(activityId), i);
-            nextActivityId = activityId;
+            mGroups << EventModel::Group(Track::getTrackName(trackId), i);
+            nextTrackId = trackId;
         }
         // add parent-child relation
@@ -168 +166 @@
     {
         qDebug() << "Loading Conference Data: [" << Conference::getById(aConferenceId).title() << "] " << aDate;
-        mEvents = Event::getByDate(QDate(aDate.year(), aDate.month(), aDate.day()), aConferenceId, Event::START);
+        mEvents = Event::getByDate(QDate(aDate.year(), aDate.month(), aDate.day()), aConferenceId, "start");
     }
     createTimeGroups();
@@ -185 +183 @@
 }
 
-void EventModel::loadEventsByActivities(const QDate &aDate, int aConferenceId)
+void EventModel::loadEventsByTrack(const QDate &aDate, int aConferenceId)
 {
     clearModel();
     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 + COMMA_SEPARATOR + Event::START);
-    }
-    createActivityGroups();
+        qDebug() << "Loading Conference Data (by Track): [" << Conference::getById(aConferenceId).title() << "] " << aDate;
+        mEvents = Event::getByDate(QDate(aDate.year(), aDate.month(), aDate.day()), aConferenceId, "xid_track, start");
+    }
+    createTrackGroups();
 }