Change parsing of start and end date so that 37C3 schedule works.

[toast/confclerk.git] / src / sql / sqlengine.cpp

diff --git a/src/sql/sqlengine.cpp b/src/sql/sqlengine.cpp
index edb70f81f6c9a0b986598c6551d6fef573ef7ac9..54228c35742a4cb90044fe294ce0fb911f4c987e 100644 (file)
--- a/src/sql/sqlengine.cpp
+++ b/src/sql/sqlengine.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
- * Copyright (C) 2011-2017 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2021 Philipp Spitzer, gregor herrmann, Stefan Stahl
  *
  * This file is part of ConfClerk.
  *
@@ -144,7 +144,14 @@ bool SqlEngine::applySqlFile(const QString sqlFile) {
 }
 
 
-void SqlEngine::addConferenceToDB(QHash<QString,QString> &aConference, int conferenceId) {
+QDateTime parseDateIgnoreTime(QString dateStr) {
+    QDateTime dateTime = QDateTime::fromString(dateStr, Qt::DateFormat::ISODate);
+    dateTime.setOffsetFromUtc(0);
+    return dateTime;
+}
+
+
+void SqlEngine::addConferenceToDB(QHash<QString,QString> &aConference, int conferenceId, bool omit_display_time_shift) {
     QSqlQuery query(db);
     bool insert = conferenceId <= 0;
     if (insert) { // insert conference
@@ -153,24 +160,28 @@ void SqlEngine::addConferenceToDB(QHash<QString,QString> &aConference, int confe
                         " VALUES (:title,:url,:subtitle,:venue,:city,:start,:end,"
                                                 ":day_change,:timeslot_duration,:utc_offset,:display_time_shift,:active)");
     } else { // update conference
-        query.prepare("UPDATE CONFERENCE set title=:title, url=:url, subtitle=:subtitle, venue=:venue, city=:city, start=:start, end=:end,"
-                                            "day_change=:day_change, timeslot_duration=:timeslot_duration, utc_offset=:utc_offset, display_time_shift=:display_time_shift, active=:active "
-                      "WHERE id=:id");
+        QString update = "UPDATE CONFERENCE set title=:title, url=:url, subtitle=:subtitle, venue=:venue, city=:city, start=:start, end=:end, "
+                         "day_change=:day_change, timeslot_duration=:timeslot_duration, utc_offset=:utc_offset";
+        if (!omit_display_time_shift) update += ", display_time_shift=:display_time_shift";
+        update += ", active=:active WHERE id=:id";
+        query.prepare(update);
     }
     foreach (QString prop_name, (QList<QString>() << "title" << "url" << "subtitle" << "venue" << "city")) {
         query.bindValue(QString(":") + prop_name, aConference[prop_name]);
     }
-    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(":start", parseDateIgnoreTime(aConference["start"]).toTime_t());
+    query.bindValue(":end", parseDateIgnoreTime(aConference["end"]).toTime_t());
     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)));
     QVariant utc_offset;
     if (!aConference.value("utc_offset").isEmpty()) utc_offset = aConference["utc_offset"].toInt();
     query.bindValue(":utc_offset", utc_offset);
-    QVariant display_time_shift;
-    if (!aConference.value("display_time_shift").isEmpty()) display_time_shift = aConference["display_time_shift"].toInt();
-    query.bindValue(":display_time_shift", display_time_shift);
+    if (!omit_display_time_shift) {
+        QVariant display_time_shift;
+        if (!aConference.value("display_time_shift").isEmpty()) display_time_shift = aConference["display_time_shift"].toInt();
+        query.bindValue(":display_time_shift", display_time_shift);
+    }
     query.bindValue(":active", 1);
     if (!insert) query.bindValue(":id", conferenceId);
     query.exec();