Changeset 69393c0

Timestamp:

01/13/10 14:27:33 (13 years ago)

Author:

pavelpa <pavelpa@…>

Branches:

master, qt5

Children:

969a840

Parents:

c2d66b2

Message:

implemented 'conference' record for accessing info about the conference

• events are loaded from the first day of the conference

Location:

src

Files:

• gui/mainwindow.cpp (modified) (1 diff)
• model/conference.cpp (added)
• model/conference.h (added)
• model/eventmodel.cpp (modified) (2 diffs)
• model/eventmodel.h (modified) (2 diffs)
• model/model.pro (modified) (2 diffs)
• sql/sqlengine.cpp (modified) (4 diffs)

src/gui/mainwindow.cpp

@@ -65 +65 @@
     QByteArray data = file.readAll();
     mXmlParser->parseData(data,mSqlEngine);
-    static_cast<EventModel*>(treeView->model())->reload();
+    static_cast<EventModel*>(treeView->model())->loadEvents();
     treeView->reset();
 }

src/model/eventmodel.cpp

@@ -1 +1 @@
 #include "eventmodel.h"
+#include <conference.h>
 
-EventModel::EventModel() :
-    mEvents(Event::getByDate(QDate(2009, 2, 7), 1))
+EventModel::EventModel()
 {
-    createTimeGroups();
+
+    loadEvents();
 }
 
@@ -118 +119 @@
 }
 
-void EventModel::reload()
+void EventModel::loadEvents()
 {
     mEvents.clear();
-    mEvents=Event::getByDate(QDate(2009, 2, 7), 1);
+
+    mConfId = 1; // current conference selected: we have only one DB so far
+    // check for existence of conference in the DB
+    if(Conference::getAll().count())
+    {
+        mCurrentDate = Conference::getById(mConfId).start();
+        qDebug() << "Loading Conference Data: [" << Conference::getById(mConfId).title() << "] " << mCurrentDate;
+        mEvents = Event::getByDate(QDate(mCurrentDate.year(), mCurrentDate.month(), mCurrentDate.day()), mConfId);
+    }
+    mEvents = Event::getByDate(QDate(mCurrentDate.year(), mCurrentDate.month(), mCurrentDate.day()), mConfId);
     createTimeGroups();
 }

src/model/eventmodel.h

@@ -15 +15 @@
     int columnCount ( const QModelIndex & parent = QModelIndex() ) const;
     int rowCount ( const QModelIndex & parent = QModelIndex() ) const;
-    void reload(); // reloads Events from the DB
+    void loadEvents(); // loads Events from the DB
 
 private:
@@ -40 +40 @@
     QList<Group> mGroups;
     QHash<int, int> mParents;
+    QDate mCurrentDate;
+    int mConfId;
 };
 
 #endif // EVENTMODEL_H
+

src/model/model.pro

@@ -13 +13 @@
 HEADERS += \
     event.h \
+    conference.h \
     delegate.h \
     eventmodel.h \
@@ -18 +19 @@
 SOURCES += \
     event.cpp \
+    conference.cpp \
     delegate.cpp \
     eventmodel.cpp \

src/sql/sqlengine.cpp

@@ -68 +68 @@
                          .arg(aConference["venue"]) \
                          .arg(aConference["city"]) \
-                         .arg(aConference["start"]) \
-                         .arg(aConference["end"]) \
+                         .arg(QDateTime(QDate::fromString(aConference["start"],DATE_FORMAT)).toTime_t()) \
+                         .arg(QDateTime(QDate::fromString(aConference["end"],DATE_FORMAT)).toTime_t()) \
                          .arg(aConference["days"]) \
-                         .arg(aConference["day_change"]) \
-                         .arg(aConference["timeslot_duration"]);
+                         .arg(-QTime::fromString(aConference["day_change"],TIME_FORMAT).secsTo(QTime(0,0))) \
+                         .arg(-QTime::fromString(aConference["timeslot_duration"],TIME_FORMAT).secsTo(QTime(0,0)));
 
         QString query = QString("INSERT INTO CONFERENCE (id,title,subtitle,venue,city,start,end,days,day_change,timeslot_duration) VALUES (%1)").arg(values);
@@ -90 +90 @@
         // The items of the Event are divided into the two tables EVENT and VIRTUAL_EVENT
         // VIRTUAL_EVENT is for Full-Text-Serach Support
-        QTime duration = QTime::fromString(aEvent["duration"],TIME_FORMAT);
         QDateTime startDateTime = QDateTime(QDate::fromString(aEvent["date"],DATE_FORMAT),QTime::fromString(aEvent["start"],TIME_FORMAT));
         QString values = QString("'%1', '%2', '%3', '%4', '%5', '%6', '%7'") \
@@ -96 +95 @@
                          .arg(aEvent["id"]) \
                          .arg(QString::number(startDateTime.toTime_t())) \
-                         .arg(QString::number(duration.hour()*3600 + duration.minute()*60 + duration.second())) \
+                         .arg(-QTime::fromString(aEvent["duration"],TIME_FORMAT).secsTo(QTime(0,0))) \
                          .arg("123456") \
                          .arg(aEvent["type"]) \
@@ -201 +200 @@
             venue VARCHAR, \
             city VARCHAR NOT NULL , \
-            start DATETIME NOT NULL , \
-            end DATETIME NOT NULL , \
+            start INTEGER NOT NULL , \
+            end INTEGER NOT NULL , \
             days INTEGER, \
-            day_change DATETIME, \
-            timeslot_duration DATETIME)");
+            day_change INTEGER, \
+            timeslot_duration INTEGER)");
 
         query.exec("CREATE TABLE ACTIVITY ( \