caching removed

diff --git a/src/mvc/delegate.cpp b/src/mvc/delegate.cpp
index 4edde0e029b8b6aac5e6c30d646ae39fade7e14c..406e490c995950e01ce777dbff2dea47570c8880 100644 (file)
--- a/src/mvc/delegate.cpp
+++ b/src/mvc/delegate.cpp
@@ -178,7 +178,7 @@ void Delegate::paint(QPainter *painter, const QStyleOptionViewItem &option, cons
         painter->drawText(titlePointF,"Presenter(s): " + event->persons().join(" and "));
         // track
         titlePointF.setY(titlePointF.y()+fmSmall.height()-fmSmall.descent());
         painter->drawText(titlePointF,"Presenter(s): " + event->persons().join(" and "));
         // track
         titlePointF.setY(titlePointF.y()+fmSmall.height()-fmSmall.descent());

-        painter->drawText(titlePointF,"Track: " + Track::getTrackName(event->trackId()));
+        painter->drawText(titlePointF,"Track: " + Track::retrieveTrackName(event->trackId()));

     }
     else // doesn't have parent - time-groups' elements (top items)
     {
     }
     else // doesn't have parent - time-groups' elements (top items)
     {

diff --git a/src/mvc/event.cpp b/src/mvc/event.cpp
index 821ccaf8b081f740fb8e9aab75b68577eccb331e..9a605767acbcc0d6f82c6f77e22df5f682cd34b9 100644 (file)
--- a/src/mvc/event.cpp
+++ b/src/mvc/event.cpp
@@ -64,6 +64,15 @@ QList<Event> Event::getFavByDate(const QDate& date, int conferenceId)
     return load(query);
 }
 
     return load(query);
 }
 

+QList<Event> Event::getByTrack(int trackId)
+{
+    QSqlQuery query;
+    query.prepare(selectQuery() + QString("WHERE xid_track = :trackId ORDER BY start"));
+    query.bindValue(":trackId", trackId);
+
+    return load(query);
+}
+

 QString Event::room() const
 {
     QSqlQuery query;
 QString Event::room() const
 {
     QSqlQuery query;

diff --git a/src/mvc/event.h b/src/mvc/event.h
index 9e3b7e8af43e1269adc2186f0d479772c0b9dd3f..8eaedc170286c626f1b0e7bc04c311da6e1f1459 100644 (file)
--- a/src/mvc/event.h
+++ b/src/mvc/event.h
@@ -25,6 +25,7 @@ public:
     static QList<Event> getFavByDate(const QDate & date, int conferenceId); // get Favourities by Date
     static QList<Event> getSearchResultByDate(const QDate& date, int conferenceId, QString orderBy);
     static QList<Event> nowEvents(int conferenceId, QString orderBy); // get events scheduled NOW
     static QList<Event> getFavByDate(const QDate & date, int conferenceId); // get Favourities by Date
     static QList<Event> getSearchResultByDate(const QDate& date, int conferenceId, QString orderBy);
     static QList<Event> nowEvents(int conferenceId, QString orderBy); // get events scheduled NOW

+    static QList<Event> getByTrack(int id);

 public:
     int id() const { return value("id").toInt(); }
     int conferenceId() const { return value("xid_conference").toInt(); }
 public:
     int id() const { return value("id").toInt(); }
     int conferenceId() const { return value("xid_conference").toInt(); }

diff --git a/src/mvc/eventmodel.cpp b/src/mvc/eventmodel.cpp
index db0917841d8a7b71b21062027f3887ae1e5752d2..cdcacacbb5415af71458f4217ca805d434c408b7 100644 (file)
--- a/src/mvc/eventmodel.cpp
+++ b/src/mvc/eventmodel.cpp
@@ -55,7 +55,7 @@ void EventModel::createTrackGroups() {
     }
     int trackId = mEvents.first().trackId();
 
     }
     int trackId = mEvents.first().trackId();
 

-    mGroups << EventModel::Group(Track::getTrackName(trackId), 0);
+    mGroups << EventModel::Group(Track::retrieveTrackName(trackId), 0);

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


@@ -64,7 +64,7 @@ void EventModel::createTrackGroups() {
         if (nextTrackId != trackId)
         {
             mGroups.last().mChildCount = i - mGroups.last().mFirstEventIndex;
         if (nextTrackId != trackId)
         {
             mGroups.last().mChildCount = i - mGroups.last().mFirstEventIndex;

-            mGroups << EventModel::Group(Track::getTrackName(trackId), i);
+            mGroups << EventModel::Group(Track::retrieveTrackName(trackId), i);

             nextTrackId = trackId;
         }
         // add parent-child relation
             nextTrackId = trackId;
         }
         // add parent-child relation


@@ -73,6 +73,28 @@ void EventModel::createTrackGroups() {
     mGroups.last().mChildCount = mEvents.count() - mGroups.last().mFirstEventIndex;
 }
 
     mGroups.last().mChildCount = mEvents.count() - mGroups.last().mFirstEventIndex;
 }
 

+void EventModel::createTrackGroupsNew() {
+    mGroups.clear();
+    mParents.clear();
+    if (mEvents.empty())
+    {
+        return;
+    }
+    QList<Track> trackList = Track::getAll();
+    QList<Track>::iterator track = trackList.begin();
+    while (track != trackList.end())
+    {
+        QList<Event> eventList = Event::getByTrack(track->id());
+        QList<Event>::iterator event = eventList.begin();
+        while (event != eventList.end())
+        {
+            //TODO korinpa: pokracuj
+            event++;
+        }
+        track++;
+    }
+}
+

 QVariant EventModel::data(const QModelIndex& index, int role) const
 {
     if (index.isValid() && role == Qt::DisplayRole)
 QVariant EventModel::data(const QModelIndex& index, int role) const
 {
     if (index.isValid() && role == Qt::DisplayRole)

diff --git a/src/mvc/eventmodel.h b/src/mvc/eventmodel.h
index 9764ee05bad4409c428b8477b0ef97ad9ab86fe1..44ad43c5c1b1af5bda81dc34c1034a986bf40327 100644 (file)
--- a/src/mvc/eventmodel.h
+++ b/src/mvc/eventmodel.h
@@ -41,6 +41,7 @@ private:
 private:
     void createTimeGroups();
     void createTrackGroups();
 private:
     void createTimeGroups();
     void createTrackGroups();

+    void createTrackGroupsNew();

     void clearModel();
 
 public slots:
     void clearModel();
 
 public slots:

diff --git a/src/mvc/mvc.pro b/src/mvc/mvc.pro
index 7c2aec9722bd3ef368880537500551236156018c..e9c9d63447770e3d6e04d9c210a6849ef9cc283c 100644 (file)
--- a/src/mvc/mvc.pro
+++ b/src/mvc/mvc.pro
@@ -6,28 +6,31 @@ CONFIG += static
 QT += sql
 
 # module dependencies
 QT += sql
 
 # module dependencies

-LIBS += -L$$DESTDIR -lorm
+LIBS += -L$$DESTDIR \
+    -lorm

 INCLUDEPATH += ../orm ../app
 INCLUDEPATH += ../orm ../app

-DEPENDPATH += . ../orm
+DEPENDPATH += . \
+    ../orm

 TARGETDEPS += $$DESTDIR/liborm.a
 TARGETDEPS += $$DESTDIR/liborm.a

-

 maemo { 
 maemo { 

-    LIBS += -L$$DESTDIR -lqalarm -lalarm
+    LIBS += -L$$DESTDIR \
+        -lqalarm \
+        -lalarm

     INCLUDEPATH += ../alarm
     INCLUDEPATH += ../alarm

-    DEPENDPATH +=  ../alarm
+    DEPENDPATH += ../alarm

     TARGETDEPS += $$DESTDIR/libqalarm.a
 }
     TARGETDEPS += $$DESTDIR/libqalarm.a
 }

-
-HEADERS += event.h \
-           conference.h \
-           track.h \
-           delegate.h \
-           eventmodel.h \
-           treeview.h
-
-SOURCES += event.cpp \
-           conference.cpp \
-           track.cpp \
-           delegate.cpp \
-           eventmodel.cpp \
-           treeview.cpp
+HEADERS += room.h \
+    event.h \
+    conference.h \
+    track.h \
+    delegate.h \
+    eventmodel.h \
+    treeview.h
+SOURCES += room.cpp \
+    event.cpp \
+    conference.cpp \
+    track.cpp \
+    delegate.cpp \
+    eventmodel.cpp \
+    treeview.cpp

diff --git a/src/mvc/track.cpp b/src/mvc/track.cpp
index 3ba78e586feb74a2162ba0f356ba06d86f0021fa..d0d8c1269260b5675ee4b1a6ef0989e71f7c7546 100644 (file)
--- a/src/mvc/track.cpp
+++ b/src/mvc/track.cpp
@@ -16,7 +16,7 @@ QSqlRecord const Track::sColumns = Track::toRecord(QList<QSqlField>()
     << QSqlField("id", QVariant::Int)
     << QSqlField(NAME, QVariant::String));
 
     << QSqlField("id", QVariant::Int)
     << QSqlField(NAME, QVariant::String));
 

-QMap<int, Track> Track::mIdToTrack;
+//QMap<int, Track> Track::mIdToTrack;

 
 class TrackInsertException : OrmSqlException
 {
 
 class TrackInsertException : OrmSqlException
 {


@@ -56,22 +56,17 @@ QList<Track> Track::getAll()
     return load(query);
 }
 
     return load(query);
 }
 

-void Track::updateTrackMap()
+Track Track::retrieve(int id)

 {
 {

-    mIdToTrack.clear();
-    QList<Track> trackList = Track::getAll();
-    Track track;
-    for (int id = 0; id < trackList.count(); ++id) {
-        track = trackList.at(id);
-        mIdToTrack.insert(track.id(), track);
-    }
+    QSqlQuery query;
+    query.prepare(selectQuery()
+            + QString("WHERE %1.id = :id").arg(sTableName));
+    query.bindValue(":id", id);
+    return loadOne(query);

 }
 
 }
 

-QString Track::getTrackName(int id)
+QString Track::retrieveTrackName(int id)

 {
 {

-    QString name = mIdToTrack.value(id).name();
-    if (name == "") {
-        qDebug() << QString("Error: undefined activity name for id %1").arg(id);
-    }
-    return name;
+    Track track = retrieve(id);
+    return track.name();

 }
 }

diff --git a/src/mvc/track.h b/src/mvc/track.h
index b8a324326b2ca189206389995845fabe3c735598..425af6ce02682c52fd15acd9cd61a31ae36f6a57 100644 (file)
--- a/src/mvc/track.h
+++ b/src/mvc/track.h
@@ -27,11 +27,10 @@ public:
     QString name() const { return value("name").toString(); }
     void setName(const QString & type) { setValue("name", type); }
 public:
     QString name() const { return value("name").toString(); }
     void setName(const QString & type) { setValue("name", type); }
 public:

-    //static void

     static QList<Track> getAll();
     static QList<Track> getAll();

+    static Track retrieve(int id);
+    static QString retrieveTrackName(int id);

     static Track retrieveByName(QString name);
     static Track retrieveByName(QString name);

-    static void updateTrackMap();
-    static QString getTrackName(int id);

 };
 
 #endif /* TRACK_H_ */
 };
 
 #endif /* TRACK_H_ */

diff --git a/src/sql/sqlengine.cpp b/src/sql/sqlengine.cpp
index aa5b2d7fb7869e22494ba6d0ae2f2ed497a34fa4..335359a0264cf82a4a0b5d7e53d1a7bf925673ac 100644 (file)
--- a/src/sql/sqlengine.cpp
+++ b/src/sql/sqlengine.cpp
@@ -113,7 +113,7 @@ void SqlEngine::addEventToDB(QHash<QString,QString> &aEvent)
 
     if (db.isValid() && db.isOpen())
     {
 
     if (db.isValid() && db.isOpen())
     {

-        //insert event track to table
+        //insert event track to table and get track id

         QString name = aEvent["track"];
         Track track;
         int trackId;
         QString name = aEvent["track"];
         Track track;
         int trackId;