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

[Renato Araujo Oliveira Filho]

Fix edit occurrence.

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

778. By Renato Araujo Oliveira Filho on 2016-03-10

Fix edit occurrence.

Block to change recurrence field of occurrence events.

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

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

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

review: Approve (continuous-integration)

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

779. By Renato Araujo Oliveira Filho on 2016-03-10

Remove call of 'setDetails' function.

This function is not necessary anymore.

780. By Renato Araujo Oliveira Filho on 2016-03-10

Use startDate as base date for recurrence rules.

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

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

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

review: Approve (continuous-integration)

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

781. By Renato Araujo Oliveira Filho on 2016-03-14

Fixed yearly recurrence events.

[Bill Filler (bfiller)]

tested with silo 56 and working

review: Approve

=== modified file 'EventDetails.qml'
--- EventDetails.qml	2016-03-02 19:55:52 +0000
+++ EventDetails.qml	2016-03-14 22:26:03 +0000
@@ -56,6 +56,23 @@
         }
     }
 
+    Connections{
+        target: model
+        onItemsFetched: {
+            if (internal.fetchParentRequestId === requestId) {
+                if (fetchedItems.length > 0) {
+                    internal.parentEvent = fetchedItems[0];
+                    updateRecurrence(internal.parentEvent);
+                    updateContacts(internal.parentEvent);
+                } else {
+                    console.warn("Fail to fetch pareten event")
+                }
+                internal.fetchParentRequestId = -1
+            }
+
+        }
+    }
+
     RemindersModel {
         id: reminderModel
     }
@@ -176,17 +193,11 @@
             }
         }
 
-        if( e.itemType === Type.EventOccurrence ){
-            var requestId = -1;
-            model.onItemsFetched.connect( function(id,fetchedItems){
-                if(requestId === id && fetchedItems.length > 0) {
-                    internal.parentEvent = fetchedItems[0];
-                    updateRecurrence(internal.parentEvent);
-                    updateContacts(internal.parentEvent);
-                }
-            });
-            requestId = model.fetchItems([e.parentId]);
+        var isOcurrence =  (e.itemType === Type.EventOccurrence) || (e.itemType === Type.TodoOccurrence)
+        if (isOcurrence) {
+            internal.fetchParentRequestId = model.fetchItems([e.parentId]);
         }
+
         // This is the event title
         if( e.displayLabel) {
             titleLabel.text = e.displayLabel;
@@ -261,6 +272,7 @@
 
     QtObject{
         id: internal
+        property int fetchParentRequestId: -1;
         property var parentEvent;
     }
 

=== modified file 'EventRepetition.qml'
--- EventRepetition.qml	2016-03-07 17:57:04 +0000
+++ EventRepetition.qml	2016-03-14 22:26:03 +0000
@@ -114,11 +114,9 @@
                     rule.daysOfWeek = eventUtils.getDaysOfWeek(recurrenceOption.selectedIndex, weekDays );
                     break;
                 case 6: //monthly
-                    rule.daysOfMonth = [eventRoot.date.getDate()];
+                    rule.daysOfMonth = [eventRoot.startDate.getDate()];
                     break;
                 case 7: //yearly
-                    rule.monthsOfYear = [eventRoot.date.getMonth()];
-                    rule.daysOfMonth = [eventRoot.date.getDate()];
                     break;
                 case 0: //once
                 default:
@@ -207,7 +205,7 @@
                                 (checked) ? weekDays.push(index) : weekDays.splice(weekDays.indexOf(index),1);
                         }
                         checked:{
-                            (weekDays.length === 0 && eventRoot.date && (index === eventRoot.date.getDay()) && !isEdit) ? true : false;
+                            (weekDays.length === 0 && eventRoot.startDate && (index === eventRoot.startDate.getDay()) && !isEdit) ? true : false;
                         }
 
                     }

=== modified file 'NewEvent.qml'
--- NewEvent.qml	2016-03-07 17:57:04 +0000
+++ NewEvent.qml	2016-03-14 22:26:03 +0000
@@ -123,7 +123,8 @@
     //Editing Event
     function editEvent(e) {
         //If there is a ReccruenceRule use that , else create fresh Recurrence Object.
-        if(e.itemType === Type.Event && e.recurrence.recurrenceRules[0] !== undefined
+        var isOcurrence = ((event.itemType === Type.EventOccurrence) || (event.itemType === Type.TodoOccurrence))
+        if(!isOcurrence && e.recurrence.recurrenceRules[0] !== undefined
                 && e.recurrence.recurrenceRules[0] !== null){
             rule =  e.recurrence.recurrenceRules[0];
         }
@@ -208,10 +209,13 @@
             }
 
             //Set the Rule object to an event
-            if(rule !== null && rule !== undefined) {
-                event.recurrence.recurrenceRules = [rule]
-            } else {
-                event.recurrence.recurrenceRules = [];
+            var isOcurrence = ((event.itemType === Type.EventOccurrence) || (event.itemType === Type.TodoOccurrence))
+            if (!isOcurrence) {
+                if(rule !== null && rule !== undefined) {
+                    event.recurrence.recurrenceRules = [rule]
+                } else {
+                    event.recurrence.recurrenceRules = [];
+                }
             }
 
             //remove old reminder value
@@ -684,9 +688,9 @@
 
                 showDivider: false
                 progression: true
-                visible: (event != undefined) && (event.itemType === Type.Event)
+                visible: (event != undefined) && ((event.itemType === Type.Event) || (event.itemType === Type.Todo))
                 text: i18n.tr("Repeats")
-                subText: (event != undefined) && (event.itemType === Type.Event) ? rule === null ? Defines.recurrenceLabel[0] : eventUtils.getRecurrenceString(rule) : ""
+                subText: visible ? rule === null ? Defines.recurrenceLabel[0] : eventUtils.getRecurrenceString(rule) : ""
                 onClicked: {
                     var stack = pageStack
                     if (!stack)

=== modified file 'TimeLineBaseComponent.qml'
--- TimeLineBaseComponent.qml	2016-03-07 20:35:24 +0000
+++ TimeLineBaseComponent.qml	2016-03-14 22:26:03 +0000
@@ -346,7 +346,6 @@
                                     dropArea.modifyEventForDrag(drag)
                                     var eventBubble = drag.source;
                                     eventBubble.assingnBgColor();
-                                    eventBubble.setDetails();
 
                                     if( eventBubble.y + eventBubble.height + units.gu(8) > timeLineView.contentY + timeLineView.height ) {
                                         var diff = Math.abs((eventBubble.y + eventBubble.height + units.gu(8))  -