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

[Mihir Soni]

Fixed following bugs :

[1]Bug #1371863
[2]Bug #1371865
[3]Bug #1371866
[4]Bug #1371867

Fixed following bugs :

[1]Bug #1371863
[2]Bug #1371865
[3]Bug #1371866
[4]Bug #1371867

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

PASSED: Continuous integration, rev:466
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/833/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/409
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/409/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/391

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

review: Approve (continuous-integration)

[David Planella (dpm)]

Wow, that was quick, thanks Mihir!

Just a couple of small things I've noticed:

- bug 1371863 still seems not to be fixed. I.e. I still see a "Repeat": http://i.imgur.com/W9XFmxp.png
- What will be shown as "until" text when I set the end date of a recurring event?
- See other comments inline

review: Needs Fixing

[David Planella (dpm)]

Inline comments

review: Needs Fixing

[Nekhelesh Ramananthan (nik90)]

In my opinion I think "Repeats" is a better wording than "This Happens". Can we use that instead every where. If changed to "Repeats" please do that in the "Event Details" page also.

@David can we get your opinion on this?

Also please provide a more descriptive commit message for the MP please. It should be clear what exactly it fixes when looking through the commit log of the trunk later.

review: Needs Fixing

[Mihir Soni (mihirsoni)]

Hi David.

If we remove Repeat from header it doesn't look consistent when other controls are visible :- http://imgur.com/jSbm9KV

-Yes "until" will displayed when occurrence ends with date.
-I have incorporate inline comments in next commit.

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

467. By Mihir Soni on 2014-09-20

code indetentation

468. By Mihir Soni on 2014-09-20

Resolved editing current occurence event issue

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

PASSED: Continuous integration, rev:468
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/838/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/432
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/432/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/396

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

review: Approve (continuous-integration)

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

469. By Mihir Soni on 2014-09-20

Reverted changes which were by mistake

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

PASSED: Continuous integration, rev:469
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/839/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/433
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/433/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/397

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

review: Approve (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

I'd agree that "This happens" is clumsy wording. I'd rather see "Repeats"

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

470. By Mihir Soni on 2014-09-20

Replaced This happens with Repeats

471. By Mihir Soni on 2014-09-20

mege from trunk

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

PASSED: Continuous integration, rev:471
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/840/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/437
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/437/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/398

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

review: Approve (continuous-integration)

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

472. By Mihir Soni on 2014-09-20

Merge from trunk

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

PASSED: Continuous integration, rev:472
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/841/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/438
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/438/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/399

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

review: Approve (continuous-integration)

[David Planella (dpm)]

Added some trivial inline comments. Thanks!

review: Needs Fixing

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

473. By Mihir Soni on 2014-09-22

Merge from trunk

474. By Mihir Soni on 2014-09-22

changes as per review comments

[David Planella (dpm)]

Hm, the inline comment about spaces in the if statement still does not seem to be addressed.

review: Needs Fixing

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

475. By Mihir Soni on 2014-09-22

code formatted

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

PASSED: Continuous integration, rev:474
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/848/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/454
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/454/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/406

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:475
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/849/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/455
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/455/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/407

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

review: Approve (continuous-integration)

[David Planella (dpm)]

Still the space after the 'if' is missing. See the inline comment.

review: Needs Fixing

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

476. By Mihir Soni on 2014-09-22

Following coding guidlines

[Mihir Soni (mihirsoni)]

Hey david,

sorry for making large review for trivial MR, thanks for the reference. I'll keep following that for coding guidelines.

[David Planella (dpm)]

LGTM now, thanks!

review: Approve

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

PASSED: Continuous integration, rev:476
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/850/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/457
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/457/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/408

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

review: Approve (continuous-integration)

=== modified file 'EventRepetition.qml'
--- EventRepetition.qml	2014-09-16 11:11:12 +0000
+++ EventRepetition.qml	2014-09-22 19:05:28 +0000
@@ -33,7 +33,7 @@
     property var isEdit
 
     visible: false
-    title: i18n.tr("Repeat")
+    title: i18n.tr("Repeats")
 
     EventUtils{
         id:eventUtils
@@ -89,22 +89,24 @@
         iconName: "back"
         onTriggered: {
             var recurrenceRule = Defines.recurrenceValue[ recurrenceOption.selectedIndex ];
-            if( recurrenceRule !== RecurrenceRule.Invalid ) {
+            if (recurrenceRule !== RecurrenceRule.Invalid) {
                 rule.frequency = recurrenceRule;
-                if(recurrenceOption.selectedIndex > 0) {
+                if (recurrenceOption.selectedIndex > 0) {
                     rule.daysOfWeek = eventUtils.getDaysOfWeek(recurrenceOption.selectedIndex,weekDays );
-                    if(limitOptions.selectedIndex === 1 && recurrenceOption.selectedIndex > 0){
+                    if (limitOptions.selectedIndex === 1
+                            && recurrenceOption.selectedIndex > 0
+                            && limitCount.text != "") {
                         rule.limit =  parseInt(limitCount.text);
                     }
-                    else if(limitOptions.selectedIndex === 2 && recurrenceOption.selectedIndex > 0){
+                    else if (limitOptions.selectedIndex === 2 && recurrenceOption.selectedIndex > 0) {
                         rule.limit =  datePick.date;
                     }
-                    else{
+                    else {
                         rule.limit = undefined;
                     }
                 }
             }
-            else{
+            else {
                 rule.frequency = 0
             }
             pop()

=== modified file 'NewEvent.qml'
--- NewEvent.qml	2014-09-21 09:39:21 +0000
+++ NewEvent.qml	2014-09-22 19:05:28 +0000
@@ -367,6 +367,7 @@
                     anchors.right: parent.right
                     width: parent.width / 5
                     visible: !allDayEventCheckbox.checked
+                    horizontalAlignment: Text.AlignRight
 
                     MouseArea{
                         anchors.fill: parent
@@ -407,10 +408,10 @@
                 NewEventEntryField{
                     id: endTimeInput
                     objectName: "endTimeInput"
-
                     text: ""
                     width: parent.width / 5
                     anchors.right: parent.right
+                    horizontalAlignment: Text.AlignRight
 
                     MouseArea{
                         anchors.fill: parent