Changeset d0d0a66

Timestamp:

01/02/10 22:14:10 (12 years ago)

Author:

komarma <komarma@…>

Branches:

master, qt5

Children:

9bbb44e

Parents:

489f262

Message:

Creating EventModel? class

Location:

src

Files:

• app/app.pro (modified) (1 diff)
• gui/gui.pro (modified) (1 diff)
• gui/mainwindow.cpp (modified) (1 diff)
• model/event.cpp (modified) (1 diff)
• model/event.h (modified) (1 diff)
• model/eventmodel.cpp (added)
• model/eventmodel.h (added)
• model/model.pro (modified) (1 diff)
• orm/ormrecord.h (modified) (1 diff)
• test/model/eventtest.cpp (modified) (1 diff)
• test/model/eventtest.h (modified) (1 diff)

src/app/app.pro

@@ -2 +2 @@
 TARGET = fosdem
 DESTDIR = ../bin
+QT += sql
 
 # module dependencies

src/gui/gui.pro

@@ -3 +3 @@
 DESTDIR = ../bin
 CONFIG += static
+QT += sql
 
 # module dependencies
-LIBS += -L$$DESTDIR -lmodel
-INCLUDEPATH += ../model
-DEPENDPATH += . ../model
-TARGETDEPS += $$DESTDIR/libmodel.a
+LIBS += -L$$DESTDIR -lmodel -orm
+INCLUDEPATH += ../orm ../model
+DEPENDPATH += . ../orm ../model
+TARGETDEPS += $$DESTDIR/liborm.a $$DESTDIR/libmodel.a
 
 

src/gui/mainwindow.cpp

@@ -1 +1 @@
 #include "mainwindow.h"
+
+#include <QTreeView>
+
+#include <eventmodel.h>
 
 MainWindow::MainWindow(QWidget *parent)
     : QMainWindow(parent)
 {
+    // open database connection
+    QSqlDatabase db = QSqlDatabase::addDatabase("QSQLITE");
+    db.setDatabaseName("fosdem-test.sqlite");
+    db.open();
+
+    QTreeView * view = new QTreeView(parent);
+    this->setCentralWidget(view);
+
+    view->setModel(new EventModel());
 }

src/model/event.cpp

@@ -14 +14 @@
 Event Event::getById(int id, int conferenceId)
 {
-    QString query = selectQuery() + "WHERE id = :id AND xid_conference = :conf";
+    QSqlQuery query;
+    query.prepare(selectQuery() + "WHERE id = :id AND xid_conference = :conf");
+    query.bindValue(":id", id);
+    query.bindValue(":conf", conferenceId);
+    return loadOne(query);
+}
 
-    QSqlQuery q;
-    q.prepare(query);
-    q.bindValue(":id", id);
-    q.bindValue(":conf", conferenceId);
-    return loadOne(q);
+QList<Event> Event::getByDate(const QDate& date, int conferenceId)
+{
+    QSqlQuery query;
+    query.prepare(selectQuery() + "WHERE xid_conference = :conf AND start >= :start AND start < :end ORDER BY start");
+    query.bindValue(":conf", conferenceId);
+    query.bindValue(":start", convertToDb(date, QVariant::DateTime));
+    query.bindValue(":end", convertToDb(date.addDays(1), QVariant::DateTime));
+
+    return load(query);
 }

src/model/event.h

@@ -24 +24 @@
 public:
     static Event getById(int id, int conferenceId);
+    static QList<Event> getByDate(const QDate& date, int conferenceId);
 
 public:

src/model/model.pro

@@ -11 +11 @@
 TARGETDEPS += $$DESTDIR/liborm.a
 
-HEADERS += event.h
-SOURCES += event.cpp
+HEADERS += \
+    event.h \
+    eventmodel.h
+SOURCES += \
+    event.cpp \
+    eventmodel.cpp
 

src/orm/ormrecord.h

@@ -163 +163 @@
 QVariant OrmRecord<T>::convertToDb(QVariant value, QVariant::Type colType)
 {
-    if (colType == QVariant::DateTime && value.type() == QVariant::DateTime)
+    if (colType == QVariant::DateTime && value.canConvert<QDateTime>())
     {
         return value.toDateTime().toTime_t();

src/test/model/eventtest.cpp

@@ -27 +27 @@
     QCOMPARE(event.type(), QString("Podium"));
     QCOMPARE(event.language(), QString("English"));
+}
+
+void EventTest::getByDate()
+{
+    QCOMPARE(Event::getByDate(QDate(2009, 2, 7), 1).count(), 127);
+    QCOMPARE(Event::getByDate(QDate(2009, 2, 8), 1).count(), 154);
 }
 

src/test/model/eventtest.h

@@ -12 +12 @@
 
     void getById();
+    void getByDate();
     void storingValues();
     void hydrate();