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

[Kunal Parmar]

Year view optimization

Year view optimization

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

PASSED: Continuous integration, rev:204
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/299/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1554
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/299
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/299
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/133

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

review: Approve (continuous-integration)

[Olivier Tilloy (osomon)]

This looks good. I’m sure there are further optimizations to be made, but this already reduces significantly some bottlenecks evidenced by the use of the QML profiler.

review: Approve

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-calendar-app-autolanding/110/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1567
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-autolanding/110
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-autolanding/110
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-autolanding/50

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:205
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/301/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1591
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/301
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/301
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/135

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

review: Needs Fixing (continuous-integration)

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-calendar-app-autolanding/111/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1608
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-autolanding/111
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-autolanding/111
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-autolanding/51

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:206
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/311/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1714
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/311
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/311
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/145

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:207
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/312/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1715
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/312
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/312
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/146

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:207
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/313/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1716
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/313
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/313
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/147

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

review: Needs Fixing (continuous-integration)

[Nicholas Skaggs (nskaggs)]

App appears to be failing to launch sometimes because of the qt 5.0 bug.

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-calendar-app-autolanding/122/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1717
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-autolanding/122
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-autolanding/122
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-autolanding/62

review: Needs Fixing (continuous-integration)

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-calendar-app-autolanding/123/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1719
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-autolanding/123
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-autolanding/123
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-autolanding/63

review: Needs Fixing (continuous-integration)

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-calendar-app-autolanding/124/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1720
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-autolanding/124
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-autolanding/124
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-autolanding/64

review: Needs Fixing (continuous-integration)

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-calendar-app-autolanding/125/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1722
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-autolanding/125
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-autolanding/125
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-autolanding/65

review: Needs Fixing (continuous-integration)

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-calendar-app-autolanding/126/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1724
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-autolanding/126
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-autolanding/126
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-autolanding/66

review: Needs Fixing (continuous-integration)

[Nicholas Skaggs (nskaggs)]

Well, given the results, it seems

calendar_app.tests.test_monthview.TestMonthView.test_monthview_go_to_today_prev_year and calendar_app.tests.test_yearview.TestYearView.test_selecting_a_month_switch_to_month_view are actuall failing.

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-calendar-app-autolanding/127/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1726
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-autolanding/127
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-autolanding/127
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-autolanding/67

review: Needs Fixing (continuous-integration)

[Nicholas Skaggs (nskaggs)]

Both of the aforementioned tests work fine on my local device.. zzzz...

[Nicholas Skaggs (nskaggs)]

Despite the confusing jenkins output there are failures:

Desktop run failures;

pastebin.com/vvVJFxpp

Device failures;

http://pastebin.com/9SWfXLpp

review: Needs Fixing

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-calendar-app-autolanding/128/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1735
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-autolanding/128
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-autolanding/128
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-autolanding/68

review: Needs Fixing (continuous-integration)

[Kunal Parmar (pkunal-parmar)]

Thanks Nicholas,

Calendar does not launch in my desktop as well, something is wrong. Let me have a look.

[Kunal Parmar (pkunal-parmar)]

Now, it works fine on my desktop, there was one variable declared as var instead of int, that was not allowing yearview to be launched and thus whole calendar.

But now it should work fine.

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

FAILED: Continuous integration, rev:208
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/314/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1738
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/314
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/314
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/148

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

review: Needs Fixing (continuous-integration)

[Nicholas Skaggs (nskaggs)]

http://91.189.93.70:8080/job/generic-mediumtests-trusty/1738/testReport/calendar_app.tests.test_calendar/TestMainView/test_new_event_with_mouse_/?

shows

Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/calendar_app/tests/test_calendar.py", line 100, in test_new_event
    Eventually(Not(Is(None))))
  File "/usr/lib/python2.7/dist-packages/testtools/testcase.py", line 406, in assertThat
    raise mismatch_error
MismatchError: After 10.0 seconds test failed: None matches Is(None)

This is the logic to confirm the event was created in the day tab. Might be worth having a look to ensure it's valid.

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-calendar-app-autolanding/131/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1745
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-autolanding/131
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-autolanding/131
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-autolanding/71

review: Needs Fixing (continuous-integration)

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-calendar-app-autolanding/132/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1747
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-autolanding/132
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-autolanding/132
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-autolanding/72

review: Needs Fixing (continuous-integration)

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-calendar-app-autolanding/134/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1757
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-autolanding/134
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-autolanding/134
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-autolanding/74

review: Needs Fixing (continuous-integration)

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-calendar-app-autolanding/135/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1759
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-autolanding/135
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-autolanding/135
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-autolanding/75/console

review: Needs Fixing (continuous-integration)

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-calendar-app-autolanding/136/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1761
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-autolanding/136
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-autolanding/136
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-autolanding/76

review: Needs Fixing (continuous-integration)

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-calendar-app-autolanding/137/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1766
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-autolanding/137
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-autolanding/137
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-autolanding/77

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:209
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/319/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1783
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/319
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/319
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/153

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

review: Needs Fixing (continuous-integration)

[Nicholas Skaggs (nskaggs)]

I did initially find a qt5.2 bug I think with switch_to_tab; trying to see if this still exists. The latest test runs seem to go ok.

[Nicholas Skaggs (nskaggs)]

Never mind, I still see it happening;

http://91.189.93.70:8080/job/generic-mediumtests-trusty/1783/testReport/junit/calendar_app.tests.test_dayview/TestDayView/test_show_current_days_with_mouse_/

Kunal, is there something the day tab does differently than other tabs qml?

review: Needs Information

[Nicholas Skaggs (nskaggs)]

I filed a bug; https://bugs.launchpad.net/ubuntu-calendar-app/+bug/1294181

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-calendar-app-autolanding/138/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1785
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-autolanding/138
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-autolanding/138
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-autolanding/78

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:210
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/320/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1796
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/320
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/320
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/154

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

review: Needs Fixing (continuous-integration)

[Kunal Parmar (pkunal-parmar)]

> Never mind, I still see it happening;
>
> http://91.189.93.70:8080/job/generic-mediumtests-trusty/1783/testReport/junit/
> calendar_app.tests.test_dayview/TestDayView/test_show_current_days_with_mouse_
> /
>
> Kunal, is there something the day tab does differently than other tabs qml?

Hi Nicholas,
Thanks for your support.
this does not looks nice, I will analyze to see if anything is wrong with Calendar.
will ping you once I am confident, that calendar code is fine.

till then lets put this MR on hold.
~Kunal

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-calendar-app-autolanding/140/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1808/console
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-autolanding/140
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-autolanding/140
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-autolanding/80

review: Needs Fixing (continuous-integration)

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-calendar-app-autolanding/142/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1822/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-autolanding/142/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-autolanding/142/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-autolanding/82/console

review: Needs Fixing (continuous-integration)

[Kunal Parmar (pkunal-parmar)]

Now that trunk code is changed, I need to resolve conflict first, I will resolve conflict soon, then we can approve it and merge it.

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

211. By Kunal Parmar on 2014-03-22

merge from trunk

212. By Kunal Parmar on 2014-03-22

MonthView layout issue

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

PASSED: Continuous integration, rev:212
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/331/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1837
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/331
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/331
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/165

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

review: Approve (continuous-integration)

[Kunal Parmar (pkunal-parmar)]

Hi Nicholas, Can you please approve now.

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

213. By Kunal Parmar on 2014-03-26

Merge from trunk

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

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

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

review: Approve (continuous-integration)

=== modified file 'AllDayEventComponent.qml'
--- AllDayEventComponent.qml	2014-02-12 00:08:40 +0000
+++ AllDayEventComponent.qml	2014-03-26 15:09:40 +0000
@@ -36,6 +36,9 @@
     }
 
     function createAllDayEvents() {
+        if(!startDay || startDay === undefined) {
+            return;
+        }
         var sd = startDay.midnight();
         var ed = sd.addDays( (type == ViewType.ViewTypeDay) ? 1 : 7);
         allDayEvents = getAllDayEvents(sd,ed);

=== modified file 'DayView.qml'
--- DayView.qml	2014-03-22 04:43:11 +0000
+++ DayView.qml	2014-03-26 15:09:40 +0000
@@ -22,7 +22,8 @@
 
         ViewHeader{
             id: viewHeader
-            date: currentDay
+            month: currentDay.getMonth()
+            year: currentDay.getFullYear()
         }
 
         TimeLineHeader{

=== modified file 'MonthComponent.qml'
--- MonthComponent.qml	2014-01-11 05:59:53 +0000
+++ MonthComponent.qml	2014-03-26 15:09:40 +0000
@@ -7,7 +7,7 @@
     id: root
     objectName: "MonthComponent"
 
-    property var monthDate;
+    property var currentMonth;
 
     property string dayLabelFontSize: "medium"
     property string dateLabelFontSize: "large"
@@ -21,6 +21,39 @@
 
     height: ubuntuShape.height
 
+    QtObject{
+        id: intern
+
+        property int curMonthDate: currentMonth.getDate()
+        property int curMonth: currentMonth.getMonth()
+        property int curMonthYear: currentMonth.getFullYear()
+
+        property var today: DateExt.today()
+        property int todayDate: today.getDate()
+        property int todayMonth: today.getMonth()
+        property int todayYear: today.getFullYear()
+
+
+        //date from month will start, this date might be from previous month
+        property var monthStart: currentMonth.weekStart( Qt.locale().firstDayOfWeek )
+        property int monthStartDate: monthStart.getDate()
+        property int monthStartMonth: monthStart.getMonth()
+        property int monthStartYear: monthStart.getFullYear()
+
+        property int daysInStartMonth: Date.daysInMonth(monthStartYear, monthStartMonth)
+        property int daysInCurMonth:  Date.daysInMonth(curMonthYear,curMonth)
+
+        //check if current month is start month
+        property bool isCurMonthStartMonth: curMonthDate === monthStartDate
+                        && curMonth === monthStartMonth
+                        && curMonthYear === monthStartYear
+
+        //check current month is same as today's month
+        property bool isCurMonthTodayMonth: todayYear === curMonthYear && todayMonth == curMonth
+        //offset from current month's first date to start date of current month
+        property int offset: isCurMonthStartMonth ? -1 : (daysInStartMonth - monthStartDate)
+    }
+
     UbuntuShape {
         id: ubuntuShape
 
@@ -38,7 +71,9 @@
 
             ViewHeader{
                 id: monthHeader
-                date: root.monthDate
+                month: intern.curMonth
+                year: intern.curMonthYear
+
                 monthLabelFontSize: root.monthLabelFontSize
                 yearLabelFontSize: root.yearLabelFontSize
             }
@@ -68,10 +103,12 @@
                 objectName: "monthGrid"
 
                 property int weekCount : 6
-                property var monthStart: root.monthDate.weekStart( Qt.locale().firstDayOfWeek )
 
                 width: parent.width
-                height: parent.height - monthHeader.height - dayLabelRow.height - units.gu(3)
+                height: parent.height - monthGrid.y
+
+                property int dayWidth: width / 7;
+                property int dayHeight: height / weekCount
 
                 rows: weekCount
                 columns: 7
@@ -91,30 +128,58 @@
         Item{
             id: dateRootItem
 
-            property var date: parent.monthStart.addDays(index);
-            property bool isCurrentMonth: DateExt.isSameMonth(root.monthDate,date)
-
-            width: parent.width / 7;
-            height: parent.height / parent.weekCount
+            property int date: {
+                //try to find date from index and month's first week's first date
+                var temp = intern.daysInStartMonth - intern.offset + index
+                //date exceeds days in startMonth,
+                //this means previous month is over and we are now in current month
+                //to get actual date we need to remove number of days in startMonth
+                if( temp > intern.daysInStartMonth ) {
+                    temp = temp - intern.daysInStartMonth
+                    //date exceeds days in current month
+                    // this means date is from next month
+                    //to get actual date we need to remove number of days in current month
+                    if( temp > intern.daysInCurMonth ) {
+                        temp = temp - intern.daysInCurMonth
+                    }
+                }
+                return temp;
+            }
+
+            property bool isCurrentMonth: {
+                //remove offset from index
+                //if index falls in 1 to no of days in current month
+                //then date is inside current month
+                var temp = index - intern.offset
+                return (temp >= 1 && temp <= intern.daysInCurMonth)
+            }
+
+            property bool isToday: intern.todayDate == date && intern.isCurMonthTodayMonth
+
+            width: parent.dayWidth
+            height: parent.dayHeight
 
             Loader {
                 width: parent.width < parent.height ? parent.width : parent.height
                 height: width
                 anchors.centerIn: parent
-                sourceComponent: date.isSameDay(DateExt.today()) && isCurrentMonth ? highLightComp : undefined
+                sourceComponent: isToday && isCurrentMonth ? highLightComp : undefined
             }
 
             Label{
                 id: dateLabel
                 anchors.centerIn: parent
-                text: date.getDate()
+                width: parent.width
+                text: date
                 horizontalAlignment: Text.AlignHCenter
                 fontSize: root.dateLabelFontSize
                 color: {
-                    if( date.isSameDay(DateExt.today()) && isCurrentMonth ) {
-                        "#2C001E"
-                    } else if( parent.isCurrentMonth ) {
-                        "white"
+                    if( isCurrentMonth ) {
+                        if(isToday) {
+                            "#2C001E"
+                        } else {
+                            "white"
+                        }
                     } else {
                         "#AEA79F"
                     }
@@ -124,7 +189,9 @@
             MouseArea{
                 anchors.fill: parent
                 onClicked: {
-                    root.dateSelected(date);
+                    root.dateSelected(new Date(intern.monthStartYear,
+                                               intern.monthStartMonth,
+                                               intern.monthStartDate+index,0,0,0,0));
                 }
             }
         }

=== modified file 'MonthView.qml'
--- MonthView.qml	2014-03-19 19:46:58 +0000
+++ MonthView.qml	2014-03-26 15:09:40 +0000
@@ -38,9 +38,7 @@
         }
 
         function addMonth(date,month){
-            var temp = new Date(date.getFullYear(),date.getMonth(),1,0,0,0);
-            temp.setMonth(date.getMonth() + month);
-            return temp;
+            return  new Date(date.getFullYear(),date.getMonth()+month,1,0,0,0);
         }
 
         delegate: MonthComponent{
@@ -49,12 +47,12 @@
             width: parent.width - units.gu(5)
             height: parent.height - units.gu(5)
 
-            monthDate: getMonthDate();
+            currentMonth: getMonthDate();
 
             function getMonthDate() {
                 switch( monthViewPath.indexType(index)) {
                 case 0:
-                    return monthViewPath.startMonth;
+                    return monthViewPath.addMonth(monthViewPath.startMonth,0);
                 case -1:
                     return monthViewPath.addMonth(monthViewPath.startMonth,-1);
                 case 1:

=== modified file 'TimeLineBase.qml'
--- TimeLineBase.qml	2014-03-22 03:49:00 +0000
+++ TimeLineBase.qml	2014-03-26 15:09:40 +0000
@@ -38,6 +38,10 @@
     }
 
     function createEvents() {
+        if(!bubbleOverLay || bubbleOverLay == undefined) {
+            return;
+        }
+
         bubbleOverLay.destroyAllChildren();
 
         var startDate = new Date(day).midnight();

=== modified file 'ViewHeader.qml'
--- ViewHeader.qml	2013-10-22 17:32:19 +0000
+++ ViewHeader.qml	2014-03-26 15:09:40 +0000
@@ -6,7 +6,9 @@
     width: parent.width
     height: monthLabel.height
 
-    property var date;
+    property int month;
+    property int year;
+
     property string monthLabelFontSize: "x-large"
     property string yearLabelFontSize: "large"
 
@@ -14,7 +16,7 @@
         id: monthLabel
         objectName: "monthLabel"
         fontSize: monthLabelFontSize
-        text: Qt.locale().standaloneMonthName(date.getMonth())
+        text: Qt.locale().standaloneMonthName(month)
         anchors.leftMargin: units.gu(1)
         anchors.left: parent.left
         //color:"white"
@@ -25,7 +27,7 @@
         id: yearLabel
         objectName: "yearLabel"
         fontSize: yearLabelFontSize
-        text: date.getFullYear()
+        text: year
         anchors.right: parent.right
         anchors.rightMargin: units.gu(1)
         color:"#AEA79F"

=== modified file 'WeekView.qml'
--- WeekView.qml	2014-03-23 14:27:31 +0000
+++ WeekView.qml	2014-03-26 15:09:40 +0000
@@ -12,15 +12,15 @@
     property var firstDay: dayStart.weekStart(Qt.locale().firstDayOfWeek);
     property bool isCurrentPage: false
 
+    anchors.fill: parent
     anchors.top: parent.top
     anchors.topMargin: units.gu(1.5)
     spacing: units.gu(1)
 
-    anchors.fill: parent
-
     ViewHeader{
         id: viewHeader
-        date: dayStart
+        month: dayStart.getMonth()
+        year: dayStart.getFullYear()
     }
 
     TimeLineHeader{

=== modified file 'YearView.qml'
--- YearView.qml	2014-03-19 19:46:58 +0000
+++ YearView.qml	2014-03-26 15:09:40 +0000
@@ -6,23 +6,18 @@
 PathViewBase {
     id: root
     objectName: "YearView"
-
-    property var currentYear: DateExt.today();
+    property int currentYear: DateExt.today().getFullYear();
 
     signal monthSelected(var date);
 
     anchors.fill: parent
 
     onNextItemHighlighted: {
-        currentYear = getDateFromYear(currentYear.getFullYear() + 1);
+        currentYear = currentYear + 1;
     }
 
     onPreviousItemHighlighted: {
-        currentYear = getDateFromYear(currentYear.getFullYear() - 1);
-    }
-
-    function getDateFromYear(year) {
-        return new Date(year,0,1,0,0,0,0);
+        currentYear = currentYear - 1;
     }
 
     delegate: GridView{
@@ -30,18 +25,7 @@
         clip: true
 
         property bool isCurrentItem: index == root.currentIndex
-        property var year: getYear();
-
-        function getYear() {
-            switch( root.indexType(index)) {
-            case 0:
-                return currentYear;
-            case -1:
-                return getDateFromYear(currentYear.getFullYear() - 1);
-            case 1:
-                return getDateFromYear(currentYear.getFullYear() + 1);
-            }
-        }
+        property int year: (root.currentYear + root.indexType(index))
 
         width: parent.width
         height: parent.height
@@ -60,7 +44,7 @@
 
             MonthComponent{
                 id: monthComponent
-                monthDate: new Date(yearView.year.getFullYear(),index,1,0,0,0,0)
+                currentMonth: new Date(yearView.year,index,1,0,0,0,0)
                 anchors.fill: parent
                 anchors.margins: units.gu(0.5)
 
@@ -72,7 +56,7 @@
                 MouseArea{
                     anchors.fill: parent
                     onClicked: {
-                        root.monthSelected(monthComponent.monthDate);
+                        root.monthSelected(monthComponent.currentMonth);
                     }
                 }
             }

=== modified file 'calendar.qml'
--- calendar.qml	2014-03-23 14:21:46 +0000
+++ calendar.qml	2014-03-26 15:09:40 +0000
@@ -76,9 +76,8 @@
             property int endtime: -1;
 
             onCurrentDayChanged: {
-                if( yearView.currentYear !== undefined &&
-                        yearView.currentYear.getFullYear() !== currentDay.getFullYear() ) {
-                    yearView.currentYear = tabPage.currentDay.midnight();
+                if( yearView.currentYear !== currentDay.getFullYear() ) {
+                    yearView.currentYear = tabPage.currentDay.getFullYear();
                 }
 
                 if( monthView.currentMonth !== undefined && !monthView.currentMonth.isSameDay(currentDay))
@@ -98,8 +97,8 @@
                     globalModel.startPeriod =  new Date(currentDay.getFullYear(),0,1,0,0,0,0);
                     globalModel.endPeriod = new Date(currentDay.getFullYear(),11,31,0,0,0,0);
                     // only enable auto update after set the date interval
-	            globalModel.autoUpdate = true
-	            globalModel.update()
+                    globalModel.autoUpdate = true
+                    globalModel.update()
                 }
             }
 

=== modified file 'dateExt.js'
--- dateExt.js	2014-03-03 11:34:22 +0000
+++ dateExt.js	2014-03-26 15:09:40 +0000
@@ -112,6 +112,6 @@
 }
 
 function isSameMonth(date1, date2) {
-    return ( date1.getMonth() === date2.getMonth()
-            && date1.getFullYear() === date2.getFullYear())
+    return ( date1.getFullYear() === date2.getFullYear()
+            && date1.getMonth() === date2.getMonth() )
 }

=== modified file 'tests/autopilot/calendar_app/tests/test_yearview.py'
--- tests/autopilot/calendar_app/tests/test_yearview.py	2014-02-24 15:58:49 +0000
+++ tests/autopilot/calendar_app/tests/test_yearview.py	2014-03-26 15:09:40 +0000
@@ -45,7 +45,7 @@
         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)
+        months.sort(key=lambda month: month.currentMonth)
         self.assert_current_year_is_default_one(months[0])
 
         february = months[1]
@@ -107,7 +107,7 @@
             self.main_view.swipe_view(direction, self.year_view)
 
             self.assertThat(
-                lambda: self.year_view.currentYear.year,
+                lambda: self.year_view.currentYear,
                 Eventually(Equals(current_year + (i * direction))))
 
     def assert_current_year_is_default_one(self, month_component):