Merge lp:~artmello/ubuntu-calendar-app/ubuntu-calendar-app-fix_1539982 into lp:ubuntu-calendar-app

[Arthur Mello]

Make sure that dates from previous/next months can be selected from month view

Make sure that dates from previous/next months can be selected from month view

Tests
-----
In Month view, make sure that any date is highlighted after clicked. Test with dates from previous, current and next month.
It should still work when previous month is December from last year and next month is January from next

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

PASSED: Continuous integration, rev:803
https://core-apps-jenkins.ubuntu.com/job/calendar-app-ci/802/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/809/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/calendar-app-ci/802/rebuild

review: Approve (continuous-integration)

[Nekhelesh Ramananthan (nik90)]

Works as expected and fixed the bug! LGTM!

review: Approve (testing)

[Renato Araujo Oliveira Filho (renatofilho)]

works nice. But I have some inline questions.

[lp:~artmello/ubuntu-calendar-app/ubuntu-calendar-app-fix_1539982]

804. By Arthur Mello on 2016-03-28

Fix new event time with press and hold on Months view

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

PASSED: Continuous integration, rev:804
https://core-apps-jenkins.ubuntu.com/job/calendar-app-ci/804/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/823/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/calendar-app-ci/804/rebuild

review: Approve (continuous-integration)

[lp:~artmello/ubuntu-calendar-app/ubuntu-calendar-app-fix_1539982]

805. By Arthur Mello on 2016-03-28

Get the current time of click

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

PASSED: Continuous integration, rev:805
https://core-apps-jenkins.ubuntu.com/job/calendar-app-ci/805/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/824/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/calendar-app-ci/805/rebuild

review: Approve (continuous-integration)

[lp:~artmello/ubuntu-calendar-app/ubuntu-calendar-app-fix_1539982]

806. By Arthur Mello on 2016-03-28

Undo changes

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

PASSED: Continuous integration, rev:806
https://core-apps-jenkins.ubuntu.com/job/calendar-app-ci/806/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/825/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/calendar-app-ci/806/rebuild

review: Approve (continuous-integration)

[Renato Araujo Oliveira Filho (renatofilho)]

looks good now.

review: Approve

=== modified file 'MonthComponent.qml'
--- MonthComponent.qml	2016-03-09 01:35:28 +0000
+++ MonthComponent.qml	2016-03-28 16:21:58 +0000
@@ -95,14 +95,19 @@
                 return -1;
             }
 
-            if ((root.currentMonth === date.getMonth()) &&
-                (root.currentYear === date.getFullYear())) {
-
-                return date.getDate() +
-                       (Date.daysInMonth(monthStartYear, monthStartMonth) - monthStartDate);
-            } else {
-                return -1;
+            if (date.getFullYear() < root.currentYear ||
+                (date.getFullYear() === root.currentYear && date.getMonth() < root.currentMonth)) {
+                return offset - (Date.daysInMonth(date.getFullYear(), date.getMonth()) - date.getDate());
+
+            } else if (date.getFullYear() === root.currentYear && date.getMonth() === root.currentMonth) {
+               return offset + date.getDate();
+
+            } else if (date.getFullYear() > root.currentYear ||
+                       (date.getFullYear() === root.currentYear && date.getMonth() > root.currentMonth)) {
+                return offset + Date.daysInMonth(root.currentYear, root.currentMonth) + date.getDate();
             }
+
+            return -1;
         }
     }
 
@@ -245,19 +250,13 @@
             var dayItem = getItemAt(mouse.x, mouse.y)
 
             if( dayItem.isSelected ) {
-                var selectedDate = new Date();
-                selectedDate.setFullYear(intern.monthStartYear)
-                selectedDate.setMonth(intern.monthStartMonth + 1)
-                selectedDate.setDate(dayItem.date)
-                selectedDate.setMinutes(60, 0, 0)
+                var selectedDate = new Date(dayItem.delegateDate.getTime());
                 pageStack.push(Qt.resolvedUrl("NewEvent.qml"), {"date":selectedDate, "model":eventModel});
             }
         }
         onClicked: {
             var dayItem = getItemAt(mouse.x, mouse.y)
-            var selectedDate = new Date(intern.monthStartYear,
-                                        intern.monthStartMonth + 1,
-                                        dayItem.date, 0, 0, 0, 0)
+            var selectedDate = new Date(dayItem.delegateDate.getTime());
             if (root.isYearView) {
                 //If yearView is clicked then open selected MonthView
                 root.monthSelected(selectedDate);