Merge lp:~pkunal-parmar/ubuntu-calendar-app/nextYearFix into lp:ubuntu-calendar-app

[Kunal Parmar]

Fix for "Buffered next year is wrong" from observation reported by jacekn on
https://bugs.launchpad.net/ubuntu-calendar-app/+bug/1222846

"If I do it slowly and move it just enough to see the year it is initially showing previous year. Then when I scroll a bit more then is short lock up and year is update to what it should be."

Fix for "Buffered next year is wrong" from observation reported by jacekn on
https://bugs.launchpad.net/ubuntu-calendar-app/+bug/1222846

"If I do it slowly and move it just enough to see the year it is initially showing previous year. Then when I scroll a bit more then is short lock up and year is update to what it should be."

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

PASSED: Continuous integration, rev:173
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/223/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/332
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/223
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/223
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/57

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

review: Approve (continuous-integration)

[Olivier Tilloy (osomon)]

This fixes the issue raised by Jacek. However this code could be made much easier to read. How about:

    property var year: getDateFromYear(getYear())
    function getYear() {
        switch( root.indexType(index)) {
        case 0:
            return currentYear.getFullYear() - 1
        case -1:
            return currentYear.getFullYear() + 1
        case 1:
            return currentYear.getFullYear()
        }
    }

And while we’re at it, I don’t understand how come case 0 is not for current year, -1 for previous and +1 for next, as function indexType(…) documents it. This is confusing, can you shed a light on this?

review: Needs Fixing

[lp:~pkunal-parmar/ubuntu-calendar-app/nextYearFix]

174. By Kunal Parmar on 2013-12-14

merge from trunk

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

PASSED: Continuous integration, rev:174
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/227/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/445
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/227
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/227
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/61

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

review: Approve (continuous-integration)

[lp:~pkunal-parmar/ubuntu-calendar-app/nextYearFix]

175. By Kunal Parmar on 2013-12-14

PathView changed

[Kunal Parmar (pkunal-parmar)]

> And while we’re at it, I don’t understand how come case 0 is not for current
> year, -1 for previous and +1 for next, as function indexType(…) documents it.
> This is confusing, can you shed a light on this?

This was the case due to how Path was created in PathView, now I changed path in pathview and it works as expected.

0 = visible item
-1 = previous item
1 = next item

Please review again

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

FAILED: Continuous integration, rev:175
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/228/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/446
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/228
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/228
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/62

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

review: Needs Fixing (continuous-integration)

[lp:~pkunal-parmar/ubuntu-calendar-app/nextYearFix]

176. By Kunal Parmar on 2013-12-14

yearview horizontal scrolling fix

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

FAILED: Continuous integration, rev:176
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/229/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/447
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/229
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/229
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/63

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

review: Needs Fixing (continuous-integration)

[lp:~pkunal-parmar/ubuntu-calendar-app/nextYearFix]

177. By Kunal Parmar on 2013-12-28

Autopilot for YearView fixed

178. By Kunal Parmar on 2013-12-28

weekview autopilot test fix

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

FAILED: Continuous integration, rev:178
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/235/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/547
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/235
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/235
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/69

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

review: Needs Fixing (continuous-integration)

[lp:~pkunal-parmar/ubuntu-calendar-app/nextYearFix]

179. By Kunal Parmar on 2014-01-01

delay year update rollback

180. By Kunal Parmar on 2014-01-01

merge from trunk

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

PASSED: Continuous integration, rev:180
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/236/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/563
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/236
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/236
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/70

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

review: Approve (continuous-integration)

[Olivier Tilloy (osomon)]

82 + //To make horizontal movement smooth, not using bindig for year
83 + /*Component.onCompleted: {
84 + year = getYear();
85 + }
86 +
87 + Connections{
88 + target:root
89 + onMovementEnded: {
90 + //update only when movement ends, to avoid calculation while animation
91 + year = getYear();
92 + }
93 + }*/
94 +

Is this commented out code a leftover? Can it be removed?

[Olivier Tilloy (osomon)]

71 QtObject{
72 id: intern
73 - property var startYear: getDateFromYear(currentYear.getFullYear()-1);
74 + property var startYear: currentYear;
75 }

It looks like this 'intern' object has become useless, can’t we remove it and replace all instances of intern.startYear with currentYear?

[Olivier Tilloy (osomon)]

121 months = year_grid.select_many("MonthComponent")
122 self.assert_current_year_is_default_one(months[0])
123
124 - february = months[1]
125 + february = months[0]

No way February is the first month of the year.
select_many(…) doesn’t guarantee the order of the returned elements, which is why it seems January doesn’t come first, so hardcoding the index of the month is unreliable and this test is flaky.
What you need to do is to sort the list of months using their properties before accessing them by index. Something like that:

  months.sort(key=lambda month: month.monthDate)

With that, you can revert the index change, you will be guaranteed that february == months[1]

review: Needs Fixing

[Kunal Parmar (pkunal-parmar)]

> 82 + //To make horizontal movement smooth, not using bindig for
> year
> 83 + /*Component.onCompleted: {
> 84 + year = getYear();
> 85 + }
> 86 +
> 87 + Connections{
> 88 + target:root
> 89 + onMovementEnded: {
> 90 + //update only when movement ends, to avoid
> calculation while animation
> 91 + year = getYear();
> 92 + }
> 93 + }*/
> 94 +
>
> Is this commented out code a leftover? Can it be removed?

Hi, I will remove it for now,
But it's possible, can you checkout this code and see how it works ?
This code I wrote to avoid lag while changing year by swiping left right. on my device it seems to work good, I commented out code as it was failing test case.

But if you find code it good then I can try to fix testcase instead and keep this code.

[Kunal Parmar (pkunal-parmar)]

> 71 QtObject{
> 72 id: intern
> 73 - property var startYear:
> getDateFromYear(currentYear.getFullYear()-1);
> 74 + property var startYear: currentYear;
> 75 }
>
> It looks like this 'intern' object has become useless, can’t we remove it and
> replace all instances of intern.startYear with currentYear?

removed

[lp:~pkunal-parmar/ubuntu-calendar-app/nextYearFix]

181. By Kunal Parmar on 2014-01-11

Commented out code removed

182. By Kunal Parmar on 2014-01-11

Intern object in yearview removed

183. By Kunal Parmar on 2014-01-11

test case fix

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

PASSED: Continuous integration, rev:183
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/238/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/654
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/238
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/238
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/72

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

review: Approve (continuous-integration)

[Kunal Parmar (pkunal-parmar)]

> 121 months = year_grid.select_many("MonthComponent")
> 122 self.assert_current_year_is_default_one(months[0])
> 123
> 124 - february = months[1]
> 125 + february = months[0]
>
> No way February is the first month of the year.
> select_many(…) doesn’t guarantee the order of the returned elements, which is
> why it seems January doesn’t come first, so hardcoding the index of the month
> is unreliable and this test is flaky.
> What you need to do is to sort the list of months using their properties
> before accessing them by index. Something like that:
>
> months.sort(key=lambda month: month.monthDate)
>

Done, can you review again
> With that, you can revert the index change, you will be guaranteed that
> february == months[1]

[Olivier Tilloy (osomon)]

> > 82 + //To make horizontal movement smooth, not using bindig for
> > year
> > 83 + /*Component.onCompleted: {
> > 84 + year = getYear();
> > 85 + }
> > 86 +
> > 87 + Connections{
> > 88 + target:root
> > 89 + onMovementEnded: {
> > 90 + //update only when movement ends, to avoid
> > calculation while animation
> > 91 + year = getYear();
> > 92 + }
> > 93 + }*/
> > 94 +
> >
> > Is this commented out code a leftover? Can it be removed?
>
> Hi, I will remove it for now,
> But it's possible, can you checkout this code and see how it works ?
> This code I wrote to avoid lag while changing year by swiping left right. on
> my device it seems to work good, I commented out code as it was failing test
> case.
>
> But if you find code it good then I can try to fix testcase instead and keep
> this code.

Let’s do this in a separate branch/MR, please. I’ll gladly test it then.

[Olivier Tilloy (osomon)]

Because of bug #1268574 and bug #1268640, I fail to run the autopilot tests both locally and on my device (Galaxy Nexus). Therefore I cannot verify that this code doesn’t introduce regressions, even though it seems to fix the issue it claims it fixes.

[Olivier Tilloy (osomon)]

119 months = year_grid.select_many("MonthComponent")
120 self.assert_current_year_is_default_one(months[0])
121
122 + months.sort(key=lambda month: month.monthDate)

This works, but for corectness the sort should be done before asserting anything on the months:

    months = year_grid.select_many("MonthComponent")
    months.sort(key=lambda month: month.monthDate)
    self.assert_current_year_is_default_one(months[0])

review: Needs Fixing

[Olivier Tilloy (osomon)]

105 + timeline = header.select_many("TimeLineHeaderComponent")[1]
118 + year_grid = self.year_view.select_many("QQuickGridView")[1]
131 + selected_month = month_view.select_many("MonthComponent")[1]
140 + year_grid = self.year_view.select_many("QQuickGridView")[1]

As I pointed out earlier, select_many(…) doesn’t guarantee the return order, so this might break at any point in time. If you want to get a specific component, either use specific properties like the objectName or a property that identifies it unambiguously, or sort the list returned by select_many(…) using an unambiguous key.

review: Needs Fixing

[lp:~pkunal-parmar/ubuntu-calendar-app/nextYearFix]

184. By Kunal Parmar on 2014-01-31

YearView autopilot text fix

185. By Kunal Parmar on 2014-01-31

Other testcase fixed

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

FAILED: Continuous integration, rev:185
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/265/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/874/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/265/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/265/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/99/console

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

review: Needs Fixing (continuous-integration)

[lp:~pkunal-parmar/ubuntu-calendar-app/nextYearFix]

186. By Kunal Parmar on 2014-01-31

error resolved

187. By Kunal Parmar on 2014-01-31

pyflakes error resolved

188. By Kunal Parmar on 2014-01-31

pyflakes resolved

189. By Kunal Parmar on 2014-01-31

merge from trunk

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

FAILED: Continuous integration, rev:188
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/266/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/875
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/266
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/266
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/100

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:189
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/267/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/876
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/267
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/267
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/101

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

review: Needs Fixing (continuous-integration)

[lp:~pkunal-parmar/ubuntu-calendar-app/nextYearFix]

190. By Kunal Parmar on 2014-01-31

WeekView test case fix

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

FAILED: Continuous integration, rev:190
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/268/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/877
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/268
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/268
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/102

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

review: Needs Fixing (continuous-integration)

[lp:~pkunal-parmar/ubuntu-calendar-app/nextYearFix]

191. By Kunal Parmar on 2014-01-31

trobleshooting test

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

FAILED: Continuous integration, rev:191
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/271/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/880
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/271
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/271
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/105

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

review: Needs Fixing (continuous-integration)

[lp:~pkunal-parmar/ubuntu-calendar-app/nextYearFix]

192. By Kunal Parmar on 2014-01-31

test fail fixed

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

PASSED: Continuous integration, rev:192
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/272/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/881
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/272
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/272
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/106

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

review: Approve (continuous-integration)

[Kunal Parmar (pkunal-parmar)]

> 105 + timeline = header.select_many("TimeLineHeaderComponent")[1]
> 118 + year_grid = self.year_view.select_many("QQuickGridView")[1]
> 131 + selected_month = month_view.select_many("MonthComponent")[1]
> 140 + year_grid = self.year_view.select_many("QQuickGridView")[1]
>
> As I pointed out earlier, select_many(…) doesn’t guarantee the return order,
> so this might break at any point in time. If you want to get a specific
> component, either use specific properties like the objectName or a property
> that identifies it unambiguously, or sort the list returned by select_many(…)
> using an unambiguous key.

I fixed hard coded index issue, kindly have another look

[Olivier Tilloy (osomon)]

130 + compArray = header.select_many("TimeLineHeaderComponent")
131 + timeline = None
132 +
133 + for tilelineComponent in compArray:
134 + if tilelineComponent.isCurrentItem:
135 + timeline = tilelineComponent
136 + break

Autopilot allows to do this in a much simpler way:

    timeline = header.select_single("TimeLineHeaderComponent", isCurrentItem=True)

The same applies to get_current_year() and to selected_month.

review: Needs Fixing

[lp:~pkunal-parmar/ubuntu-calendar-app/nextYearFix]

193. By Kunal Parmar on 2014-02-10

Merge from trunk

194. By Kunal Parmar on 2014-02-10

review comment

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

PASSED: Continuous integration, rev:194
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/278/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1205
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/278
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/278
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/112

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

review: Approve (continuous-integration)

[Olivier Tilloy (osomon)]

Looks good now, thanks!

review: Approve

=== modified file 'MonthView.qml'
--- MonthView.qml	2014-01-09 23:15:57 +0000
+++ MonthView.qml	2014-02-10 13:56:10 +0000
@@ -14,7 +14,7 @@
     PathViewBase{
         id: monthViewPath
 
-        property var startMonth: addMonth(currentMonth,-1);
+        property var startMonth: currentMonth;
 
         anchors.top:parent.top
 
@@ -44,6 +44,8 @@
         }
 
         delegate: MonthComponent{
+            property bool isCurrentItem: index === monthViewPath.currentIndex
+
             width: parent.width - units.gu(5)
             height: parent.height - units.gu(5)
 
@@ -54,7 +56,7 @@
                 case 0:
                     return monthViewPath.startMonth;
                 case -1:
-                    return monthViewPath.addMonth(monthViewPath.startMonth,2);
+                    return monthViewPath.addMonth(monthViewPath.startMonth,-1);
                 case 1:
                     return monthViewPath.addMonth(monthViewPath.startMonth,1);
                 }

=== modified file 'PathViewBase.qml'
--- PathViewBase.qml	2013-09-16 14:04:01 +0000
+++ PathViewBase.qml	2014-02-10 13:56:10 +0000
@@ -9,11 +9,12 @@
     signal nextItemHighlighted();
     signal previousItemHighlighted();
 
+    preferredHighlightBegin: 0.5
+    preferredHighlightEnd: 0.5
+
     path: Path {
-        startX: -(root.width/2); startY: root.height/2
-        PathLine { relativeX: root.width; relativeY: 0 }
-        PathLine { relativeX: root.width; relativeY: 0 }
-        PathLine { relativeX: root.width; relativeY: 0 }
+        startX: -(root.width); startY: root.height/2
+        PathLine { x: (root.width)*2  ; relativeY: 0;  }
     }
 
     // 0= current index, -1= previous index, 1 next index

=== modified file 'TimeLineHeader.qml'
--- TimeLineHeader.qml	2013-09-28 09:37:52 +0000
+++ TimeLineHeader.qml	2014-02-10 13:56:10 +0000
@@ -64,7 +64,7 @@
             case 0:
                 return date;
             case -1:
-                return date.addDays(14);
+                return date.addDays(-7);
             case 1:
                 return date.addDays(7);
             }

=== modified file 'WeekView.qml'
--- WeekView.qml	2014-01-28 01:51:29 +0000
+++ WeekView.qml	2014-02-10 13:56:10 +0000
@@ -31,7 +31,7 @@
         id: weekViewPath
 
         property var visibleWeek: dayStart.weekStart(Qt.locale().firstDayOfWeek);
-        property var weekStart: weekViewPath.visibleWeek.addDays(-7)
+        property var weekStart: weekViewPath.visibleWeek
 
         width: parent.width
         height: root.height - weekViewPath.y
@@ -71,7 +71,7 @@
                     return weekViewPath.weekStart;
                 case -1:
                     var weekStartDay= weekViewPath.weekStart.weekStart(Qt.locale().firstDayOfWeek);
-                    return weekStartDay.addDays(14);
+                    return weekStartDay.addDays(-7);
                 case 1:
                     var weekStartDay = weekViewPath.weekStart.weekStart(Qt.locale().firstDayOfWeek);
                     return weekStartDay.addDays(7);

=== modified file 'YearView.qml'
--- YearView.qml	2014-01-09 23:15:57 +0000
+++ YearView.qml	2014-02-10 13:56:10 +0000
@@ -25,25 +25,21 @@
         return new Date(year,0,1,0,0,0,0);
     }
 
-    QtObject{
-        id: intern
-        property var startYear: getDateFromYear(currentYear.getFullYear()-1);
-    }
-
     delegate: GridView{
         id: yearView
         clip: true
 
+        property bool isCurrentItem: index == root.currentIndex
         property var year: getYear();
 
         function getYear() {
             switch( root.indexType(index)) {
             case 0:
-                return intern.startYear;
+                return currentYear;
             case -1:
-                return getDateFromYear(intern.startYear.getFullYear() - 1);
+                return getDateFromYear(currentYear.getFullYear() - 1);
             case 1:
-                return getDateFromYear(intern.startYear.getFullYear() + 1);
+                return getDateFromYear(currentYear.getFullYear() + 1);
             }
         }
 

=== modified file 'tests/autopilot/calendar_app/tests/test_weekview.py'
--- tests/autopilot/calendar_app/tests/test_weekview.py	2014-01-09 23:30:55 +0000
+++ tests/autopilot/calendar_app/tests/test_weekview.py	2014-02-10 13:56:10 +0000
@@ -70,7 +70,8 @@
 
     def _get_date_label_headers(self):
         header = self.main_view.select_single(objectName="weekHeader")
-        timeline = header.select_many("TimeLineHeaderComponent")[0]
+        timeline = header.select_single("TimeLineHeaderComponent",
+                                        isCurrentItem=True)
         dateLabels = timeline.select_many("Label", objectName="dateLabel")
         return dateLabels
 

=== modified file 'tests/autopilot/calendar_app/tests/test_yearview.py'
--- tests/autopilot/calendar_app/tests/test_yearview.py	2014-01-09 23:28:15 +0000
+++ tests/autopilot/calendar_app/tests/test_yearview.py	2014-02-10 13:56:10 +0000
@@ -10,7 +10,6 @@
 """
 
 from datetime import datetime
-
 from autopilot.matchers import Eventually
 from testtools.matchers import Equals, NotEquals
 
@@ -28,13 +27,19 @@
 
         self.year_view = self.main_view.get_year_view()
 
+    def get_current_year(self):
+        return self.year_view.select_single("QQuickGridView",
+                                            isCurrentItem=True)
+
     def test_selecting_a_month_switch_to_month_view(self):
         """It must be possible to select a month and open the month view."""
 
         # TODO: the component indexed at 1 is the one currently displayed,
         # investigate a way to validate this assumption visually.
-        year_grid = self.year_view.select_many("QQuickGridView")[0]
+        year_grid = self.get_current_year()
+        self.assertThat(year_grid, NotEquals(None))
         months = year_grid.select_many("MonthComponent")
+        months.sort(key=lambda month: month.monthDate)
         self.assert_current_year_is_default_one(months[0])
 
         february = months[1]
@@ -48,7 +53,11 @@
 
         month_view = self.main_view.get_month_view()
         self.assertThat(month_view.visible, Eventually(Equals(True)))
-        selected_month = month_view.select_many("MonthComponent")[0]
+
+        selected_month = month_view.select_single("MonthComponent",
+                                                  isCurrentItem=True)
+
+        self.assertThat(selected_month, NotEquals(None))
 
         self.assertThat(self.main_view.get_year(selected_month),
                         Equals(expected_year))
@@ -108,13 +117,13 @@
         if now.month > 6:
             self.drag_page_up()
 
-        year_grid = self.year_view.select_many("QQuickGridView")[0]
+        year_grid = self.get_current_year()
+        self.assertThat(year_grid, NotEquals(None))
         months = year_grid.select_many("MonthComponent")
 
         for month in months:
             current_month_label = month.select_single(
                 "Label", objectName="monthLabel")
-
             if current_month_name == current_month_label.text:
                 return month