Changeset 7ba0378 in confclerk_git

Timestamp:

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

Author:

Philipp Spitzer <philipp@…>

Branches:

master

Children:

d03ca41

Parents:

f0f9fdc

git-author:

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

git-committer:

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

Message:

Import schedules with dates attached to events correctly.

Location:

src/sql

Files:

• schedulexmlparser.cpp (modified) (4 diffs)
• sqlengine.cpp (modified) (2 diffs)
• sqlengine.h (modified) (1 diff)

src/sql/schedulexmlparser.cpp

@@ -21 +21 @@
 #include <QDomDocument>
 #include <QHash>
+#include <QTime>
 
 #include "schedulexmlparser.h"
@@ -51 +52 @@
     {
         QDomElement conferenceElement = scheduleElement.firstChildElement("conference");
+        QTime conference_day_change;
         if (!conferenceElement.isNull())
         {
@@ -68 +70 @@
             conferenceId = conference["id"].toInt();
             conference_title = conference["title"];
+            conference_day_change = QTime(0, 0).addSecs(conference["day_change"].toInt());
         }
 
@@ -109 +112 @@
                         event["id"] = eventElement.attribute("id");;
                         event["conference_id"] = QString::number(conferenceId, 10);
-                        event["start"] = eventElement.firstChildElement("start").text(); // time eg. 10:00
-                        event["date"] = dayElement.attribute("date"); // date eg. 2009-02-07
+                        QTime event_start = QTime::fromString(eventElement.firstChildElement("start").text(), sqlEngine->TIME_FORMAT);
+                        event["start"] = event_start.toString(sqlEngine->TIME_FORMAT); // time eg. 10:00
+                        QDate event_date;
+                        QDomElement eventDateElement = eventElement.firstChildElement("date");
+                        if (!eventDateElement.isNull()) {
+                            QString date_str = eventDateElement.text(); // date eg. 2009-02-07T10:00:00+00:00
+                            event_date = QDate::fromString(date_str.left(sqlEngine->DATE_FORMAT.size()), sqlEngine->DATE_FORMAT);
+                        } else {
+                            event_date = QDate::fromString(dayElement.attribute("date"),sqlEngine->DATE_FORMAT); // date eg. 2009-02-07
+                            if (event_start < conference_day_change) event_date = event_date.addDays(1);
+                        }
+                        event["date"] = event_date.toString(sqlEngine->DATE_FORMAT); // date eg. 2009-02-07
                         event["duration"] = eventElement.firstChildElement("duration").text(); // time eg. 00:30
                         event["room_name"] = eventElement.firstChildElement("room").text(); // string eg. "Janson"

src/sql/sqlengine.cpp

@@ -38 +38 @@
 #include <QDebug>
 
-const QString DATE_FORMAT ("yyyy-MM-dd");
-const QString TIME_FORMAT ("hh:mm");
-
 SqlEngine::SqlEngine(QObject *aParent): QObject(aParent) {
 #if QT_VERSION >= 0x050000
@@ -193 +190 @@
     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);

src/sql/sqlengine.h

@@ -29 +29 @@
     Q_OBJECT
     public:
+        const QString DATE_FORMAT = "yyyy-MM-dd";
+        const QString TIME_FORMAT = "hh:mm";
+
         QString dbFilename; ///< database filename including path
         QSqlDatabase db; ///< this may be private one day...