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

[Mihir Soni]

Resolved bug #1335512

Resolved bug #1335512

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

FAILED: Continuous integration, rev:339
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/588/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/731
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/731/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/146

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

review: Needs Fixing (continuous-integration)

[Nicholas Skaggs (nskaggs)]

This fails due to https://bugs.launchpad.net/ubuntu-calendar-app/+bug/1335241, which affects trunk. Once a fix is released to trunk, I will rebuild this.

[Nicholas Skaggs (nskaggs)]

I'd also like to see a test added for this :-)

[Mihir Soni (mihirsoni)]

This MR got merged automatically, without any reviews.

[Nicholas Skaggs (nskaggs)]

Mihir, this is not in trunk.

[Nicholas Skaggs (nskaggs)]

Look at the MP for 340; and check trunk yourself. It's not there:

http://bazaar.launchpad.net/~ubuntu-calendar-dev/ubuntu-calendar-app/trunk/revision/340?start_revid=340

Unmerged revisions

=== modified file 'DayView.qml'
--- DayView.qml	2014-05-31 04:38:48 +0000
+++ DayView.qml	2014-07-01 13:15:28 +0000
@@ -38,6 +38,16 @@
                 startX: -(dayHeader.width/7); startY: dayHeader.height/2
                 PathLine { x: (dayHeader.width/7) * 8  ; relativeY: 0;  }
             }
+            onDateSelected: {
+                if(date < currentDay){
+                    currentDay = currentDay.addDays(-1);
+                    dayHeader.decrementCurrentIndex()
+                }
+                else if( date > currentDay){
+                    currentDay = currentDay.addDays(1);
+                    dayHeader.incrementCurrentIndex();
+                }
+            }
         }
 
         PathViewBase{