Changeset 41c4ceb in confclerk_git for src/sql

Timestamp:

04/30/13 23:42:38 (10 years ago)

Author:

Philipp Spitzer <philipp@…>

Branches:

master, qt5

Children:

5130dc7

Parents:

83481c6

Message:

Now the dayChange time is taken into account. This fixes #43.

File:

• src/sql/sqlengine.cpp (modified) (1 diff)

src/sql/sqlengine.cpp

@@ -173 +173 @@
 
 void SqlEngine::addEventToDB(QHash<QString,QString> &aEvent) {
-    //insert event track to table and get track id
-    int conference = aEvent["conference_id"].toInt();
-    QString name = aEvent["track"];
+    int conferenceId = aEvent["conference_id"].toInt();
+    Conference conference = Conference::getById(conferenceId);
+
+    // insert event track to table and get track id
     Track track;
     int trackId;
+    QString trackName = aEvent["track"];
     try
     {
-        track = Track::retrieveByName(conference, name);
+        track = Track::retrieveByName(conferenceId, trackName);
         trackId = track.id();
     }
     catch (OrmNoObjectException &e) {
-        track.setConference(conference);
-        track.setName(name);
+        track.setConference(conferenceId);
+        track.setName(trackName);
         trackId = track.insert();
     }
+    QDate startDate = QDate::fromString(aEvent["date"], DATE_FORMAT);
+    QTime startTime = QTime::fromString(aEvent["start"], TIME_FORMAT);
+    // consider day_change (note that if day_change is e.g. at 04:00 AM, an event starting at 02:00 AM has the previous date in the XML file)
+    if (startTime < conference.dayChangeTime()) startDate = startDate.addDays(1);
     QDateTime startDateTime;
     startDateTime.setTimeSpec(Qt::UTC);
-    startDateTime = QDateTime(QDate::fromString(aEvent["date"],DATE_FORMAT),QTime::fromString(aEvent["start"],TIME_FORMAT),Qt::UTC);
+    startDateTime = QDateTime(startDate, startTime, Qt::UTC);
 
     bool event_exists = false;