update for the search

[toast/confclerk.git] / src / mvc / eventmodel.cpp

diff --git a/src/mvc/eventmodel.cpp b/src/mvc/eventmodel.cpp
index 1c0d295e877bdb6316a2db65a58746043f4c58e7..629581563b6e8495047f7aab53b3d1087022d895 100644 (file)
--- a/src/mvc/eventmodel.cpp
+++ b/src/mvc/eventmodel.cpp
@@ -1,5 +1,8 @@
 #include "eventmodel.h"
 #include <conference.h>
+#include <track.h>
+
+const QString EventModel::COMMA_SEPARATOR = ", ";
 
 EventModel::EventModel()
 {
@@ -27,7 +30,7 @@ void EventModel::createTimeGroups()
     {
         QTime eventTime = mEvents.at(i).start().time();
 
-        if (nextGroupTime < eventTime)
+        if (nextGroupTime <= eventTime)
         {
             mGroups.last().mChildCount = i - mGroups.last().mFirstEventIndex;
             mGroups << EventModel::Group(QString("%1 - %2").arg(nextGroupTime.toString("HH:mm"),
@@ -42,26 +45,26 @@ void EventModel::createTimeGroups()
     mGroups.last().mChildCount = mEvents.count() - mGroups.last().mFirstEventIndex;
 }
 
-void EventModel::createActivityGroups() {
+void EventModel::createTrackGroups() {
     mGroups.clear();
     mParents.clear();
     if (mEvents.empty())
     {
         return;
     }
-    int activityId = mEvents.first().activityId();
-    //TODO korinpa: get activity name
-    mGroups << EventModel::Group(QString("activity %1").arg(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(QString("activity %1").arg(activityId), 0);
-            int nextActivityId = activityId;
+            mGroups << EventModel::Group(Track::getTrackName(trackId), i);
+            nextTrackId = trackId;
         }
         // add parent-child relation
         mParents[mEvents.at(i).id()] = mGroups.count() - 1;
@@ -150,7 +153,7 @@ void EventModel::clearModel()
         QModelIndex idx = index(i, 0);
         Group group = mGroups[i];
         beginRemoveRows(idx, 0, group.mChildCount - 1);
-        bool ok = removeRows(0, group.mChildCount, idx);
+        /*bool ok =*/ removeRows(0, group.mChildCount, idx);
         endRemoveRows();
         //qDebug() << "removing " << group.mChildCount << " events from group:" << i << idx.data() << ":" << ok;
     }
@@ -164,7 +167,7 @@ void EventModel::loadEvents(const QDate &aDate, int aConferenceId)
     if(Conference::getAll().count())
     {
         qDebug() << "Loading Conference Data: [" << Conference::getById(aConferenceId).title() << "] " << aDate;
-        mEvents = Event::getByDate(QDate(aDate.year(), aDate.month(), aDate.day()), aConferenceId);
+        mEvents = Event::getByDate(QDate(aDate.year(), aDate.month(), aDate.day()), aConferenceId, "start");
     }
     createTimeGroups();
 }
@@ -181,15 +184,39 @@ void EventModel::loadFavEvents(const QDate &aDate, int aConferenceId)
     createTimeGroups();
 }
 
-void EventModel::loadEventsByActivities(const QDate &aDate, int aConferenceId)
+int EventModel::loadSearchResultEvents(const QDate &aDate, int aConferenceId)
 {
     clearModel();
+    // check for existence of the conference in the DB
     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);
+    {
+        qDebug() << "Loading search result Data: [" << Conference::getById(aConferenceId).title() << "] " << aDate;
+        try{
+            mEvents = Event::getSearchResultByDate(QDate(aDate.year(), aDate.month(), aDate.day()), aConferenceId, "start");
         }
-    createActivityGroups();
+        catch( OrmException &e  ){
+            qDebug() << "Event::getSearchResultByDate failed: " << e.text();
+        }
+        catch(...){
+            qDebug() << "Event::getSearchResultByDate failed";
+        }
+
+    }
+
+    createTimeGroups();
+
+    return mEvents.count();
+}
+
+void EventModel::loadEventsByTrack(const QDate &aDate, int aConferenceId)
+{
+    clearModel();
+    if(Conference::getAll().count())
+    {
+        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();
 }
 
 void EventModel::emitDataChangedSignal(const QModelIndex &aTopLeft, const QModelIndex &aBottomRight)