1
=== modified file 'EventRepetition.qml'
2
--- EventRepetition.qml	2014-10-22 14:03:01 +0000
3
+++ EventRepetition.qml	2015-04-12 05:02:40 +0000
4
@@ -90,7 +90,7 @@
5
90
90
6
91
            }
91
            }
7
92
        }
92
        }
9
93
           recurrenceOption.selectedIndex = index;
93
        recurrenceOption.selectedIndex = index;
10
94
    }
94
    }
11
95
95
12
96
    head.backAction: Action{
96
    head.backAction: Action{
13
@@ -100,19 +100,37 @@
14
100
            var recurrenceRule = Defines.recurrenceValue[ recurrenceOption.selectedIndex ];
100
            var recurrenceRule = Defines.recurrenceValue[ recurrenceOption.selectedIndex ];
15
101
            if (recurrenceRule !== RecurrenceRule.Invalid) {
101
            if (recurrenceRule !== RecurrenceRule.Invalid) {
16
102
                rule.frequency = recurrenceRule;
102
                rule.frequency = recurrenceRule;
30
103
                if (recurrenceOption.selectedIndex > 0) {
103
                switch(recurrenceOption.selectedIndex){
31
104
                    rule.daysOfWeek = eventUtils.getDaysOfWeek(recurrenceOption.selectedIndex,weekDays );
104
                case 1: //daily
32
105
                    if (limitOptions.selectedIndex === 1
105
                case 2: //weekly
33
106
                            && recurrenceOption.selectedIndex > 0
106
                case 3: //weekly
34
107
                            && limitCount.text != "") {
107
                case 4: //weekly
35
108
                        rule.limit =  parseInt(limitCount.text);
108
                case 5: //weekly
36
109
                    }
109
                    rule.daysOfWeek = eventUtils.getDaysOfWeek(recurrenceOption.selectedIndex, weekDays );
37
110
                    else if (limitOptions.selectedIndex === 2 && recurrenceOption.selectedIndex > 0) {
110
                    break;
38
111
                        rule.limit =  datePick.date;
111
                case 6: //monthly
39
112
                    }
112
                    rule.daysOfMonth = [date.getDate()];
40
113
                    else {
113
                    break;
41
114
                        rule.limit = undefined;
114
                case 7: //yearly
42
115
                    }
115
                    rule.monthsOfYear = [date.getMonth()];
43
116
                    rule.daysOfMonth = [date.getDate()];
44
117
                    break;
45
118
                case 0: //once
46
119
                default:
47
120
                    //it should not come here
48
121
                    break;
49
122
                }
50
123
51
124
                if (limitOptions.selectedIndex === 1
52
125
                        && recurrenceOption.selectedIndex > 0
53
126
                        && limitCount.text != "") {
54
127
                    rule.limit =  parseInt(limitCount.text);
55
128
                }
56
129
                else if (limitOptions.selectedIndex === 2 && recurrenceOption.selectedIndex > 0) {
57
130
                    rule.limit =  datePick.date;
58
131
                }
59
132
                else {
60
133
                    rule.limit = undefined;
61
116
                }
134
                }
62
117
            }
135
            }
63
118
            else {
136
            else {
Reviewer	Review Type	Date Requested	Status
Alan Pope 🍺🐧🐱 🦄 (community)		2015-04-12	Approve on 2015-04-12
Ubuntu Phone Apps Jenkins Bot	continuous-integration		Approve on 2015-04-12
Review via email: mp+255919@code.launchpad.net