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

[Kunal Parmar]

Resolves Bug #1378380
Add event on tap

Resolves Bug #1378380
Add event on tap

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

FAILED: Continuous integration, rev:616
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1111/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2427
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2427/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/582
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/108

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

review: Needs Fixing (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Tapping created an event at 21:26, I think it should create an event which locks to the nearest 30 minutes.

The event is created, and then two more button presses are required (tap event, tap edit) to edit the event to change the title from "Untitled". Would it make more sense to go directly to edit event when created?

[Kunal Parmar (pkunal-parmar)]

> Tapping created an event at 21:26, I think it should create an event which
> locks to the nearest 30 minutes.
>

As per current implementation we are truncating minutes and creating event for currently touched hour.
It should have created event rounding to hour, for your case it should have created event on 21:00 to 22:00

Can you confirm once more ?

> The event is created, and then two more button presses are required (tap
> event, tap edit) to edit the event to change the title from "Untitled". Would
> it make more sense to go directly to edit event when created?

This can be done

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

FAILED: Continuous integration, rev:617
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1114/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2442
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2442/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/585
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/111

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:618
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1116/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2444
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2444/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/587
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/113

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

review: Needs Fixing (continuous-integration)

[Kunal Parmar (pkunal-parmar)]

so issue with jenkins was, first day was not visible but AP was trying to click on first day, which it could not see and thus AP fails.

Now scrolling view to make first day visible.

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

FAILED: Continuous integration, rev:619
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1129/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2499/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/600/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/126/console

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

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:621
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1132/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2503
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2503/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/603
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/129

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

review: Approve (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Tested and this is great, thanks!

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/489/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2583
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2583/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-autolanding/274
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-autolanding/61

review: Needs Fixing (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

testtools.matchers._impl.MismatchError: !=:
reference = datetime.datetime(2015, 4, 12, 22, 0)
actual = datetime.datetime(2015, 4, 12, 21, 30)

So we create an event on the half hour but the test always assumes it's on the hour, so that needs fixing.

review: Needs Fixing

[Kunal Parmar (pkunal-parmar)]

Sure, I'll fix this and other ap fail with week number Mr.

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

FAILED: Continuous integration, rev:622
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1146/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2616
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2616/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/617
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/143

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

review: Needs Fixing (continuous-integration)

[Kunal Parmar (pkunal-parmar)]

From Video, test case seems to be running fine. There seems some issue with Jenkins server. Seems like python is getting some wrong date.

like in below log,
Traceback (most recent call last):
  File "/usr/lib/python3/dist-packages/calendar_app/tests/test_monthview.py", line 142, in test_today_button
    self._go_to_today(1)
  File "/usr/lib/python3/dist-packages/calendar_app/tests/test_monthview.py", line 87, in _go_to_today
    self._assert_today()
  File "/usr/lib/python3/dist-packages/calendar_app/tests/test_monthview.py", line 74, in _assert_today
    Eventually(Equals(today.day)))
  File "/usr/lib/python3/dist-packages/testtools/testcase.py", line 423, in assertThat
    raise mismatch_error
testtools.matchers._impl.MismatchError: After 10.0 seconds test failed: 16 != 1

as you can see from failure, fail happens on 16th April, so today is 16, but python is expecting 1.
Which is wrong.

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

FAILED: Continuous integration, rev:624
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1150/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2627/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/621/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/147/console

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

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:625
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1151/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2628
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2628/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/622
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/148

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

review: Approve (continuous-integration)

[Kunal Parmar (pkunal-parmar)]

It was once approved by Alan so approving it again

[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/493/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2633
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2633/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-autolanding/278
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-autolanding/65

review: Needs Fixing (continuous-integration)

[Nicholas Skaggs (nskaggs)]

Kunal, ideally we should have a test that covers tapping to create an event. Since event creation is well covered, this test could be written easily enough by opening the dayview and tapping under a few scenarios (on an event, on a blank timeslot, between slots), ensuring the proper response for each.

[Nicholas Skaggs (nskaggs)]

Some suggested changes.

review: Needs Fixing

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

626. By Kunal Parmar on 2015-04-29

logging

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

FAILED: Continuous integration, rev:626
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1156/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2679
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2679/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/627
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/153

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

review: Needs Fixing (continuous-integration)

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

627. By Kunal Parmar on 2015-05-07

typo resolved

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

FAILED: Continuous integration, rev:627
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1157/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2718
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2718/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/628
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/154

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

review: Needs Fixing (continuous-integration)

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

628. By Kunal Parmar on 2015-05-07

AP fix

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

FAILED: Continuous integration, rev:628
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1158/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2719
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2719/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/629
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/155

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

review: Needs Fixing (continuous-integration)

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

629. By Kunal Parmar on 2015-05-07

ap fix

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

FAILED: Continuous integration, rev:629
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1159/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2720
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2720/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/630
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/156

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

review: Needs Fixing (continuous-integration)

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

630. By Kunal Parmar on 2015-05-07

AP fix by selecting today

631. By Kunal Parmar on 2015-05-09

pep8

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

FAILED: Continuous integration, rev:630
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1161/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2732/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/632/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/158/console

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

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:631
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1163/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2735
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2735/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/634
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/160

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

review: Approve (continuous-integration)

=== modified file 'NewEvent.qml'
--- NewEvent.qml	2015-04-05 04:54:54 +0000
+++ NewEvent.qml	2015-05-09 02:20:28 +0000
@@ -217,6 +217,12 @@
                 event.setDetail(audibleReminder);
             }
             event.collectionId = calendarsOption.model[calendarsOption.selectedIndex].collectionId;
+
+            var comment = event.detail(Detail.Comment);
+            if(comment && comment.comment === "X-CAL-DEFAULT-EVENT") {
+                event.removeDetail(comment);
+            }
+
             model.saveItem(event);
             pageStack.pop();
             root.eventAdded(event);

=== modified file 'TimeLineBase.qml'
--- TimeLineBase.qml	2015-01-22 21:17:51 +0000
+++ TimeLineBase.qml	2015-05-09 02:20:28 +0000
@@ -36,11 +36,18 @@
     MouseArea {
         anchors.fill: parent
         objectName: "mouseArea"
+
+        onClicked: {
+            var selectedDate = new Date(day);
+            var hour = parseInt(mouseY / hourHeight);
+            selectedDate.setHours(hour)
+            createOrganizerEvent(selectedDate);
+        }
+
         onPressAndHold: {
             var selectedDate = new Date(day);
             var hour = parseInt(mouseY / hourHeight);
             selectedDate.setHours(hour)
-            //pageStack.push(Qt.resolvedUrl("NewEvent.qml"), {"date":selectedDate, "model":eventModel});
             createOrganizerEvent(selectedDate);
         }
 
@@ -71,6 +78,7 @@
         event.startDateTime = startDate;
         event.endDateTime = endDate;
         event.displayLabel = i18n.tr("Untitled");
+        event.setDetail(Qt.createQmlObject("import QtOrganizer 5.0; Comment{ comment: 'X-CAL-DEFAULT-EVENT'}", event,"TimeLineBase.qml"));
         model.saveItem(event);
     }
 
@@ -90,7 +98,12 @@
     }
 
     function showEventDetails(event) {
-        pageStack.push(Qt.resolvedUrl("EventDetails.qml"), {"event":event,"model":model});
+        var comment = event.detail(Detail.Comment);
+        if(comment && comment.comment === "X-CAL-DEFAULT-EVENT") {
+            pageStack.push(Qt.resolvedUrl("NewEvent.qml"),{"event": event, "model":model});
+        } else {
+            pageStack.push(Qt.resolvedUrl("EventDetails.qml"), {"event":event,"model":model});
+        }
     }
 
     WorkerScript {

=== modified file 'TimeLineBaseComponent.qml'
--- TimeLineBaseComponent.qml	2015-02-19 13:50:29 +0000
+++ TimeLineBaseComponent.qml	2015-05-09 02:20:28 +0000
@@ -63,8 +63,9 @@
         var today = DateExt.today();
         var startOfWeek = today.weekStart(Qt.locale().firstDayOfWeek);
         var weekDay = today.getDay();
+
         if( startOfWeek.isSameDay(startDay) && weekDay > 2) {
-            timeLineView.contentX = (weekDay * timeLineView.delegateWidth);
+            timeLineView.contentX = (weekDay * timeLineView.delegateWidth);            
             if( timeLineView.contentX  > (timeLineView.contentWidth - timeLineView.width) ) {
                 timeLineView.contentX = timeLineView.contentWidth - timeLineView.width
             }
@@ -182,6 +183,11 @@
                     }
                 }
 
+                onContentWidthChanged: {
+                    scrollToCurrentTime();
+                    scrollTocurrentDate();
+                }
+
                 clip: true
 
                 TimeLineBackground{}

=== modified file 'WeekView.qml'
--- WeekView.qml	2015-02-26 16:44:43 +0000
+++ WeekView.qml	2015-05-09 02:20:28 +0000
@@ -107,13 +107,6 @@
                     startDay: firstDay.addDays( weekViewPath.indexType(index) * 7)
                     keyboardEventProvider: weekViewPath
 
-                    Component.onCompleted: {
-                        if(weekViewPage.isCurrentPage){
-                            timeLineView.scrollToCurrentTime();
-                            timeLineView.scrollTocurrentDate();
-                        }
-                    }
-
                     onIsActiveChanged: {
                         timeLineView.scrollTocurrentDate();
                     }

=== modified file 'tests/autopilot/calendar_app/tests/test_monthview.py'
--- tests/autopilot/calendar_app/tests/test_monthview.py	2015-04-06 17:07:11 +0000
+++ tests/autopilot/calendar_app/tests/test_monthview.py	2015-05-09 02:20:28 +0000
@@ -29,6 +29,9 @@
 from datetime import datetime
 from dateutil.relativedelta import relativedelta
 
+import logging
+logger = logging.getLogger(__name__)
+
 
 class TestMonthView(CalendarAppTestCase):
 
@@ -69,6 +72,8 @@
         local = self.app.main_view.to_local_date(
             self.month_view.currentMonth.datetime)
         today = datetime.now()
+        logger.debug(local)
+        logger.debug(today)
 
         self.assertThat(lambda: local.day,
                         Eventually(Equals(today.day)))

=== modified file 'tests/autopilot/calendar_app/tests/test_weekview.py'
--- tests/autopilot/calendar_app/tests/test_weekview.py	2015-04-10 18:50:59 +0000
+++ tests/autopilot/calendar_app/tests/test_weekview.py	2015-05-09 02:20:28 +0000
@@ -157,8 +157,16 @@
     def test_selecting_a_day_switches_to_day_view(self):
         """It must be possible to show a single day by clicking on it."""
         days = self.week_view.get_days_of_week()
-        day_to_select = self.app.main_view.get_label_with_text(days[0])
-        expected_day = days[0]
+        today = datetime.datetime.now()
+
+        # selecting today
+        index = 0
+        for i in range(len(days)):
+            if days[i] == today.day:
+                index = i
+
+        day_to_select = self.app.main_view.get_label_with_text(days[index])
+        expected_day = days[index]
         dayStart = self.week_view.firstDay
         expected_month = dayStart.month
         expected_year = dayStart.year
@@ -172,6 +180,10 @@
         # Check that the 'Day' view is on the correct/selected day.
         selected_date = \
             self.app.main_view.get_day_view().get_selected_day().startDay
+
+        logger.debug(expected_day)
+        logger.debug(selected_date)
+
         self.assertThat(expected_day, Equals(selected_date.day))
         self.assertThat(expected_month, Equals(selected_date.month))
         self.assertThat(expected_year, Equals(selected_date.year))