Changeset d1fb9ee for src


Ignore:
Timestamp:
01/20/10 14:18:49 (13 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:
3 edited

Legend:

Unmodified
Added
Removed
  • src/gui/mainwindow.cpp

    ra3f6b00 rd1fb9ee  
    4040    statusBar()->showMessage(tr("Ready"));
    4141
    42     //create activity map
     42    //update activity map
    4343    Activity::updateActivityMap();
    4444
  • src/mvc/eventmodel.cpp

    ra3f6b00 rd1fb9ee  
    22#include <conference.h>
    33#include <activity.h>
     4
     5const QString EventModel::COMMA_SEPARATOR = ", ";
    46
    57EventModel::EventModel()
     
    189191    {
    190192        qDebug() << "Loading Conference Data (by Activities): [" << Conference::getById(aConferenceId).title() << "] " << aDate;
    191         mEvents = Event::getByDate(QDate(aDate.year(), aDate.month(), aDate.day()), aConferenceId, Event::XID_ACTIVITY);
     193        mEvents = Event::getByDate(QDate(aDate.year(), aDate.month(), aDate.day()), aConferenceId, Event::XID_ACTIVITY + COMMA_SEPARATOR + Event::START);
    192194    }
    193195    createActivityGroups();
  • src/mvc/eventmodel.h

    ra3f6b00 rd1fb9ee  
    88class EventModel : public QAbstractItemModel
    99{
     10public:
     11    static const QString COMMA_SEPARATOR;
    1012public:
    1113    EventModel();
Note: See TracChangeset for help on using the changeset viewer.