Philipp's comments to r1444.

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

diff --git a/src/mvc/eventmodel.cpp b/src/mvc/eventmodel.cpp
index db0917841d8a7b71b21062027f3887ae1e5752d2..cfac1eece3ad501f919ddfa1284367eede07d0b8 100644 (file)
--- a/src/mvc/eventmodel.cpp
+++ b/src/mvc/eventmodel.cpp
@@ -1,74 +1,160 @@
+/*
+ * Copyright (C) 2010 Ixonos Plc.
+ * Copyright (C) 2011-2012 Philipp Spitzer, gregor herrmann
+ *
+ * This file is part of ConfClerk.
+ *
+ * ConfClerk is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation, either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * ConfClerk is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * ConfClerk.  If not, see <http://www.gnu.org/licenses/>.
+ */

 #include "eventmodel.h"
 #include "eventmodel.h"

-#include <appsettings.h>

 #include <conference.h>
 #include <track.h>
 #include <conference.h>
 #include <track.h>

+#include <room.h>

 
 const QString EventModel::COMMA_SEPARATOR = ", ";
 
 EventModel::EventModel()
 
 const QString EventModel::COMMA_SEPARATOR = ", ";
 
 EventModel::EventModel()

-{
-    mEvents.clear();
+{ }
+
+
+void EventModel::Group::setTitle(const QList<Event>& mEvents) {
+    QTime startTime = mEvents.at(mFirstEventIndex).start().time();
+    QTime endTime(0, 0);
+    for (int i = mFirstEventIndex; i != mFirstEventIndex + mChildCount; ++i) {
+        endTime = qMax(mEvents.at(i).start().time().addSecs(mEvents.at(i).duration()), endTime);
+    }
+    mTitle = QString("%1 - %2").arg(startTime.toString("HH:mm")).arg(endTime.toString("HH:mm"));

 }
 
 }
 

+
+// We want to group the events into "time slots/time groups" that
+// should start at full hours and have the duration of either
+// one hour or (if less than 3 events are in one time slot)
+// multiple of one hour.

 void EventModel::createTimeGroups()
 {
     mGroups.clear();
     mParents.clear();
 void EventModel::createTimeGroups()
 {
     mGroups.clear();
     mParents.clear();

+    if (mEvents.empty()) return;
+
+    const int minTimeSpan = 3600; // one hour // minimum duration of a group
+    const int minChildCount = 3;  // minimum number of events in one group
+
+    // Create the first time group. The events have to be sorted by start time at this point!
+    //    Remarks for the following non-comment line:
+    //    * As it is right now it could be written as
+    //      QDateTime groupStartDateTime = mEvents.first().start();
+    //    * Before r1444 the minutes were set to zero so that the time groups started at
+    //      whole hours.
+
+    // QDateTime groupStartDateTime(mEvents.first().start().date(), QTime(mEvents.first().start().time().hour(), 0));
+    QDateTime groupStartDateTime = mEvents.first().start();
+    QDateTime groupEndDateTime = groupStartDateTime.addSecs(mEvents.first().duration());
+    mGroups << EventModel::Group("", 0);
+    int timeSpan = minTimeSpan;
+
+    for (int i = 0; i != mEvents.count(); ++i) {
+        QDateTime eventStartDateTime = mEvents.at(i).start();
+        QDateTime eventEndDateTime = eventStartDateTime.addSecs(mEvents.at(i).duration());
+
+        if (eventStartDateTime >= groupStartDateTime.addSecs(timeSpan)) {
+            // a new group could be necessary
+            if (mGroups.last().mChildCount < minChildCount) {
+                // too few events in the group => no new group
+                // except a gap in time would occur that is longer than minTimeSpan
+                QDateTime prevEventStartDateTime = mEvents.at(i).start();
+                if (i > 0 && qMax(prevEventStartDateTime.addSecs(mEvents.at(i-1).duration()), groupEndDateTime).secsTo(eventStartDateTime) < minTimeSpan) {
+                    timeSpan += minTimeSpan;
+                    --i;
+                    continue; // repeat with the same event
+                }
+            }
+
+            // a new group is necessary
+            mGroups.last().setTitle(mEvents);
+            groupStartDateTime = groupStartDateTime.addSecs(timeSpan);
+            groupEndDateTime = groupStartDateTime.addSecs(mEvents.at(i).duration());
+            mGroups << EventModel::Group("", i);
+            timeSpan = minTimeSpan;
+        }
+
+        // insert event into current group
+        mParents[mEvents.at(i).id()] = mGroups.count() - 1;
+        mGroups.last().mChildCount += 1;
+        groupEndDateTime = qMax(eventEndDateTime, groupEndDateTime);
+    }

 
 

+    // the last group needs a title as well
+    mGroups.last().setTitle(mEvents);
+
+    reset();
+}
+
+void EventModel::createTrackGroups() {
+    mGroups.clear();
+    mParents.clear();

     if (mEvents.empty())
     {
         return;
     }
     if (mEvents.empty())
     {
         return;
     }

+    int trackId = mEvents.first().trackId();

 
 

-    const int timeSpan = 5400;
-
-    QTime startTime = mEvents.first().start().time();
-    mGroups << EventModel::Group(QString("%1 - %2").arg(startTime.toString("HH:mm"),
-        startTime.addSecs(timeSpan).toString("HH:mm")), 0);
-    QTime nextGroupTime = mEvents.first().start().time().addSecs(timeSpan);
+    mGroups << EventModel::Group(Track::retrieveTrackName(trackId), 0);
+    int nextTrackId = trackId;

 
     for (int i=0; i<mEvents.count(); i++)
     {
 
     for (int i=0; i<mEvents.count(); i++)
     {

-        QTime eventTime = mEvents.at(i).start().time();
-
-        if (nextGroupTime <= eventTime)
+        trackId = mEvents.at(i).trackId();
+        if (nextTrackId != trackId)

         {
             mGroups.last().mChildCount = i - mGroups.last().mFirstEventIndex;
         {
             mGroups.last().mChildCount = i - mGroups.last().mFirstEventIndex;

-            mGroups << EventModel::Group(QString("%1 - %2").arg(nextGroupTime.toString("HH:mm"),
-                nextGroupTime.addSecs(timeSpan).toString("HH:mm")), i);
-            nextGroupTime = nextGroupTime.addSecs(timeSpan);
+            mGroups << EventModel::Group(Track::retrieveTrackName(trackId), i);
+            nextTrackId = trackId;

         }
         }

-

         // add parent-child relation
         mParents[mEvents.at(i).id()] = mGroups.count() - 1;
     }
         // add parent-child relation
         mParents[mEvents.at(i).id()] = mGroups.count() - 1;
     }

-

     mGroups.last().mChildCount = mEvents.count() - mGroups.last().mFirstEventIndex;
 }
 
     mGroups.last().mChildCount = mEvents.count() - mGroups.last().mFirstEventIndex;
 }
 

-void EventModel::createTrackGroups() {
+void EventModel::createRoomGroups()
+{

     mGroups.clear();
     mParents.clear();
     if (mEvents.empty())
     {
         return;
     }
     mGroups.clear();
     mParents.clear();
     if (mEvents.empty())
     {
         return;
     }

-    int trackId = mEvents.first().trackId();
+    int roomId = mEvents.first().roomId();

 
 

-    mGroups << EventModel::Group(Track::getTrackName(trackId), 0);
-    int nextTrackId = trackId;
+    mGroups << EventModel::Group(Room::retrieveRoomName(roomId), 0);
+    int nextRoomId = roomId;

 
 

-    for (int i=0; i<mEvents.count(); i++)
+    QList<Event>::iterator event = mEvents.begin();
+    int i = 0;
+    while (event != mEvents.end())

     {
     {

-        trackId = mEvents.at(i).trackId();
-        if (nextTrackId != trackId)
+        roomId = event->roomId();
+        if (nextRoomId != roomId)

         {
             mGroups.last().mChildCount = i - mGroups.last().mFirstEventIndex;
         {
             mGroups.last().mChildCount = i - mGroups.last().mFirstEventIndex;

-            mGroups << EventModel::Group(Track::getTrackName(trackId), i);
-            nextTrackId = trackId;
+            mGroups << EventModel::Group(Room::retrieveRoomName(roomId), i);
+            nextRoomId = roomId;

         }
         }

-        // add parent-child relation
-        mParents[mEvents.at(i).id()] = mGroups.count() - 1;
+        mParents[event->id()] = mGroups.count() - 1;
+        event++;
+        i++;

     }
     mGroups.last().mChildCount = mEvents.count() - mGroups.last().mFirstEventIndex;
 }
     }
     mGroups.last().mChildCount = mEvents.count() - mGroups.last().mFirstEventIndex;
 }


@@ -150,15 +236,11 @@ int EventModel::rowCount (const QModelIndex & parent) const
 
 void EventModel::clearModel()
 {
 
 void EventModel::clearModel()
 {

-    for(int i = 0;i < mGroups.count();i++){
-        QModelIndex idx = index(i, 0);
-        Group group = mGroups[i];
-        beginRemoveRows(idx, 0, group.mChildCount - 1);
-        /*bool ok =*/ removeRows(0, group.mChildCount, idx);
-        endRemoveRows();
-        //qDebug() << "removing " << group.mChildCount << " events from group:" << i << idx.data() << ":" << ok;
-    }
+    mGroups.clear();

     mEvents.clear();
     mEvents.clear();

+    mParents.clear();
+
+    reset();

 }
 
 void EventModel::loadEvents(const QDate &aDate, int aConferenceId)
 }
 
 void EventModel::loadEvents(const QDate &aDate, int aConferenceId)


@@ -167,8 +249,7 @@ void EventModel::loadEvents(const QDate &aDate, int aConferenceId)
     // check for existence of the conference in the DB
     if(Conference::getAll().count())
     {
     // check for existence of the conference in the DB
     if(Conference::getAll().count())
     {

-        qDebug() << "Loading Conference Data: [" << Conference::getById(aConferenceId).title() << "] " << aDate;
-        mEvents = Event::getByDate(QDate(aDate.year(), aDate.month(), aDate.day()), aConferenceId, "start");
+        mEvents = Event::getByDate(QDate(aDate.year(), aDate.month(), aDate.day()), aConferenceId, "start, duration");

     }
     createTimeGroups();
 }
     }
     createTimeGroups();
 }


@@ -179,7 +260,6 @@ void EventModel::loadFavEvents(const QDate &aDate, int aConferenceId)
     // check for existence of the conference in the DB
     if(Conference::getAll().count())
     {
     // check for existence of the conference in the DB
     if(Conference::getAll().count())
     {

-        qDebug() << "Loading FAV Conference Data: [" << Conference::getById(aConferenceId).title() << "] " << aDate;

         mEvents = Event::getFavByDate(QDate(aDate.year(), aDate.month(), aDate.day()), aConferenceId);
     }
     createTimeGroups();
         mEvents = Event::getFavByDate(QDate(aDate.year(), aDate.month(), aDate.day()), aConferenceId);
     }
     createTimeGroups();


@@ -191,9 +271,8 @@ int EventModel::loadSearchResultEvents(const QDate &aDate, int aConferenceId)
     // check for existence of the conference in the DB
     if(Conference::getAll().count())
     {
     // check for existence of the conference in the DB
     if(Conference::getAll().count())
     {

-        qDebug() << "Loading search result Data: [" << Conference::getById(aConferenceId).title() << "] " << aDate;

         try{
         try{

-            mEvents = Event::getSearchResultByDate(QDate(aDate.year(), aDate.month(), aDate.day()), aConferenceId, "start");
+            mEvents = Event::getSearchResultByDate(QDate(aDate.year(), aDate.month(), aDate.day()), aConferenceId, "start, duration");

         }
         catch( OrmException &e  ){
             qDebug() << "Event::getSearchResultByDate failed: " << e.text();
         }
         catch( OrmException &e  ){
             qDebug() << "Event::getSearchResultByDate failed: " << e.text();


@@ -212,22 +291,30 @@ int EventModel::loadSearchResultEvents(const QDate &aDate, int aConferenceId)
 void EventModel::loadEventsByTrack(const QDate &aDate, int aConferenceId)
 {
     clearModel();
 void EventModel::loadEventsByTrack(const QDate &aDate, int aConferenceId)
 {
     clearModel();

-    if(Conference::getAll().count())
+    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");
+        mEvents = Event::getByDate(QDate(aDate.year(), aDate.month(), aDate.day()), aConferenceId, "xid_track, start, duration");

     }
     createTrackGroups();
 }
 
     }
     createTrackGroups();
 }
 

-void EventModel::loadNowEvents(int aConferenceId)
+void EventModel::loadEventsByRoom(const QDate &aDate, int aConferenceId)

 {
 {

+    clearModel();
+    if (Conference::getAll().count())
+    {
+        mEvents = Event::getByDateAndRoom(QDate(aDate.year(), aDate.month(), aDate.day()), aConferenceId);
+    }
+    createRoomGroups();
+}
+
+
+void EventModel::loadConflictEvents(int aEventId, int aConferenceId) {

     clearModel();
     // check for existence of the conference in the DB
     if(Conference::getAll().count())
     {
     clearModel();
     // check for existence of the conference in the DB
     if(Conference::getAll().count())
     {

-        qDebug() << "Loading Conference Data: [" << Conference::getById(aConferenceId).title() << "] scheduled NOW";
-        mEvents = Event::nowEvents(aConferenceId, "start");
+        mEvents = Event::conflictEvents(aEventId, aConferenceId);

     }
     createTimeGroups();
 }
     }
     createTimeGroups();
 }


@@ -237,7 +324,7 @@ void EventModel::updateModel(int aEventId)
     for(int i=0; i<mEvents.count(); i++)
     {
         if(mEvents[i].id() == aEventId)
     for(int i=0; i<mEvents.count(); i++)
     {
         if(mEvents[i].id() == aEventId)

-            mEvents[i] = Event::getById(aEventId,AppSettings::confId());
+            mEvents[i] = Event::getById(aEventId,Conference::activeConference());

     }
 
     // find the ModelIndex for given aEventId
     }
 
     // find the ModelIndex for given aEventId


@@ -249,6 +336,7 @@ void EventModel::updateModel(int aEventId)
             QModelIndex eventIndex = index(j,0,groupIndex);
             if(static_cast<Event*>(eventIndex.internalPointer())->id() == aEventId)
             {
             QModelIndex eventIndex = index(j,0,groupIndex);
             if(static_cast<Event*>(eventIndex.internalPointer())->id() == aEventId)
             {

+                emit(dataChanged(groupIndex,groupIndex));

                 emit(dataChanged(eventIndex,eventIndex));
             }
         }
                 emit(dataChanged(eventIndex,eventIndex));
             }
         }