1
=== modified file 'EventRepetition.qml'
2
--- EventRepetition.qml	2016-08-05 14:23:25 +0000
3
+++ EventRepetition.qml	2016-08-26 19:28:25 +0000
4
@@ -129,7 +129,12 @@
5
129
                    rule.limit =  parseInt(limitCount.text);
129
                    rule.limit =  parseInt(limitCount.text);
6
130
                }
130
                }
7
131
                else if (limitOptions.selectedIndex === 2 && recurrenceOption.selectedIndex > 0) {
131
                else if (limitOptions.selectedIndex === 2 && recurrenceOption.selectedIndex > 0) {
9
132
                    rule.limit =  datePick.date;
132
                    // WORKAROUND: Use UTC format because QML module will convert the date to UTC internally and this
10
133
                    // can cause problems if the date is in different TZ.
11
134
                    // Use this until this get merged: https://codereview.qt-project.org/#/c/154461/
12
135
                    rule.limit = new Date(Date.UTC(datePick.date.getFullYear(),
13
136
                                           datePick.date.getMonth(),
14
137
                                           datePick.date.getDate()))
15
133
                }
138
                }
16
134
                else {
139
                else {
17
135
                    rule.limit = undefined;
140
                    rule.limit = undefined;
18
136
141
19
=== modified file 'NewEvent.qml'
20
--- NewEvent.qml	2016-08-05 14:23:25 +0000
21
+++ NewEvent.qml	2016-08-26 19:28:25 +0000
22
@@ -159,14 +159,12 @@
23
159
159
24
160
        var index = 0;
160
        var index = 0;
25
161
161
34
162
        if( e.itemType === Type.Event ) {
162
        // Use details method to get attendees list instead of "attendees" property
35
163
            // Use details method to get attendees list instead of "attendees" property
163
        // since a binding issue was returning an empty attendees list for some use cases
36
164
            // since a binding issue was returning an empty attendees list for some use cases
164
        var attendees = e.details(Detail.EventAttendee);
37
165
            var attendees = e.details(Detail.EventAttendee);
165
        if (attendees){
38
166
            if(attendees){
166
            for( var j = 0 ; j < attendees.length ; ++j ) {
39
167
                for( var j = 0 ; j < attendees.length ; ++j ) {
167
                contactModel.append({"contact": attendees[j]});
32
168
                    contactModel.append({"contact": attendees[j]});
33
169
                }
40
170
            }
168
            }
41
171
        }
169
        }
42
172
170
43
@@ -183,6 +181,17 @@
44
183
        selectCalendar(e.collectionId);
181
        selectCalendar(e.collectionId);
45
184
    }
182
    }
46
185
183
47
184
    function createAttendee(contact)
48
185
    {
49
186
        var attendee = Qt.createQmlObject("import QtOrganizer 5.0; EventAttendee { }", Qt.application,"NewEvent.qml")
50
187
        attendee.attendeeId = contact.attendeeId
51
188
        attendee.emailAddress = contact.emailAddress
52
189
        attendee.name = contact.name
53
190
        attendee.participationRole = EventAttendee.RoleOptionalParticipant
54
191
        attendee.participationStatus = EventAttendee.StatusUnknown
55
192
        return attendee
56
193
    }
57
194
58
186
    //Save the new or Existing event
195
    //Save the new or Existing event
59
187
    function saveToQtPim() {
196
    function saveToQtPim() {
60
188
        internal.clearFocus()
197
        internal.clearFocus()
61
@@ -212,15 +221,52 @@
62
212
            event.description = messageEdit.text;
221
            event.description = messageEdit.text;
63
213
            event.location = locationEdit.text
222
            event.location = locationEdit.text
64
214
223
67
215
            if( event.itemType === Type.Event ) {
224
            if ([Type.Event, Type.EventOccurrence].indexOf(event.itemType) != -1) {
68
216
                var newContacts = []
225
                var oldAttendee = event.details(Detail.EventAttendee)
69
226
                var newAttendee = []
70
217
                for(var i=0; i < contactModel.count ; ++i) {
227
                for(var i=0; i < contactModel.count ; ++i) {
71
218
                    var contact = contactModel.get(i).contact
228
                    var contact = contactModel.get(i).contact
72
219
                    if (contact) {
229
                    if (contact) {
77
220
                        newContacts.push(internal.attendeeFromData(contact.attendeeId, contact.name, contact.emailAddress));
230
                        newAttendee.push(contact)
78
221
                    }
231
                    }
79
222
                }
232
                }
80
223
                event.attendees = newContacts;
233
81
234
                // look for removed contacts
82
235
                for(var o=0; o < oldAttendee.length; ++o) {
83
236
                    var found = false
84
237
                    var old = oldAttendee[o]
85
238
                    for (var n=0; n < newAttendee.length; ++n) {
86
239
                        var new_ = newAttendee[n]
87
240
                        if (old.attendeeId == new_.attendeeId) {
88
241
                            found = true
89
242
                            break
90
243
                        }
91
244
                    }
92
245
                    if (!found) {
93
246
                        event.removeDetail(old)
94
247
                    }
95
248
                }
96
249
97
250
                // update list
98
251
                oldAttendee = event.details(Detail.EventAttendee)
99
252
100
253
                // look for new contacts
101
254
                for(var n=0; n < newAttendee.length; ++n) {
102
255
                    var found = false
103
256
                    var new_ = newAttendee[n]
104
257
                    for(var o=0; o < oldAttendee.length; ++o) {
105
258
                        var old = oldAttendee[o]
106
259
                        if (old.attendeeId == new_.attendeeId) {
107
260
                            found = true
108
261
                            break;
109
262
                        }
110
263
                    }
111
264
112
265
                    if (!found) {
113
266
                        var attendee = createAttendee(contact)
114
267
                        event.setDetail(attendee)
115
268
                    }
116
269
                }
117
224
            }
270
            }
118
225
271
119
226
            //Set the Rule object to an event
272
            //Set the Rule object to an event
Reviewer	Review Type	Date Requested	Status
Jenkins Bot	continuous-integration		Approve on 2016-08-31
Arthur Mello (community)		2016-08-24	Approve on 2016-08-29
system-apps-ci-bot	continuous-integration		Approve on 2016-08-26
Review via email: mp+303836@code.launchpad.net