Changeset d03ca41

Timestamp:

09/13/17 23:28:44 (5 years ago)

Author:

Philipp Spitzer <philipp@…>

Branches:

master

Children:

0c71a07

Parents:

7ba0378

git-author:

Philipp Spitzer <philipp@…> (09/13/17 23:26:25)

git-committer:

Philipp Spitzer <philipp@…> (09/13/17 23:28:44)

Message:

If no day_change was given for a conference 4 AM is assumed.

Fixes #53.

Location:

src/sql

Files:

• schedulexmlparser.cpp (modified) (1 diff)
• sqlengine.cpp (modified) (1 diff)

src/sql/schedulexmlparser.cpp

@@ -64 +64 @@
             conference["start"] = conferenceElement.firstChildElement("start").text(); // date
             conference["end"] = conferenceElement.firstChildElement("end").text(); // date
-            conference["day_change"] = conferenceElement.firstChildElement("day_change").text(); // time
+            QString conferenceDayChangeStr = conferenceElement.firstChildElement("day_change").text(); // time, e.g. "04:00:00"
+            if (conferenceDayChangeStr.isEmpty()) conferenceDayChangeStr = "04:00:00";
+            conference["day_change"] = conferenceDayChangeStr;
             conference["timeslot_duration"] = conferenceElement.firstChildElement("timeslot_duration").text(); // time
             conference["url"] = url;

src/sql/sqlengine.cpp

@@ -155 +155 @@
     query.bindValue(":start", QDateTime(QDate::fromString(aConference["start"],DATE_FORMAT),QTime(0,0),Qt::UTC).toTime_t());
     query.bindValue(":end", QDateTime(QDate::fromString(aConference["end"],DATE_FORMAT),QTime(0,0),Qt::UTC).toTime_t());
-    query.bindValue(":day_change", -QTime::fromString(aConference["day_change"],TIME_FORMAT).secsTo(QTime(0,0)));
+    QTime dayChange = QTime::fromString(aConference["day_change"].left(TIME_FORMAT.size()), TIME_FORMAT);
+    query.bindValue(":day_change", QTime(0, 0).secsTo(dayChange));
     query.bindValue(":timeslot_duration", -QTime::fromString(aConference["timeslot_duration"],TIME_FORMAT).secsTo(QTime(0,0)));
     query.bindValue(":active", 1);