ubuntu-touch-coreapps-reviewers team mailing list archive

[Mihir Soni <mihirsoni.123@xxxxxxxxx>]

Mihir Soni has proposed merging lp:~mihirsoni/ubuntu-calendar-app/1438910 into lp:ubuntu-calendar-app.

Commit message:
Fixed bug #1438910

Requested reviews:
  Ubuntu Calendar Developers (ubuntu-calendar-dev)

For more details, see:
https://code.launchpad.net/~mihirsoni/ubuntu-calendar-app/1438910/+merge/255123

Fixed bug #1438910
-- 
Your team Ubuntu Calendar Developers is requested to review the proposed merge of lp:~mihirsoni/ubuntu-calendar-app/1438910 into lp:ubuntu-calendar-app.

=== modified file 'EventRepetition.qml'
--- EventRepetition.qml	2014-10-22 14:03:01 +0000
+++ EventRepetition.qml	2015-04-02 18:06:09 +0000
@@ -100,8 +100,25 @@
             var recurrenceRule = Defines.recurrenceValue[ recurrenceOption.selectedIndex ];
             if (recurrenceRule !== RecurrenceRule.Invalid) {
                 rule.frequency = recurrenceRule;
+                if( recurrenceOption.selectedIndex < 5 ){
+                    //If it is daily or weekly or alternate days
+                    rule.daysOfWeek = eventUtils.getDaysOfWeek(recurrenceOption.selectedIndex,weekDays );
+                } else {
+                    //Monthly or Yearly
+                    switch(recurrenceOption.selectedIndex){
+                        case 6:
+                            //Monthly
+                            console.log("Monthl " + RecurrenceRule.Monthly);
+                            rule.daysOfMonth = [date.getMonth()];
+                            break;
+                        case 7:
+                            //Yearly
+                            console.log("Yearly " + RecurrenceRule.Yearly);
+                            rule.daysOfYear = [date.getYear];
+                    }
+
+                }
                 if (recurrenceOption.selectedIndex > 0) {
-                    rule.daysOfWeek = eventUtils.getDaysOfWeek(recurrenceOption.selectedIndex,weekDays );
                     if (limitOptions.selectedIndex === 1
                             && recurrenceOption.selectedIndex > 0
                             && limitCount.text != "") {