Merge lp:~pkunal-parmar/ubuntu-calendar-app/EventDetails-Refactoring into lp:ubuntu-calendar-app

[Kunal Parmar]

In case of recurrent event, event object will be of EventOccurrence type, which does not contain Attendees and Recurrence information.

To get those information we need to retrieve parent event and display details from parent event.

If event object is of Event type then we can continue using it.

In case of recurrent event, event object will be of EventOccurrence type, which does not contain Attendees and Recurrence information.

To get those information we need to retrieve parent event and display details from parent event.

If event object is of Event type then we can continue using it.

[Kunal Parmar (pkunal-parmar)]

This needs to be done in NewEvent as well, I am planning to handle that in separate MR.

[Mihir Soni (mihirsoni)]

Looks good to me, and works great
Thanks kunal.

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== modified file 'AllDayEventComponent.qml'
--- AllDayEventComponent.qml	2014-04-05 06:36:28 +0000
+++ AllDayEventComponent.qml	2014-05-06 05:15:57 +0000
@@ -71,7 +71,7 @@
                             if( allDayLabel.events.length > 1 ) {
                                 PopupUtils.open(popoverComponent, root,{"events": allDayLabel.events})
                             } else {
-                                pageStack.push(Qt.resolvedUrl("EventDetails.qml"),{"event":allDayLabel.events[0],"model": model});
+                                pageStack.push(Qt.resolvedUrl("EventDetails.qml"),{"event":allDayLabel.events[0],"model": root.model});
                             }
                         }
                     }
@@ -138,7 +138,7 @@
                         anchors.fill: parent
                         onClicked: {
                             popover.hide();
-                            pageStack.push(Qt.resolvedUrl("EventDetails.qml"),{"event":modelData,"model": model});
+                            pageStack.push(Qt.resolvedUrl("EventDetails.qml"),{"event":modelData,"model": root.model});
                         }
                     }
                 }

=== modified file 'EventDetails.qml'
--- EventDetails.qml	2014-04-24 14:36:20 +0000
+++ EventDetails.qml	2014-05-06 05:15:57 +0000
@@ -37,56 +37,49 @@
             }
         }
     }
-    function showEvent(e) {
-        // TRANSLATORS: this is a time formatting string,
-        // see http://qt-project.org/doc/qt-5.0/qtqml/qml-qtquick2-date.html#details for valid expressions
-        var timeFormat = i18n.tr("hh:mm");
-        var startTime = e.startDateTime.toLocaleTimeString(Qt.locale(), timeFormat);
-        var endTime = e.endDateTime.toLocaleTimeString(Qt.locale(), timeFormat);
-
-        startHeader.value = startTime;
-        endHeader.value = endTime;
-
-        allDayEventCheckbox.checked = e.allDay;
-
-        // This is the event title
-        if( e.displayLabel) {
-            titleLabel.text = e.displayLabel;
-        }
-
-        if( e.description ) {
-            descLabel.text = e.description;
-        }
-        var attendees = e.attendees;
+
+    function updateRecurrence( event ) {
+        var index = 0;
+        if(event.recurrence ) {
+            var recurrenceRule = event.recurrence.recurrenceRules;
+            if(recurrenceRule.length > 0){
+                index =  recurrenceRule[0].frequency ;
+            }
+            else{
+                index = 0
+            }
+        }
+        recurrentHeader.value = Defines.recurrenceLabel[index];
+    }
+
+    function updateContacts(event) {
+        var attendees = event.attendees;
         contactModel.clear();
         if( attendees !== undefined ) {
             for( var j = 0 ; j < attendees.length ; ++j ) {
                 contactModel.append( {"name": attendees[j].name,"participationStatus": attendees[j].participationStatus }  );
             }
         }
+    }
 
+    function updateReminder(event) {
         var index = 0;
-        if(e.recurrence ) {
-            var recurrenceRule = e.recurrence.recurrenceRules;
-            index = ( recurrenceRule.length > 0 ) ? recurrenceRule[0].frequency : 0;
-        }
-        recurrentHeader.value = Defines.recurrenceLabel[index];
-
-        index = 0;
-        var reminder = e.detail( Detail.VisualReminder);
+        var reminder = event.detail( Detail.VisualReminder);
         if( reminder ) {
             var reminderTime = reminder.secondsBeforeStart;
             var foundIndex = Defines.reminderValue.indexOf(reminderTime);
             index = foundIndex != -1 ? foundIndex : 0;
         }
         reminderHeader.value = Defines.reminderLabel[index];
+    }
 
-        if( e.location ) {
-            locationLabel.text = e.location;
+    function updateLocation(event) {
+        if( event.location ) {
+            locationLabel.text = event.location;
 
             // FIXME: need to cache map image to avoid duplicate download every time
-            var imageSrc = "http://maps.googleapis.com/maps/api/staticmap?center="+e.location+
-                    "&markers=color:red|"+e.location+"&zoom=15&size="+mapContainer.width+
+            var imageSrc = "http://maps.googleapis.com/maps/api/staticmap?center="+event.location+
+                    "&markers=color:red|"+event.location+"&zoom=15&size="+mapContainer.width+
                     "x"+mapContainer.height+"&sensor=false";
             mapImage.source = imageSrc;
         }
@@ -97,6 +90,49 @@
         }
     }
 
+    function showEvent(e) {
+        // TRANSLATORS: this is a time formatting string,
+        // see http://qt-project.org/doc/qt-5.0/qtqml/qml-qtquick2-date.html#details for valid expressions
+        var timeFormat = i18n.tr("hh:mm");
+        var startTime = e.startDateTime.toLocaleTimeString(Qt.locale(), timeFormat);
+        var endTime = e.endDateTime.toLocaleTimeString(Qt.locale(), timeFormat);
+
+        var parentEvent;
+        if( e.parentId ){
+            var requestId = -1;
+            model.onItemsFetched.connect( function(id,fetchedItems){
+                if(requestId === id && fetchedItems.length > 0) {
+                    parentEvent = fetchedItems[0];
+                    updateRecurrence(parentEvent);
+                    updateContacts(parentEvent);
+                }
+            });
+            requestId = model.fetchItems([e.parentId]);
+        }
+
+        startHeader.value = startTime;
+        endHeader.value = endTime;
+
+        allDayEventCheckbox.checked = e.allDay;
+
+        // This is the event title
+        if( e.displayLabel) {
+            titleLabel.text = e.displayLabel;
+        }
+
+        if( e.description ) {
+            descLabel.text = e.description;
+        }
+
+        updateContacts(e);
+
+        updateRecurrence(e);
+
+        updateReminder(e);
+
+        updateLocation(e);
+    }
+
     Keys.onEscapePressed: {
         pageStack.pop();
     }
@@ -274,7 +310,6 @@
                 id: recurrentHeader
                 xMargin: column.recurranceAreaMaxWidth
                 header: i18n.tr("This happens")
-                value :"Only once" //Neds to change
             }
             EventDetailsInfo{
                 id: reminderHeader