Merge lp:~mefrio-g/ubuntu-calendar-app/fix-1270242 into lp:ubuntu-calendar-app

[Mario Guerriero]

added support for recurrence

added support for recurrence

[Kunal Parmar (pkunal-parmar)]

Hi Mario,

Thanks for fixing the issue. Your change seems good.

However, we also need to reflect recurrence value in EventDetails.qml and also when editing the event in NewEvent.qml.
Can you add those changes as well ?

I have done some work for that in this branch
https://code.launchpad.net/~pkunal-parmar/ubuntu-calendar-app/MissingFields

You can refer it, I was not able to merge those changes as I was busy with other tasks.

[Mario Guerriero (mefrio-g)]

I totally forgot about edit and display mode. I just added them. I tried to arrange the code so that it looks much more "compatible" to yours.

[Kunal Parmar (pkunal-parmar)]

This looks good to me, Tested and seems to work fine on desktop.

On side note: We are currently missing Options in UI that can limit recurrence of event. Like create recurrence event only for 10 times or Don't create recurrence event after certain date time.

So we need option to specify limit property of recurring event, option like, count, date time or no limit.
You can read more here.
http://doc.qt.digia.com/qtmobility/qml-recurrencerule.html#limit-prop

I am not sure if you would be interested in implementing this, but it was related so thought to mention it.

review: Approve

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-calendar-app-autolanding/92/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/925
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-autolanding/92
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-autolanding/92
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-autolanding/32

review: Needs Fixing (continuous-integration)

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-calendar-app-autolanding/93/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/926
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-autolanding/93
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-autolanding/93
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-autolanding/33

review: Needs Fixing (continuous-integration)

[Mario Guerriero (mefrio-g)]

Hi Kunal,

I think this feature regards some other branches/bugs. What should I fix now? I can't understand what the bot is saying.

[Kunal Parmar (pkunal-parmar)]

Hi Mario,

I agree, we can do that in separate branch.

Regarding error, looks like server issue.
I will try to trigger build again in sometime.

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-calendar-app-autolanding/94/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/932
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-autolanding/94
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-autolanding/94
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-autolanding/34

review: Needs Fixing (continuous-integration)

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

review: Approve (continuous-integration)

=== modified file 'EventDetails.qml'
--- EventDetails.qml	2014-01-18 03:15:28 +0000
+++ EventDetails.qml	2014-02-01 18:03:08 +0000
@@ -3,6 +3,7 @@
 import Ubuntu.Components.Popups 0.1
 import Ubuntu.Components.ListItems 0.1
 import Ubuntu.Components.Themes.Ambiance 0.1
+import QtOrganizer 5.0
 
 import "GlobalEventModel.js" as GlobalModel
 
@@ -62,6 +63,20 @@
                 contactModel.append( {"name": attendees[j].name } );
             }
         }
+
+        var index = 0;
+        var recurrenceLabel= [ i18n.tr("Once"),
+                              i18n.tr("Daily"),
+                              i18n.tr("Weekly"),
+                              i18n.tr("Monthly"),
+                              i18n.tr("Yearly")];
+
+        if(e.recurrence ) {
+            var recurrenceRule = e.recurrence.recurrenceRules;
+            index = ( recurrenceRule.length > 0 ) ? recurrenceRule[0].frequency : 0;
+        }
+        recurrentHeader.value = recurrenceLabel[index];
+
         // FIXME: need to cache map image to avoid duplicate download every time
         var imageSrc = "http://maps.googleapis.com/maps/api/staticmap?center="+location+
                 "&markers=color:red|"+location+"&zoom=15&size="+mapContainer.width+

=== modified file 'NewEvent.qml'
--- NewEvent.qml	2014-01-01 04:22:40 +0000
+++ NewEvent.qml	2014-02-01 18:03:08 +0000
@@ -1,4 +1,5 @@
 import QtQuick 2.0
+import QtOrganizer 5.0
 import Ubuntu.Components 0.1
 import Ubuntu.Components.Popups 0.1
 import Ubuntu.Components.ListItems 0.1
@@ -73,7 +74,15 @@
                     personEdit.text += ",";
             }
         }
+
+        var index = 0;
+        if(e.recurrence ) {
+            var recurrenceRule = e.recurrence.recurrenceRules;
+            index = ( recurrenceRule.length > 0 ) ? recurrenceRule[0].frequency : 0;
+        }
+        recurrenceOption.selectedIndex = index;
     }
+
     //Save the new or Existing event
     function saveToQtPim() {
         internal.clearFocus()
@@ -91,6 +100,14 @@
                 attendee.name = personEdit.text;
                 event.setDetail(attendee);
             }
+
+            var recurrenceRule = internal.recurrenceValue[ recurrenceOption.selectedIndex ];
+            if( recurrenceRule !== RecurrenceRule.Invalid ) {
+                var rule = Qt.createQmlObject("import QtOrganizer 5.0; RecurrenceRule {}", event.recurrence);
+                rule.frequency = recurrenceRule;
+                event.recurrence.recurrenceRules = [rule];
+            }
+
             internal.eventModel.saveItem(event);
             pageStack.pop();
         }
@@ -274,16 +291,17 @@
 
             Item {
                 width: parent.width
-                height: childrenRect.height
+                height: recurrenceOption.height
                 Label{
                     id: frequencyLabel
                     text: i18n.tr("This happens");
                     anchors.verticalCenter: parent.verticalCenter
                 }
                 OptionSelector{
+                    id: recurrenceOption
                     anchors.right: parent.right
                     width: parent.width - optionSelectorWidth - units.gu(1)
-                    model:[i18n.tr("Once"),i18n.tr("Daily"),i18n.tr("Weekly"),i18n.tr("Monthly"),i18n.tr("Yearly")]
+                    model: internal.recurrenceLabel
                 }
             }
 
@@ -316,6 +334,17 @@
     QtObject {
         id: internal
         property var eventModel;
+        property var recurrenceValue: [ RecurrenceRule.Invalid,
+            RecurrenceRule.Daily,
+            RecurrenceRule.Weekly,
+            RecurrenceRule.Monthly,
+            RecurrenceRule.Yearly];
+
+        property var recurrenceLabel: [ i18n.tr("Once"),
+            i18n.tr("Daily"),
+            i18n.tr("Weekly"),
+            i18n.tr("Monthly"),
+            i18n.tr("Yearly")];
 
         function clearFocus() {
             Qt.inputMethod.hide()