Merge lp:~renatofilho/qtorganizer5-eds/fix-1437305 into lp:qtorganizer5-eds

[Renato Araujo Oliveira Filho]

Does not save timezone for allday events.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:85
http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-ci/221/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-vivid-amd64-ci/28/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-vivid-armhf-ci/28
        deb: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-vivid-armhf-ci/28/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-vivid-i386-ci/28

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtorganizer5-eds-ci/221/rebuild

review: Needs Fixing (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

This hasn't fixed the issue. I'm still seeing new all-day events on the "wrong" day in month view.

This event is on the 12th but shows on 11th in Month view.

http://people.canonical.com/~alan/screenshots/device-2015-06-11-104135.png
http://people.canonical.com/~alan/screenshots/device-2015-06-11-104111.png
http://people.canonical.com/~alan/screenshots/device-2015-06-11-104050.png

review: Needs Fixing

=== modified file 'organizer/qorganizer-eds-engine.cpp'
--- organizer/qorganizer-eds-engine.cpp	2015-05-08 20:01:32 +0000
+++ organizer/qorganizer-eds-engine.cpp	2015-06-10 20:16:23 +0000
@@ -1212,7 +1212,8 @@
 {
     uint tmTime;
 
-    if (tzId) {
+    // check if ialtimetype contais a time and timezone
+    if (!icaltime_is_date(value) && tzId) {
         icaltimezone *timezone = icaltimezone_get_builtin_timezone_from_tzid(tzId);
         // fallback: sometimes the tzId contains the location name
         if (!timezone) {
@@ -1226,7 +1227,9 @@
         tmTime = icaltime_as_timet(value);
         QDateTime t = QDateTime::fromTime_t(tmTime).toUTC();
         // floating time contains invalid timezone
-        return QDateTime(t.date(), t.time(), QTimeZone());
+        return QDateTime(t.date(),
+                         (icaltime_is_date(value) ? QTime() : t.time()),
+                         QTimeZone());
     }
 }
 
@@ -1237,26 +1240,28 @@
     QDateTime finalDate(dateTime);
     QTimeZone tz;
 
-    switch (finalDate.timeSpec()) {
-    case Qt::UTC:
-    case Qt::OffsetFromUTC:
-        // convert date to UTC timezone
-        tz = QTimeZone("UTC");
-        finalDate = finalDate.toTimeZone(tz);
-        break;
-    case Qt::TimeZone:
-        tz = finalDate.timeZone();
-        if (!tz.isValid()) {
-            // floating time
-            finalDate = QDateTime(finalDate.date(), finalDate.time(), Qt::UTC);
+    if (!allDay) {
+        switch (finalDate.timeSpec()) {
+        case Qt::UTC:
+        case Qt::OffsetFromUTC:
+            // convert date to UTC timezone
+            tz = QTimeZone("UTC");
+            finalDate = finalDate.toTimeZone(tz);
+            break;
+        case Qt::TimeZone:
+            tz = finalDate.timeZone();
+            if (!tz.isValid()) {
+                // floating time
+                finalDate = QDateTime(finalDate.date(), finalDate.time(), Qt::UTC);
+            }
+            break;
+        case Qt::LocalTime:
+            tz = QTimeZone(QTimeZone::systemTimeZoneId());
+            finalDate = finalDate.toTimeZone(tz);
+            break;
+        default:
+            break;
         }
-        break;
-    case Qt::LocalTime:
-        tz = QTimeZone(QTimeZone::systemTimeZoneId());
-        finalDate = finalDate.toTimeZone(tz);
-        break;
-    default:
-        break;
     }
 
     if (tz.isValid()) {

=== modified file 'tests/unittest/event-test.cpp'
--- tests/unittest/event-test.cpp	2015-04-13 21:30:00 +0000
+++ tests/unittest/event-test.cpp	2015-06-10 20:16:23 +0000
@@ -498,15 +498,16 @@
         QCOMPARE(errorMap[1], QOrganizerManager::InvalidCollectionError);
     }
 
-    void testCreateAllDayEvent()
+    void testCreateAllDayTodo()
     {
         static QString displayLabelValue = QStringLiteral("All day title");
         static QString descriptionValue = QStringLiteral("All day description");
 
+        QDateTime eventDateTime = QDateTime(QDate(2013, 9, 3), QTime(0,30,0));
         QOrganizerTodo todo;
         todo.setCollectionId(m_collection.id());
         todo.setAllDay(true);
-        todo.setStartDateTime(QDateTime(QDate(2013, 9, 3), QTime(0,30,0)));
+        todo.setStartDateTime(eventDateTime);
         todo.setDisplayLabel(displayLabelValue);
         todo.setDescription(descriptionValue);
 
@@ -532,7 +533,51 @@
 
         QOrganizerTodo todoResult = static_cast<QOrganizerTodo>(items[0]);
         QCOMPARE(todoResult.isAllDay(), true);
-    }
+        QCOMPARE(todoResult.startDateTime().date(), eventDateTime.date());
+        QCOMPARE(todoResult.startDateTime().time(), QTime(0, 0, 0));
+    }
+
+    void testCreateAllDayEvent()
+    {
+        static QString displayLabelValue = QStringLiteral("All day title");
+        static QString descriptionValue = QStringLiteral("All day description");
+
+        QDateTime eventDateTime = QDateTime(QDate(2013, 9, 3), QTime(0,30,0));
+        QOrganizerEvent event;
+        event.setStartDateTime(eventDateTime);
+        event.setEndDateTime(eventDateTime.addDays(1));
+        event.setDisplayLabel(displayLabelValue);
+        event.setDescription(descriptionValue);
+        event.setAllDay(true);
+
+        QtOrganizer::QOrganizerManager::Error error;
+        QMap<int, QtOrganizer::QOrganizerManager::Error> errorMap;
+        QList<QOrganizerItem> items;
+        items << event;
+        bool saveResult = m_engine->saveItems(&items,
+                                            QList<QtOrganizer::QOrganizerItemDetail::DetailType>(),
+                                            &errorMap,
+                                            &error);
+        QVERIFY(saveResult);
+        QCOMPARE(error, QOrganizerManager::NoError);
+        QVERIFY(errorMap.isEmpty());
+        QOrganizerItemId id = items[0].id();
+        QVERIFY(!id.isNull());
+
+        QOrganizerItemFetchHint hint;
+        QList<QOrganizerItemId> ids;
+        ids << items[0].id();
+        items = m_engine->items(ids, hint, &errorMap, &error);
+        QCOMPARE(items.count(), 1);
+
+        QOrganizerEvent eventResult = static_cast<QOrganizerEvent>(items[0]);
+        QCOMPARE(eventResult.isAllDay(), true);
+        QCOMPARE(eventResult.startDateTime().date(), eventDateTime.date());
+        QCOMPARE(eventResult.startDateTime().time(), QTime(0, 0, 0));
+        QCOMPARE(eventResult.endDateTime().date(), eventDateTime.date().addDays(1));
+        QCOMPARE(eventResult.endDateTime().time(), QTime(0, 0, 0));
+    }
+
 
     void testCreateTodoEventWithStartDate()
     {