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

[Renato Araujo Oliveira Filho]

Fix event save with attendee, and recurrence limit

Make sure that Attendee get save after edit an event.
Use UTC date in the event recurrence limit.

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

871. By Renato Araujo Oliveira Filho on 2016-08-24

Fix event save with attendee.

[system-apps-ci-bot (system-apps-ci-bot)]

PASSED: Continuous integration, rev:871
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-calendar-app-ci/29/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/1292
    SUCCESS: https://jenkins.canonical.com/system-apps/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=default/287
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1292
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/1158
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial+overlay/1158
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=yakkety/1158
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1141
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1141/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1141
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1141/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1141
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1141/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1141
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1141/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1141
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1141/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1141
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1141/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1141
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1141/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1141
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1141/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1141
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1141/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-calendar-app-ci/29/rebuild

review: Approve (continuous-integration)

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

872. By Renato Araujo Oliveira Filho on 2016-08-26

Use UTC date in the event recurrence limit.

873. By Renato Araujo Oliveira Filho on 2016-08-26

Fixed remove attendee from a event.

[system-apps-ci-bot (system-apps-ci-bot)]

PASSED: Continuous integration, rev:872
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-calendar-app-ci/31/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/1340
    SUCCESS: https://jenkins.canonical.com/system-apps/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=default/305
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1340
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/1203
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial+overlay/1203
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=yakkety/1203
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1183
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1183/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1183
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1183/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1183
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1183/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1183
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1183/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1183
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1183/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1183
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1183/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1183
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1183/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1183
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1183/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1183
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1183/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-calendar-app-ci/31/rebuild

review: Approve (continuous-integration)

[system-apps-ci-bot (system-apps-ci-bot)]

PASSED: Continuous integration, rev:873
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-calendar-app-ci/32/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/1342
    SUCCESS: https://jenkins.canonical.com/system-apps/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=default/306
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1342
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/1205
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial+overlay/1205
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=yakkety/1205
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1185
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1185/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1185
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1185/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1185
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1185/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1185
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1185/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1185
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1185/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1185
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1185/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1185
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1185/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1185
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1185/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1185
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1185/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-calendar-app-ci/32/rebuild

review: Approve (continuous-integration)

[Arthur Mello (artmello)]

lgtm

review: Approve

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

review: Approve (continuous-integration)

=== modified file 'EventRepetition.qml'
--- EventRepetition.qml	2016-08-05 14:23:25 +0000
+++ EventRepetition.qml	2016-08-26 19:28:25 +0000
@@ -129,7 +129,12 @@
                     rule.limit =  parseInt(limitCount.text);
                 }
                 else if (limitOptions.selectedIndex === 2 && recurrenceOption.selectedIndex > 0) {
-                    rule.limit =  datePick.date;
+                    // WORKAROUND: Use UTC format because QML module will convert the date to UTC internally and this
+                    // can cause problems if the date is in different TZ.
+                    // Use this until this get merged: https://codereview.qt-project.org/#/c/154461/
+                    rule.limit = new Date(Date.UTC(datePick.date.getFullYear(),
+                                           datePick.date.getMonth(),
+                                           datePick.date.getDate()))
                 }
                 else {
                     rule.limit = undefined;

=== modified file 'NewEvent.qml'
--- NewEvent.qml	2016-08-05 14:23:25 +0000
+++ NewEvent.qml	2016-08-26 19:28:25 +0000
@@ -159,14 +159,12 @@
 
         var index = 0;
 
-        if( e.itemType === Type.Event ) {
-            // Use details method to get attendees list instead of "attendees" property
-            // since a binding issue was returning an empty attendees list for some use cases
-            var attendees = e.details(Detail.EventAttendee);
-            if(attendees){
-                for( var j = 0 ; j < attendees.length ; ++j ) {
-                    contactModel.append({"contact": attendees[j]});
-                }
+        // Use details method to get attendees list instead of "attendees" property
+        // since a binding issue was returning an empty attendees list for some use cases
+        var attendees = e.details(Detail.EventAttendee);
+        if (attendees){
+            for( var j = 0 ; j < attendees.length ; ++j ) {
+                contactModel.append({"contact": attendees[j]});
             }
         }
 
@@ -183,6 +181,17 @@
         selectCalendar(e.collectionId);
     }
 
+    function createAttendee(contact)
+    {
+        var attendee = Qt.createQmlObject("import QtOrganizer 5.0; EventAttendee { }", Qt.application,"NewEvent.qml")
+        attendee.attendeeId = contact.attendeeId
+        attendee.emailAddress = contact.emailAddress
+        attendee.name = contact.name
+        attendee.participationRole = EventAttendee.RoleOptionalParticipant
+        attendee.participationStatus = EventAttendee.StatusUnknown
+        return attendee
+    }
+
     //Save the new or Existing event
     function saveToQtPim() {
         internal.clearFocus()
@@ -212,15 +221,52 @@
             event.description = messageEdit.text;
             event.location = locationEdit.text
 
-            if( event.itemType === Type.Event ) {
-                var newContacts = []
+            if ([Type.Event, Type.EventOccurrence].indexOf(event.itemType) != -1) {
+                var oldAttendee = event.details(Detail.EventAttendee)
+                var newAttendee = []
                 for(var i=0; i < contactModel.count ; ++i) {
                     var contact = contactModel.get(i).contact
                     if (contact) {
-                        newContacts.push(internal.attendeeFromData(contact.attendeeId, contact.name, contact.emailAddress));
-                    }
-                }
-                event.attendees = newContacts;
+                        newAttendee.push(contact)
+                    }
+                }
+
+                // look for removed contacts
+                for(var o=0; o < oldAttendee.length; ++o) {
+                    var found = false
+                    var old = oldAttendee[o]
+                    for (var n=0; n < newAttendee.length; ++n) {
+                        var new_ = newAttendee[n]
+                        if (old.attendeeId == new_.attendeeId) {
+                            found = true
+                            break
+                        }
+                    }
+                    if (!found) {
+                        event.removeDetail(old)
+                    }
+                }
+
+                // update list
+                oldAttendee = event.details(Detail.EventAttendee)
+
+                // look for new contacts
+                for(var n=0; n < newAttendee.length; ++n) {
+                    var found = false
+                    var new_ = newAttendee[n]
+                    for(var o=0; o < oldAttendee.length; ++o) {
+                        var old = oldAttendee[o]
+                        if (old.attendeeId == new_.attendeeId) {
+                            found = true
+                            break;
+                        }
+                    }
+
+                    if (!found) {
+                        var attendee = createAttendee(contact)
+                        event.setDetail(attendee)
+                    }
+                }
             }
 
             //Set the Rule object to an event