Merge lp:~renatofilho/ubuntu-calendar-app/fix-1563742 into lp:ubuntu-calendar-app

[Renato Araujo Oliveira Filho]

Fixed event drawing during the DST change.

Added /etc/writable/timezone as read path on apparmor file.
This is necessary by qtorganizer5-eds to retrieve device timezone.

OBS: You need silo 39 to test it
https://requests.ci-train.ubuntu.com/#/ticket/1213

How to test:

1 - Change your device tz to Europe/Paris
2 - Create a event at 7AM until 8AM before 27th March that repeats every day

Expected result:
Check if the event appears on the same time (7AM-8AM) on 26, 27, 28 of March and all other days

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

PASSED: Continuous integration, rev:814
https://core-apps-jenkins.ubuntu.com/job/calendar-app-ci/819/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/842/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/calendar-app-ci/819/rebuild

review: Approve (continuous-integration)

[lp:~renatofilho/ubuntu-calendar-app/fix-1563742]

815. By Renato Araujo Oliveira Filho on 2016-04-04

Fix event drawing on DST change.

816. By Renato Araujo Oliveira Filho on 2016-04-04

Fixed apparmor invalid syntax.

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

PASSED: Continuous integration, rev:816
https://core-apps-jenkins.ubuntu.com/job/calendar-app-ci/820/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/843/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/calendar-app-ci/820/rebuild

review: Approve (continuous-integration)

[lp:~renatofilho/ubuntu-calendar-app/fix-1563742]

817. By Renato Araujo Oliveira Filho on 2016-04-05

Added tests for events in multiple days.

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

PASSED: Continuous integration, rev:817
https://core-apps-jenkins.ubuntu.com/job/calendar-app-ci/822/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/847/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/calendar-app-ci/822/rebuild

review: Approve (continuous-integration)

[lp:~renatofilho/ubuntu-calendar-app/fix-1563742]

818. By Renato Araujo Oliveira Filho on 2016-04-05

Remove empty line.

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

PASSED: Continuous integration, rev:818
https://core-apps-jenkins.ubuntu.com/job/calendar-app-ci/823/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/848/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/calendar-app-ci/823/rebuild

review: Approve (continuous-integration)

[Arthur Mello (artmello)]

lgtm

review: Approve

=== modified file 'calendar_canvas.js'
--- calendar_canvas.js	2016-03-21 21:28:31 +0000
+++ calendar_canvas.js	2016-04-05 14:44:53 +0000
@@ -8,6 +8,13 @@
     var untilTime =  new Date(until)
     untilTime.setSeconds(0)
 
+    // We need that to avoid problems with DST times
+    // Without this the event will be showed in the wrong time on the day that the DST occur
+    // Example: 27/03 (Europe/Paris)
+    if (sinceTime.isSameDay(untilTime)) {
+        return (untilTime.getHours() * 60) + untilTime.getMinutes();
+    }
+
     var sinceTimeInSecs = sinceTime.getTime()
     var untilTimeInSecs = untilTime.getTime()
 
 
=== modified file 'click/calendar.apparmor'
--- click/calendar.apparmor	2016-03-03 21:42:08 +0000
+++ click/calendar.apparmor	2016-04-05 14:44:53 +0000
@@ -6,5 +6,8 @@
         "accounts",
         "push-notification-client"
     ],
+    "read_path": [
+        "/etc/writable/timezone"
+    ],
     "policy_version": 1.3
 }
 
=== modified file 'tests/unittests/tst_calendar_canvas.qml'
--- tests/unittests/tst_calendar_canvas.qml	2016-03-30 10:42:57 +0000
+++ tests/unittests/tst_calendar_canvas.qml	2016-04-05 14:44:53 +0000
@@ -16,7 +16,7 @@
 
             manager: "memory"
             startPeriod: new Date(2016, 7, 2, 0, 0, 0, 0)
-            endPeriod: new Date(2016, 13, 2, 0, 0, 0, 0)
+            endPeriod: new Date(2016, 11, 2, 0, 0, 0, 0)
             autoUpdate: true
         }
     }
@@ -669,4 +669,59 @@
         compare(eventsE.intersectionCount, 5)
         fuzzyCompare(eventsE.width, 0.3, 0.1)
     }
+
+    // Event starts a day before
+    //    00:00 |XX| ----
+    //          |XX| ----
+    //    01:00 ---- ----
+    function test_starts_a_day_before()
+    {
+        var data = [{startDate: new Date(2016, 7, 2, 23, 0, 0, 0),
+                     endDate: new Date(2016, 7, 3, 1, 0, 0, 0),
+                     label: "Event at 23:00 until 1:00"}
+                ]
+        var model = create_events(data)
+
+        var startDate = new Date(2016, 7, 3, 11, 11, 11, 11)
+        worker.start(model, startDate)
+        tryCompare(worker, 'done', true)
+        var eventMap = worker.reply
+
+        // "Event at 23:00 until 1:00"
+        var eventsA = eventMap[0]
+        compare(eventsA.event.displayLabel, "Event at 23:00 until 1:00")
+        compare(eventsA.y, 0)
+        compare(eventsA.startTime, 0)
+        compare(eventsA.endTime, 60)
+        compare(eventsA.intersectionCount, 1)
+        fuzzyCompare(eventsA.width, 1.0, 0.0)
+    }
+
+    // Event ends a day after
+    //    22:00 |XX| ----
+    //          |XX| ----
+    //    23:00 |XX| ----
+    ///         |XX| ----
+    function test_ends_a_day_after()
+    {
+        var data = [{startDate: new Date(2016, 7, 2, 22, 0, 0, 0),
+                     endDate: new Date(2016, 7, 3, 1, 0, 0, 0),
+                     label: "Event at 22:00 until 1:00"}
+                ]
+        var model = create_events(data)
+
+        var startDate = new Date(2016, 7, 2, 0, 0, 0, 0)
+        worker.start(model, startDate)
+        tryCompare(worker, 'done', true)
+        var eventMap = worker.reply
+
+        // "Event at 22:00 until 1:00"
+        var eventsA = eventMap[0]
+        compare(eventsA.event.displayLabel, "Event at 22:00 until 1:00")
+        compare(eventsA.y, 0)
+        compare(eventsA.intersectionCount, 1)
+        fuzzyCompare(eventsA.startTime, 1320, 0.1)
+        fuzzyCompare(eventsA.endTime, 1440, 0.1)
+        fuzzyCompare(eventsA.width, 1.0, 0.0)
+    }
 }