Merge lp:~yohanboniface/ubuntu-calendar-app/DatePicker into lp:ubuntu-calendar-app

[ybon]

Add the native Ubuntu UI DatePicker.
Also, allow to change the date value of the event.

Add the native Ubuntu UI DatePicker.
Also, allow to change the date value of the event.

For now the progress are blocked because I can't test the native DatePicker with autopilot.
I propose it as merge anyway as suggested by David today on IRC, for preparing the incoming hackdays.

See update from zsombi today:

2014-03-21 12:28:04 zsombi ybon: are you using the DatePicker or the PickerPanel?
2014-03-21 12:29:45 ybon zsombi: PickerPanel.openDatePicker
2014-03-21 12:30:26 zsombi ybon: ok. anyway, we don't have emulators yet neither for DatePicker nor for PickerPanel.
2014-03-21 12:30:40 ybon hehe, ok ;)
2014-03-21 12:31:23 zsombi ybon: so we need emus for both... and anyway we need emus for them :)
2014-03-21 12:32:14 ybon ;)
2014-03-21 12:32:17 ybon thanks for the update :)

[Kunal Parmar (pkunal-parmar)]

looks like you need to merge your branch with latest code.

review: Needs Fixing

[David Planella (dpm)]

Yohan, as Kunal is saying, could you do:

bzr merge lp:ubuntu-calendar-app
(resolve conflicts if there are any)
bzr commit -m"Merged from trunk"
bzr push lp:~yohanboniface/ubuntu-calendar-app/DatePicker

Then Launchpad should take care of updating the Merge Proposal for you.

Thanks!

[ybon (yohanboniface)]

I will do asap!
I'm in the train today, but will take time tonight or tomorrow morning for this and other comments from Kunal :)

[lp:~yohanboniface/ubuntu-calendar-app/DatePicker]

203. By ybon on 2014-03-25

Merged from trunk

[ybon (yohanboniface)]

Done on this branch :)

[Kunal Parmar (pkunal-parmar)]

it seems there is still some merge issue, you seems to be removing reminder related support.

review: Needs Fixing

[ybon (yohanboniface)]

How do I check that?

Here is what I have:

ybon@edoardo:...lendar-app/DatePicker$ bzr merge lp:ubuntu-calendar-app
Nothing to do.

[ybon (yohanboniface)]

Ah, sorry, you meant I've made a mistake while merging in the past.
Still figuring out how to do a proper diff between to branches in Bazaar (but I can do it with "diff" command line).

Can you be a little more specific on what's missing?

[ybon (yohanboniface)]

OK, got it:

> //remove old reminder value
> var oldVisualReminder = event.detail(Detail.VisualReminder);
> if(oldVisualReminder) {
> event.removeDetail(oldVisualReminder);
> }
>
> var oldAudibleReminder = event.detail(Detail.AudibleReminder);
> if(oldAudibleReminder) {
> event.removeDetail(oldAudibleReminder);
> }
>
> var reminderTime = Defines.reminderValue[ reminderOption.selectedIndex ];
> if( reminderTime !== 0 ) {
> var visualReminder = Qt.createQmlObject("import QtOrganizer 5.0; VisualReminder{}", event, "NewEvent.qml");
> visualReminder.repetitionCount = 3;
> visualReminder.repetitionDelay = 120;
> visualReminder.message = titleEdit.text
> visualReminder.secondsBeforeStart = reminderTime;
> event.setDetail(visualReminder);
>
> var audibleReminder = Qt.createQmlObject("import QtOrganizer 5.0; AudibleReminder{}", event, "NewEvent.qml");
> audibleReminder.repetitionCount = 3;
> audibleReminder.repetitionDelay = 120;
> audibleReminder.secondsBeforeStart = reminderTime;
> event.setDetail(audibleReminder);
> }
>

Commit to come.

[Kunal Parmar (pkunal-parmar)]

I dont know much bzr either, but you can get master and check diff using meld diff.

[lp:~yohanboniface/ubuntu-calendar-app/DatePicker]

204. By ybon on 2014-03-26

Put back reminder management lost in previous merge

[ybon (yohanboniface)]

Done, thanks for checking again :)

[lp:~yohanboniface/ubuntu-calendar-app/DatePicker]

205. By ybon on 2014-03-26

Remove console.log hack

Correct way to handle that is to add QORGANIZER_EDS_DEBUG=on env var

[Olivier Tilloy (osomon)]

The calendar_app.tests.test_calendar.TestMainView.test_new_event autopilot test fails due to the changes in the New Even t screen. It needs to be updated to catter for those changes.
Since autopilot emulators for the new picker components are not available yet, we have two options:
 1) introspect the picker components in the test (essentially, write our own custom emulators for them as a temporary stopgap measure until the SDK team provide official emulators), this has the downside of being fragile in case the implementation changes on the UITK side
 2) temporarily skip the test (decorating it with @unittest.skip, including a link to the bug report that tracks the need for official emulators)

review: Needs Fixing

[Mihir Soni (mihirsoni)]

Also,

as discussed in today's hangout.

we'll have to change the design of changing start end dateTime.

[Kunal Parmar (pkunal-parmar)]

287 + property var recurrenceValue: [ RecurrenceRule.Invalid,
288 + RecurrenceRule.Daily,
289 + RecurrenceRule.Weekly,
290 + RecurrenceRule.Monthly,
291 + RecurrenceRule.Yearly];
292 +
293 + property var recurrenceLabel: [ i18n.tr("Once"),
294 + i18n.tr("Daily"),
295 + i18n.tr("Weekly"),
296 + i18n.tr("Monthly"),
297 + i18n.tr("Yearly")];

This code also looks like from old branch. Please merge this changes as well.

[lp:~yohanboniface/ubuntu-calendar-app/DatePicker]

206. By ybon on 2014-03-29

Skip tests involving DatePicker, as the new one as no emulator yet

207. By ybon on 2014-03-29

Remove old recurrence code

208. By ybon on 2014-03-29

Merge with trunk

[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/353/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1925/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/353/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/353/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/187/console

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

review: Needs Fixing (continuous-integration)

[Mihir Soni (mihirsoni)]

Could you please merge with trunk and resolve the conflicts ?

review: Needs Fixing

[lp:~yohanboniface/ubuntu-calendar-app/DatePicker]

209. By ybon on 2014-04-25

merging with master

[ybon (yohanboniface)]

Done.

[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/410/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2211
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/410
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/410
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/244

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

review: Needs Fixing (continuous-integration)

[Victor Thompson (vthompson)]

Ybon,

Could you merge trunk into this branch so you get the fix for a bug that prevents the app from running correctly on the device [1]?

[1] https://bugs.launchpad.net/bugs/1312480

[lp:~yohanboniface/ubuntu-calendar-app/DatePicker]

210. By ybon on 2014-04-28

merging with trunk

[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/418/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2255
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/418
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/418
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/252

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

review: Needs Fixing (continuous-integration)

[David Planella (dpm)]

In order for this to pass, the autopilot test will need to be fixed too before we can merge it.

review: Needs Fixing

[ybon (yohanboniface)]

Thanks for clarifying the needs, David.
I guess you are talking about the one I've commented on #206?
One question: last time I've raised this on IRC, there was no autopilot handler for the native Ubuntu UI DatePicker. Are you aware of any update on this side?
If not, are you expecting that I do this by hand?

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Have asked Leo Arias (elopio) to help us with this.

[ybon (yohanboniface)]

Thanks popey :)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Ok, Leo should have some time this week to work on this.

[Leo Arias (elopio)]

It's ready for review:
https://code.launchpad.net/~elopio/ubuntu-ui-toolkit/datepicker-autopilot_helper/+merge/218909
https://code.launchpad.net/~elopio/ubuntu-ui-toolkit/datepicker-autopilot_helper-pick_time/+merge/218915

It would be nice if you could take a look and see if it works for your use cases.

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Seems the jenkins job on https://code.launchpad.net/~elopio/ubuntu-ui-toolkit/datepicker-autopilot_helper/+merge/218909 failed, asked Christian to take a look.

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Speaking to Leo, the above merge to datepicker-autopilot-helper should land in staging this week.

[Alan Pope 🍺🐧🐱 🦄 (popey)]

The ui toolkit merge appears to have landed now, so this can land.

review: Approve

[Alan Pope 🍺🐧🐱 🦄 (popey)]

This needs re-merging with trunk.

[ybon (yohanboniface)]

Given how much trunk as diverged and that bazaar is quite bugged on complex merges, I think the best option is to rerun by hand the commits on top of trunk on a new branch.
I will try to do that this week, but if someone want to take it… ;)

[David Planella (dpm)]

> Given how much trunk as diverged and that bazaar is quite bugged on complex
> merges, I think the best option is to rerun by hand the commits on top of
> trunk on a new branch.

Thanks Yohan. Bzr should handle complex merges just fine, and this one shouldn't be too complex after all: it just happens that the two branches have diverged in time. Where I strongly disagree is that rerunning old commits by hand would be a better solution: I think it'd be much less work to let a VCS do the merge automatically and resolve any conflicts afterwards.

In fact, I've just had a go at it (*), and the result was the following:

Text conflict in NewEvent.qml
Text conflict in tests/autopilot/calendar_app/tests/test_calendar.py
2 conflicts encountered.

So essentially conflicts in two files only. The one on the test_calendar.py is trivial to resolve. NewEvent.qml has 6 conflicts, some of which are simple to resolve, but ultimately, to be on the safe side, they require someone familiar with this branch to fix them.

> I will try to do that this week, but if someone want to take it… ;)

Ultimately, the changes will need to be applied in your branch if we want to merge it, so it'd be great if you could update your branch (no one else has got the permissions to do so, unless they take it over, branch off it, and submit a new MP themselves). But please let us know if you need help on this.

(*) bzr branch lp:~yohanboniface/ubuntu-calendar-app/DatePicker
cd DatePicker
bzr merge lp:ubuntu-calendar-app

[ybon (yohanboniface)]

Thanks for this, David. :)
Have you looked at the "{" in the merged files? I've just run the merge to have a look, and (sadly as often with bzr in my experience) they seem messed up to me in NewEvent.qml :/
In the past I've other bad experiences with automatic merges, like some pieces of code not being removed as expected.

[David Planella (dpm)]

So I've had a go at it, and while I cannot say whether in all automatic merges the braces are still matched, they seemed all ok to me on this one. I've merged to trunk and resolved all conflicts on a new branch I've just pushed to LP.

So would you mind doing a 'bzr merge lp:~dpm/ubuntu-calendar-app/DatePicker' onto your branch (it should apply cleanly), have a quick look over it, and then push to your branch?

Thanks!

[lp:~yohanboniface/ubuntu-calendar-app/DatePicker]

211. By ybon on 2014-06-05

merging with dpm

[ybon (yohanboniface)]

Done!
Thanks *you* :)

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

FAILED: Continuous integration, rev:211
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/513/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2886
        deb: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2886/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/347
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/71

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

review: Needs Fixing (continuous-integration)

[Leo Arias (elopio)]

I'm looking at the failing test so you won't need to skip it.
It seems to be failing in trunk too, so shouldn't be related to your branch.

[Nicholas Skaggs (nskaggs)]

Datepicker helper exists now :-)

http://bazaar.launchpad.net/~ubuntu-sdk-team/ubuntu-ui-toolkit/trunk/view/head:/tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/pickers.py

[Nicholas Skaggs (nskaggs)]

Leo has pointed out there is a regression that exists in trunk; coming from the toolkit component or the app itself in regards to the textfield. Tapping the field doesn't set focus on the first tap.

I'm investigating the source of this regression.

[Nicholas Skaggs (nskaggs)]

The regression is caused by the additional button introduced in r300.

Something funny is occuring in the toolkit. The popover is not closing and eating the first event. I'm trying to put together a small example to demonstrate the issue.

[Nicholas Skaggs (nskaggs)]

The bug has been filed here: https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1326963

[Nicholas Skaggs (nskaggs)]

I think you can edit the newevent test to workaround the regression, but barring that please include the bug as the reason you are skipping the test.

[Nicholas Skaggs (nskaggs)]

Resubmitting after rebasing to trunk and fixing tests

Unmerged revisions

=== modified file 'NewEvent.qml'
--- NewEvent.qml	2014-05-31 09:54:55 +0000
+++ NewEvent.qml	2014-06-05 11:53:12 +0000
@@ -23,6 +23,16 @@
     property alias scrollY: flickable.contentY
     property bool isEdit: false
 
+    onStartDateChanged: {
+        startDateInput.text = Qt.formatDateTime(startDate, "dd MMM yyyy");
+        startTimeInput.text = Qt.formatDateTime(startDate, "hh:mm");
+    }
+
+    onEndDateChanged: {
+        endDateInput.text = Qt.formatDateTime(endDate, "dd MMM yyyy");
+        endTimeInput.text = Qt.formatDateTime(endDate, "hh:mm");
+    }
+
     Component.onCompleted: {
         // If startDate is setted by argument we have to not change it
         //Set the nearest current time.
@@ -38,7 +48,7 @@
         }
 
         if(event === null){
-            isEdit =false;
+            isEdit = false;
             addEvent();
         }
         else{
@@ -54,13 +64,10 @@
         startTime.text = Qt.formatDateTime(startDate, "dd MMM yyyy hh:mm");
         endTime.text = Qt.formatDateTime(endDate, "dd MMM yyyy hh:mm");
     }
-
     //Editing Event
     function editEvent(e) {
         startDate =new Date(e.startDateTime);
         endDate = new Date(e.endDateTime);
-        startTime.text = Qt.formatDateTime(e.startDateTime, "dd MMM yyyy hh:mm");
-        endTime.text = Qt.formatDateTime(e.endDateTime, "dd MMM yyyy hh:mm");
 
         if(e.displayLabel) {
             titleEdit.text = e.displayLabel;
@@ -124,7 +131,7 @@
     //Save the new or Existing event
     function saveToQtPim() {
         internal.clearFocus()
-        if ( startDate >= endDate ) {
+        if ( startDate >= endDate && !allDayEventCheckbox.checked) {
             PopupUtils.open(errorDlgComponent,root,{"text":i18n.tr("End time can't be before start time")});
         } else {
             event.startDateTime = startDate;
@@ -192,6 +199,16 @@
             pageStack.pop();
         }
     }
+
+    function openDatePicker (element, caller, callerProperty, mode) {
+        element.highlighted = true;
+        var picker = PickerPanel.openDatePicker(caller, callerProperty, mode);
+        if (!picker) return;
+        picker.closed.connect(function () {
+            element.highlighted = false;
+        });
+    }
+
     // Calucate default hour and minute for start and end time on event
     function roundDate(date) {
         var tempDate = new Date(date)
@@ -228,22 +245,6 @@
         }
     }
 
-    Component {
-        id: timePicker
-        TimePicker {
-        }
-    }
-
-    Rectangle {
-        id: availableArea
-
-        width: parent.width
-        color: "red"
-        opacity: 0.5
-        z: 100
-    }
-
-
     Flickable{
         id: flickable
 
@@ -288,13 +289,13 @@
         contentWidth: width
         contentHeight: column.height
 
-        Column{
+        Column {
             id: column
 
             width: parent.width
             spacing: units.gu(1)
 
-            UbuntuShape{
+            UbuntuShape {
                 width:parent.width
                 height: timeColumn.height
 
@@ -304,65 +305,77 @@
                     anchors.centerIn: parent
                     spacing: units.gu(1)
 
-                    NewEventEntryField{
-                        id: dateField
-                        title: i18n.tr("Date")
-                        width: parent.width
-                        objectName: "dateInput"
-
-                        text: Qt.formatDateTime(startDate,"dd MMM yyyy");
-
-                        MouseArea{
-                            anchors.fill: parent
-                            onClicked: {
-                            }
-                        }
-                    }
-
-                    NewEventEntryField{
-                        id: startTime
-                        title: i18n.tr("Start")
-                        width: parent.width
-                        objectName: "startTimeInput"
-
-                        text: Qt.formatDateTime(startDate, "dd MMM yyyy hh:mm");
-
-                        MouseArea{
-                            anchors.fill: parent
-                            onClicked: {
-                                internal.clearFocus()
-                                var popupObj = PopupUtils.open(timePicker,root,{"hour": startDate.getHours(),"minute":startDate.getMinutes()});
-                                popupObj.accepted.connect(function(startHour, startMinute) {
-                                    var newDate = startDate;
-                                    newDate.setHours(startHour, startMinute);
-                                    startDate = newDate;
-                                    startTime.text = Qt.formatDateTime(startDate, "dd MMM yyyy hh:mm");
-                                })
-                            }
-                        }
-                    }
-
-                    ThinDivider{}
-
-                    NewEventEntryField{
-                        id: endTime
-                        title: i18n.tr("End")
-                        width: parent.width
-                        objectName: "endTimeInput"
-
-                        text: Qt.formatDateTime(endDate,"dd MMM yyyy hh:mm");
-
-                        MouseArea{
-                            anchors.fill: parent
-                            onClicked: {
-                                internal.clearFocus()
-                                var popupObj = PopupUtils.open(timePicker,root,{"hour": endDate.getHours(),"minute":endDate.getMinutes()});
-                                popupObj.accepted.connect(function(startHour, startMinute) {
-                                    var newDate = endDate;
-                                    newDate.setHours(startHour, startMinute);
-                                    endDate = newDate;
-                                    endTime.text = Qt.formatDateTime(endDate, "dd MMM yyyy hh:mm");
-                                })
+                    Item {
+                        width: parent.width
+                        height: startDateInput.height
+
+                        NewEventEntryField{
+                            id: startDateInput
+                            title: i18n.tr("Start")
+                            objectName: "startTimeInput"
+
+                            text: ""
+
+                            width: allDayEventCheckbox.checked ? parent.width : parent.width / 2
+
+                            MouseArea{
+                                anchors.fill: parent
+                                onClicked: openDatePicker(startDateInput, root, "startDate", "Years|Months|Days")
+                            }
+                        }
+
+                        NewEventEntryField{
+                            id: startTimeInput
+                            title: i18n.tr("at")
+                            objectName: "startTimeInput"
+
+                            text: ""
+
+                            width: (parent.width / 2) - units.gu(1)
+                            anchors.right: parent.right
+                            visible: !allDayEventCheckbox.checked
+
+                            MouseArea{
+                                anchors.fill: parent
+                                onClicked: openDatePicker(startTimeInput, root, "startDate", "Hours|Minutes")
+                            }
+                        }
+                    }
+
+                    Item {
+                        width: parent.width
+                        height: endDateInput.height
+                        visible: !allDayEventCheckbox.checked
+
+                        NewEventEntryField{
+                            id: endDateInput
+                            title: i18n.tr("End")
+                            objectName: "endDateInput"
+
+                            text: ""
+
+                            width: parent.width / 2
+
+                            MouseArea{
+                                anchors.fill: parent
+                                onClicked: openDatePicker(endDateInput, root, "endDate", "Years|Months|Days")
+                            }
+                        }
+
+                        NewEventEntryField{
+                            id: endTimeInput
+                            title: i18n.tr("at")
+                            objectName: "endTimeInput"
+
+                            text: ""
+
+                            width: (parent.width / 2) - units.gu(1)
+                            anchors.right: parent.right
+
+                            MouseArea{
+                                anchors.fill: parent
+                                onClicked: openDatePicker(endTimeInput, root, "endDate", "Hours|Minutes")
+
                             }
                         }
                     }
@@ -382,14 +395,11 @@
                 CheckBox {
                     id: allDayEventCheckbox
                     checked: false
-
-                    onCheckedChanged: {
-                        startTime.visible = !checked;
-                        endTime.visible = !checked;
-                    }
                 }
             }
 
+            ThinDivider{}
+
             NewEventEntryField{
                 id: titleEdit
                 width: parent.width
@@ -553,8 +563,10 @@
             titleEdit.focus = false
             locationEdit.focus = false
             personEdit.focus = false
-            startTime.focus = false
-            endTime.focus = false
+            startDateInput.focus = false
+            startTimeInput.focus = false
+            endDateInput.focus = false
+            endTimeInput.focus = false
             messageEdit.focus = false
         }
     }

=== removed file 'TimePicker.qml'
--- TimePicker.qml	2013-10-07 12:56:19 +0000
+++ TimePicker.qml	1970-01-01 00:00:00 +0000
@@ -1,95 +0,0 @@
-/*
- * Copyright (C) 2013 Michael Zanetti <[e-mail]>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.0
-import Ubuntu.Components 0.1
-import Ubuntu.Components.Popups 0.1
-
-Dialog {
-    id: root
-    title: i18n.tr("Time")
-    height: units.gu(100)
-
-    property alias hour: hourScroller.currentIndex
-    property alias minute: minuteScroller.currentIndex
-
-    signal accepted(int hours, int minutes)
-    signal rejected()
-
-    QtObject {
-        id: priv
-
-        property date now: new Date()
-    }
-
-    contents: [
-        Row {
-            height: units.gu(24)
-            Scroller {
-                id: hourScroller
-                objectName: "hourScroller"
-                anchors {
-                    top: parent.top
-                    bottom: parent.bottom
-                }
-                width: parent.width / 2
-                labelText: i18n.tr("Hour")
-
-                min: 00
-                max: 23
-                currentIndex: priv.now.getHours()
-            }
-            Scroller {
-                id: minuteScroller
-                objectName: "minuteScroller"
-                anchors {
-                    top: parent.top
-                    bottom: parent.bottom
-                }
-                width: parent.width / 2
-                labelText: i18n.tr("Minute")
-
-                min: 00
-                max: 59
-                currentIndex: priv.now.getMinutes()
-            }
-        },
-        Row {
-            spacing: units.gu(1)
-            Button {
-                objectName: "TimePickerCancelButton"
-                text: i18n.tr("Cancel")
-                onClicked: {
-                    root.rejected()
-                    PopupUtils.close(root)
-                }
-                width: (parent.width - parent.spacing) / 2
-            }
-            Button {
-                objectName: "TimePickerOKButton"
-                text: i18n.tr("OK")
-                color: "#dd4814"
-
-                onClicked: {
-                    root.accepted(root.hour, root.minute)
-                    PopupUtils.close(root)
-                }
-                width: (parent.width - parent.spacing) / 2
-            }
-        }
-
-    ]
-}

=== modified file 'dateExt.js'
--- dateExt.js	2014-03-22 03:07:26 +0000
+++ dateExt.js	2014-06-05 11:53:12 +0000
@@ -90,6 +90,12 @@
     && this.getFullYear() === otherDay.getFullYear() );
 }
 
+Date.prototype.mergeDate = function (d) {
+    this.setFullYear(d.getFullYear());
+    this.setMonth(d.getMonth());
+    this.setDate(d.getDate());
+}
+
 function weekCount(year, month_number) {
     var firstOfMonth = new Date(year, month_number, 1);
     var lastOfMonth = new Date(year, month_number+1, 0);

=== modified file 'tests/autopilot/calendar_app/tests/test_calendar.py'
--- tests/autopilot/calendar_app/tests/test_calendar.py	2014-05-23 11:36:56 +0000
+++ tests/autopilot/calendar_app/tests/test_calendar.py	2014-06-05 11:53:12 +0000
@@ -14,12 +14,14 @@
 from testtools.matchers import Equals, Not, Is, NotEquals
 
 import time
+import unittest
 
 from calendar_app.tests import CalendarTestCase
 
 
 class TestMainView(CalendarTestCase):
 
+    @unittest.skip
     def _scroll_time_picker_to_time(self, picker, hours, minutes):
         # Scroll hours to selected value
         scroller = picker.select_single("Scroller", objectName="hourScroller")
@@ -44,6 +46,7 @@
             self.assertThat(scroller.currentIndex, Eventually(
                 Equals((current_index + 1) % 60)))
 
+    @unittest.skip
     def test_new_event(self):
         """test add new event """
         #go to today