Merge lp:~mihirsoni/ubuntu-calendar-app/1438910 into lp:ubuntu-calendar-app

[Mihir Soni]

Fixed bug #1438910

Fixed bug #1438910

[lp:~mihirsoni/ubuntu-calendar-app/1438910]

622. By Mihir Soni on 2015-04-02

Removed debuged line

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

FAILED: Continuous integration, rev:622
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1123/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2484
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2484/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/594
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/120

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1123/rebuild

review: Needs Fixing (continuous-integration)

[Nekhelesh Ramananthan (nik90)]

Looking at Popey's screenshot https://i.imgur.com/OPLlBBK.png and his comment about the monthly/yearly being hidden inside the option selector and not being so obvious to the user, I had an idea.

Why not remove the entire option selector and just display the options in a listview spanning the entire page? That's how the other apps do it. Below are some examples,

https://imgur.com/rPRKccg&lLAACaw

[Mihir Soni (mihirsoni)]

Hi nekhelesh ,

we tried, but we have more options for users after selecting those options.

Like , if you select Daily , then you get list of all days and after that user provide information to Number of occurrence to be happen.

Would appreciate some designer feedback on same.

[lp:~mihirsoni/ubuntu-calendar-app/1438910]

623. By Mihir Soni on 2015-04-03

resolved height issue as of now

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

FAILED: Continuous integration, rev:623
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1124/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2491
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2491/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/595
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/121

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1124/rebuild

review: Needs Fixing (continuous-integration)

[Kunal Parmar (pkunal-parmar)]

> FAILED: Continuous integration, rev:623
> http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1124/
> Executed test runs:
> UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2491
> deb: http://91.189.93.70:8080/job/generic-mediumtests-
> utopic/2491/artifact/work/output/*zip*/output.zip
> SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-
> amd64-ci/595
> SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-
> amd64-ci/121
>
> Click here to trigger a rebuild:
> http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1124/rebuild

If you merge latest trunk, this fail should be resolved.

[Kunal Parmar (pkunal-parmar)]

I added comment inline, anyway I am proposing another MR for this fix.

review: Needs Fixing

Unmerged revisions

623. By Mihir Soni on 2015-04-03

resolved height issue as of now

622. By Mihir Soni on 2015-04-02

Removed debuged line

621. By Mihir Soni on 2015-04-02

 Fixed bug#1438910

=== modified file 'EventRepetition.qml'
--- EventRepetition.qml	2014-10-22 14:03:01 +0000
+++ EventRepetition.qml	2015-04-03 16:45:43 +0000
@@ -100,8 +100,23 @@
             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
+                            rule.daysOfMonth = [date.getMonth()];
+                            break;
+                        case 7:
+                            //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 != "") {
@@ -143,7 +158,7 @@
             }
 
             model: Defines.recurrenceLabel
-            containerHeight: itemHeight * 4
+            containerHeight: itemHeight * 9
             onExpandedChanged: Qt.inputMethod.hide();
         }