- Timestamp:
- 01/18/10 19:38:55 (13 years ago)
- Branches:
- master, qt5
- Children:
- 707cd31
- Parents:
- 18681b3
- Location:
- src/mvc
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
src/mvc/event.cpp
r18681b3 r64122f1 8 8 int const Event::sTable1ColCount = 9; // see 'toRecord()' for more details 9 9 int const Event::sTable2ColCount = 5; // see 'toRecord()' for more details 10 const QString Event::XID_ACTIVITY = "xid_activity"; 11 const QString Event::START = "start"; 12 13 10 14 11 15 QSqlRecord const Event::sColumns = Event::toRecord(QList<QSqlField>() … … 40 44 } 41 45 42 QList<Event> Event::getByDate(const QDate& date, int conferenceId )46 QList<Event> Event::getByDate(const QDate& date, int conferenceId, QString orderBy) 43 47 { 44 48 QSqlQuery query; 45 49 query.prepare( 46 50 selectQueryJoin2T("id") 47 + QString("WHERE %1.xid_conference = :conf AND %1.start >= :start AND %1.start < :end ORDER BY %1. start").arg(sTable1Name));51 + QString("WHERE %1.xid_conference = :conf AND %1.start >= :start AND %1.start < :end ORDER BY %1.%2").arg(sTable1Name).arg(orderBy)); 48 52 query.bindValue(":conf", conferenceId); 49 53 query.bindValue(":start", convertToDb(date, QVariant::DateTime)); -
src/mvc/event.h
r18681b3 r64122f1 18 18 { 19 19 public: 20 static QSqlRecord constsColumns;20 static const QSqlRecord sColumns; 21 21 //static QString const sTableName; 22 static QString const sTable1Name; 23 static QString const sTable2Name; 24 static int const sTable1ColCount; 25 static int const sTable2ColCount; 26 22 static const QString sTable1Name; 23 static const QString sTable2Name; 24 static const int sTable1ColCount; 25 static const int sTable2ColCount; 26 static const QString XID_ACTIVITY; 27 static const QString START; 27 28 public: 28 29 static Event getById(int id, int conferenceId); 29 static QList<Event> getByDate(const QDate& date, int conferenceId); 30 static QList<Event> getFavByDate(const QDate& date, int conferenceId); // get Favourities by Date 31 30 static QList<Event> getByDate(const QDate & date, int conferenceId, QString orderBy); 31 static QList<Event> getFavByDate(const QDate & date, int conferenceId); // get Favourities by Date 32 32 public: 33 33 // Table 1 34 int id() const { return value("id").toInt(); } 35 int conferenceId() const { return value("xid_conference").toInt(); } 36 QDateTime start() const { return value("start").toDateTime(); } 37 int duration() const { return value("duration").toInt(); } 38 int activityId() const { return value("xid_activity").toInt(); } 39 QString type() const { return value("type").toString(); } 40 QString language() const { return value("language").toString(); } 41 bool isFavourite() const { return value("favourite").toBool(); } 42 bool hasAlarm() const { return value("alarm").toBool(); } 34 int id() const 35 { 36 return value("id").toInt(); 37 } 38 39 int conferenceId() const 40 { 41 return value("xid_conference").toInt(); 42 } 43 44 QDateTime start() const 45 { 46 return value(START).toDateTime(); 47 } 48 49 int duration() const 50 { 51 return value("duration").toInt(); 52 } 53 54 int activityId() const 55 { 56 return value(XID_ACTIVITY).toInt(); 57 } 58 59 QString type() const 60 { 61 return value("type").toString(); 62 } 63 64 QString language() const 65 { 66 return value("language").toString(); 67 } 68 69 bool isFavourite() const 70 { 71 return value("favourite").toBool(); 72 } 73 74 bool hasAlarm() const 75 { 76 return value("alarm").toBool(); 77 } 78 43 79 // Table 2 : virtual table for FTS (Full Text Search) 44 QString tag() const { return value("tag").toString(); } 45 QString title() const { return value("title").toString(); } 46 QString subtitle() const { return value("subtitle").toString(); } 47 QString abstract() const { return value("abstract").toString(); } 48 QString description() const { return value("description").toString(); } 80 QString tag() const 81 { 82 return value("tag").toString(); 83 } 84 85 QString title() const 86 { 87 return value("title").toString(); 88 } 89 90 QString subtitle() const 91 { 92 return value("subtitle").toString(); 93 } 94 95 QString abstract() const 96 { 97 return value("abstract").toString(); 98 } 99 100 QString description() const 101 { 102 return value("description").toString(); 103 } 49 104 50 105 // Table 1 51 void setId(int id) { setValue("id", id); } 52 void setConferenceId(int conferenceId) { setValue("xid_conference", conferenceId); } 53 void setStart(const QDateTime& start) { setValue("start", start); } 54 void setDuration(int duration) { setValue("duration", duration); } 55 void setActivityId(int activityId) { setValue("xid_activity", activityId); } 56 void setType(const QString& type) { setValue("type", type); } 57 void setLanguage(const QString& language) { setValue("language", language); } 58 void setFavourite(bool favourite) { setValue("favourite", (int)favourite); } 59 void setHasAlarm(bool alarm) { setValue("alarm", (int)alarm); } 106 void setId(int id) 107 { 108 setValue("id", id); 109 } 110 111 void setConferenceId(int conferenceId) 112 { 113 setValue("xid_conference", conferenceId); 114 } 115 116 void setStart(const QDateTime & start) 117 { 118 setValue(START, start); 119 } 120 121 void setDuration(int duration) 122 { 123 setValue("duration", duration); 124 } 125 126 void setActivityId(int activityId) 127 { 128 setValue(XID_ACTIVITY, activityId); 129 } 130 131 void setType(const QString & type) 132 { 133 setValue("type", type); 134 } 135 136 void setLanguage(const QString & language) 137 { 138 setValue("language", language); 139 } 140 141 void setFavourite(bool favourite) 142 { 143 setValue("favourite", (int)((favourite))); 144 } 145 146 void setHasAlarm(bool alarm) 147 { 148 setValue("alarm", (int)((alarm))); } 60 149 // Table 2 : virtual table for FTS (Full Text Search) 61 150 void setTag(const QString& tag) { setValue("tag", tag); } -
src/mvc/eventmodel.cpp
r18681b3 r64122f1 165 165 { 166 166 qDebug() << "Loading Conference Data: [" << Conference::getById(aConferenceId).title() << "] " << aDate; 167 mEvents = Event::getByDate(QDate(aDate.year(), aDate.month(), aDate.day()), aConferenceId );167 mEvents = Event::getByDate(QDate(aDate.year(), aDate.month(), aDate.day()), aConferenceId, Event::START); 168 168 } 169 169 createTimeGroups(); … … 188 188 { 189 189 qDebug() << "Loading Conference Data (by Activities): [" << Conference::getById(aConferenceId).title() << "] " << aDate; 190 mEvents = Event::getByDate(QDate(aDate.year(), aDate.month(), aDate.day()), aConferenceId );190 mEvents = Event::getByDate(QDate(aDate.year(), aDate.month(), aDate.day()), aConferenceId, Event::XID_ACTIVITY); 191 191 } 192 192 createActivityGroups();
Note: See TracChangeset
for help on using the changeset viewer.