Merge lp:~gerlowskija/ubuntu-calendar-app/click_day_from_week_view_bug1291504 into lp:ubuntu-calendar-app

[Jason]

Switch to selected date in 'Day View' when user clicks on day in 'Week View'

As part of the HackDay for the Calendar app, I wanted to address Bug 1921504, which requests that support be added for "zooming-in" to individual days by clicking on the date from the Week View.

This branch should contain a commit for the change that allows users to pull up the Day view when they click on a day, as well as a commit with an autopilot test that can be run to check this behavior.

You can test the change by:
     1) Open the calendar app.
     2) Navigate to the "Week" view/tab.
     3) Click on on of the days of the week (either the name of the day (Mon, Tue, Wed, etc), or the date that should be right below it).
     4) Check that the display now shows the "Day" view/tab, and that you're looking at the day you selected

(Hopefully I staged and pushed my changes correctly; bit of a bzr novice).

[Kunal Parmar (pkunal-parmar)]

+ MouseArea {
18 + anchors.fill: parent
19 + onClicked: {
20 + root.dateSelected(date);
21 + }
22 + }

I think it would be better if we add this click handler to parent component( i mean the root id), so we dont need to add separate handler for both label component.

review: Needs Fixing

[Jason (gerlowskija)]

> + MouseArea {
> 18 + anchors.fill: parent
> 19 + onClicked: {
> 20 + root.dateSelected(date);
> 21 + }
> 22 + }
>
> I think it would be better if we add this click handler to parent component( i
> mean the root id), so we dont need to add separate handler for both label
> component.

Thanks for the quick review! Your comment makes sense. I spent 5 minutes trying to make the change naively so it looks like:
Column {
    Label {}
    Label {}
    MouseArea {}
}

but something I did mangles the display a bit, and the click action doesn't work on the dates any more. I'll have to take a harder look later today when I have a little more time.

[Kunal Parmar (pkunal-parmar)]

ok, I will also check if same works at my end as well.
thanks for confirmation

[Roman Shchekin (mrqtros)]

Take this solution, please :)

import QtQuick 2.0
import Ubuntu.Components 0.1

Item {
    id: root

    property var date;

    property alias dateColor: dateLabel.color
    property alias dayColor: dayLabel.color

    property int dayFormat: Locale.ShortFormat;

    signal dateSelected(var date);

    width: parent.width
    height: innerColumn.height

    Column {
        id: innerColumn
        width: parent.width
        spacing: units.gu(2)

        Label{
            id: dayLabel
            property var day: Qt.locale().standaloneDayName(date.getDay(), dayFormat)
            text: day.toUpperCase();
            fontSize: "medium"
            horizontalAlignment: Text.AlignHCenter
            color: "#AEA79F"
            width: parent.width
        }

        Label{
            id: dateLabel
            objectName: "dateLabel"
            text: date.getDate();
            fontSize: "large"
            horizontalAlignment: Text.AlignHCenter
            width: parent.width
        }
    }

    MouseArea {
        anchors.fill: parent
        onClicked: {
            root.dateSelected(date);
        }
    }
}

> > + MouseArea {
> > 18 + anchors.fill: parent
> > 19 + onClicked: {
> > 20 + root.dateSelected(date);
> > 21 + }
> > 22 + }
> >
> > I think it would be better if we add this click handler to parent component(
> i
> > mean the root id), so we dont need to add separate handler for both label
> > component.
>
> Thanks for the quick review! Your comment makes sense. I spent 5 minutes
> trying to make the change naively so it looks like:
> Column {
> Label {}
> Label {}
> MouseArea {}
> }
>
> but something I did mangles the display a bit, and the click action doesn't
> work on the dates any more. I'll have to take a harder look later today when
> I have a little more time.

[Jason (gerlowskija)]

I'd be happy to : ) Thanks for the help Roman, I'm embarassed to say I'd been struggling to debug my QML for the last week. Really have some reading up to do.

I'll redraft the changes based on your comment and push up a revision tonight.

Thanks again!

[Jason (gerlowskija)]

This might be a dumb question, but I couldn't find any advice on StackOverflow/Google/etc...

Does bzr have an equivalent to git's "commit --amend". I'm not sure how to push my new changes, short of making a new revision/commit for the edits, which doesn't seem right to me.

I tried uncommit-ing, adding in the changes, and recommitting, but bzr told me that the branches had diverged. Is that the standard approach for revising pushed commits? (I might have just done it incorrectly).

[Kunal Parmar (pkunal-parmar)]

> This might be a dumb question, but I couldn't find any advice on
> StackOverflow/Google/etc...
>
> Does bzr have an equivalent to git's "commit --amend". I'm not sure how to
> push my new changes, short of making a new revision/commit for the edits,
> which doesn't seem right to me.
>
> I tried uncommit-ing, adding in the changes, and recommitting, but bzr told me
> that the branches had diverged. Is that the standard approach for revising
> pushed commits? (I might have just done it incorrectly).

I follow, following worksflow.

bzr branch ...
bzr commit -m 'New changes"
bzr push

bzr merge
bzr commit -m "furhter changes"
bzr push

[David Planella (dpm)]

Jason,

Amending or uncommitting (bzr uncommit) is only for local changes before a
push to a server. In general, you should not be amending branches that have
already been pushed publicly, as it will mess up the VCS hosting and anyone
else's local branches that have been checked out from there. Last time I
checked git out, this was also the advice there, although I've not been
using it for a while.

In summary: it's ok to do new commits for the corrections. Let us know if
we can help you with questions on #ubuntu-app-devel

Cheers,
David.

On Wed, Apr 2, 2014 at 6:22 AM, Kunal Parmar <email address hidden>wrote:

> > This might be a dumb question, but I couldn't find any advice on
> > StackOverflow/Google/etc...
> >
> > Does bzr have an equivalent to git's "commit --amend". I'm not sure how
> to
> > push my new changes, short of making a new revision/commit for the edits,
> > which doesn't seem right to me.
> >
> > I tried uncommit-ing, adding in the changes, and recommitting, but bzr
> told me
> > that the branches had diverged. Is that the standard approach for
> revising
> > pushed commits? (I might have just done it incorrectly).
>
> I follow, following worksflow.
>
> bzr branch ...
> bzr commit -m 'New changes"
> bzr push
>
> bzr merge
> bzr commit -m "furhter changes"
> bzr push
> --
>
> https://code.launchpad.net/~gerlowskija/ubuntu-calendar-app/click_day_from_week_view_bug1291504/+merge/212959
> Your team Ubuntu Calendar Developers is subscribed to branch
> lp:ubuntu-calendar-app.
>

[Jason (gerlowskija)]

Thanks David, I figured out my problem thanks to the comments you and Kunal posted. I repushed the branch and it should be ready for review whenever.

Thanks again for all the noob help.

Jason

> Jason,
>
> Amending or uncommitting (bzr uncommit) is only for local changes before a
> push to a server. In general, you should not be amending branches that have
> already been pushed publicly, as it will mess up the VCS hosting and anyone
> else's local branches that have been checked out from there. Last time I
> checked git out, this was also the advice there, although I've not been
> using it for a while.
>
> In summary: it's ok to do new commits for the corrections. Let us know if
> we can help you with questions on #ubuntu-app-devel
>
> Cheers,
> David.
>
>
> On Wed, Apr 2, 2014 at 6:22 AM, Kunal Parmar <email address hidden>wrote:
>
> > > This might be a dumb question, but I couldn't find any advice on
> > > StackOverflow/Google/etc...
> > >
> > > Does bzr have an equivalent to git's "commit --amend". I'm not sure how
> > to
> > > push my new changes, short of making a new revision/commit for the edits,
> > > which doesn't seem right to me.
> > >
> > > I tried uncommit-ing, adding in the changes, and recommitting, but bzr
> > told me
> > > that the branches had diverged. Is that the standard approach for
> > revising
> > > pushed commits? (I might have just done it incorrectly).
> >
> > I follow, following worksflow.
> >
> > bzr branch ...
> > bzr commit -m 'New changes"
> > bzr push
> >
> > bzr merge
> > bzr commit -m "furhter changes"
> > bzr push
> > --
> >
> > https://code.launchpad.net/~gerlowskija/ubuntu-calendar-
> app/click_day_from_week_view_bug1291504/+merge/212959
> > Your team Ubuntu Calendar Developers is subscribed to branch
> > lp:ubuntu-calendar-app.
> >

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Looks good to me, thanks!

review: Approve

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

FAILED: Autolanding.
No commit message was specified in the merge proposal. Hit 'Add commit message' on the merge proposal web page or follow the link below. You can approve the merge proposal yourself to rerun.
https://code.launchpad.net/~gerlowskija/ubuntu-calendar-app/click_day_from_week_view_bug1291504/+merge/212959/+edit-commit-message

review: Needs Fixing (continuous-integration)

[Jason (gerlowskija)]

Added a commit message, and remarked as approve.

review: Approve

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

review: Approve (continuous-integration)

=== modified file 'HeaderDateComponent.qml'
--- HeaderDateComponent.qml	2013-10-28 21:08:48 +0000
+++ HeaderDateComponent.qml	2014-04-02 10:38:29 +0000
@@ -1,7 +1,7 @@
 import QtQuick 2.0
 import Ubuntu.Components 0.1
 
-Column{
+Item {
     id: root
 
     property var date;
@@ -11,25 +11,40 @@
 
     property int dayFormat: Locale.ShortFormat;
 
+    signal dateSelected(var date);
+
     width: parent.width
-    spacing: units.gu(2)
+    height: innerColumn.height
 
-    Label{
-        id: dayLabel
-        property var day: Qt.locale().standaloneDayName(date.getDay(), dayFormat)
-        text: day.toUpperCase();
-        fontSize: "medium"
-        horizontalAlignment: Text.AlignHCenter
-        color: "#AEA79F"
+    Column {
+        id: innerColumn
         width: parent.width
+        spacing: units.gu(2)
+
+        Label{
+            id: dayLabel
+            property var day: Qt.locale().standaloneDayName(date.getDay(), dayFormat)
+            text: day.toUpperCase();
+            fontSize: "medium"
+            horizontalAlignment: Text.AlignHCenter
+            color: "#AEA79F"
+            width: parent.width
+        }
+
+        Label{
+            id: dateLabel
+            objectName: "dateLabel"
+            text: date.getDate();
+            fontSize: "large"
+            horizontalAlignment: Text.AlignHCenter
+            width: parent.width
+        }
     }
 
-    Label{
-        id: dateLabel
-        objectName: "dateLabel"
-        text: date.getDate();
-        fontSize: "large"
-        horizontalAlignment: Text.AlignHCenter
-        width: parent.width
+    MouseArea {
+        anchors.fill: parent
+        onClicked: {
+            root.dateSelected(date);
+        }
     }
 }

=== modified file 'TimeLineHeader.qml'
--- TimeLineHeader.qml	2014-02-12 00:24:25 +0000
+++ TimeLineHeader.qml	2014-04-02 10:38:29 +0000
@@ -17,6 +17,8 @@
 
     property var date;
 
+    signal dateSelected(var date);
+
     DayHeaderBackground{
         height: FontUtils.sizeToPixels("medium") + units.gu(1.5)
     }
@@ -38,6 +40,10 @@
 
         startDay: getStartDate();
 
+        onDateSelected: {
+            header.dateSelected(date);
+        }
+
         function getStartDate() {
             switch(type) {
             case ViewType.ViewTypeWeek:

=== modified file 'TimeLineHeaderComponent.qml'
--- TimeLineHeaderComponent.qml	2014-01-31 03:20:40 +0000
+++ TimeLineHeaderComponent.qml	2014-04-02 10:38:29 +0000
@@ -13,6 +13,8 @@
     property var startDay: DateExt.today();
     property bool isCurrentItem: false
 
+    signal dateSelected(var date);
+
     width: parent.width
 
     Repeater{
@@ -45,6 +47,10 @@
                     header.width
                 }
             }
+
+            onDateSelected: {
+                header.dateSelected(date);
+            }
         }
     }
 }

=== modified file 'WeekView.qml'
--- WeekView.qml	2014-03-26 14:39:17 +0000
+++ WeekView.qml	2014-04-02 10:38:29 +0000
@@ -12,6 +12,8 @@
     property var firstDay: dayStart.weekStart(Qt.locale().firstDayOfWeek);
     property bool isCurrentPage: false
 
+    signal dateSelected(var date);
+
     anchors.fill: parent
     anchors.top: parent.top
     anchors.topMargin: units.gu(1.5)
@@ -28,6 +30,10 @@
         objectName: "weekHeader"
         type: ViewType.ViewTypeWeek
         date: weekViewPath.weekStart
+
+        onDateSelected: {
+            root.dateSelected(date);
+        }
     }
 
     PathViewBase{

=== modified file 'calendar.qml'
--- calendar.qml	2014-03-30 13:13:35 +0000
+++ calendar.qml	2014-04-02 10:38:29 +0000
@@ -290,6 +290,11 @@
                             onDayStartChanged: {
                                 tabPage.currentDay = dayStart;
                             }
+
+                            onDateSelected: {
+                                tabs.selectedTabIndex = 3;
+                                tabPage.currentDay = date;
+                            }
                         }
                     }
                 }

=== modified file 'tests/autopilot/calendar_app/tests/test_weekview.py'
--- tests/autopilot/calendar_app/tests/test_weekview.py	2014-02-24 15:58:49 +0000
+++ tests/autopilot/calendar_app/tests/test_weekview.py	2014-04-02 10:38:29 +0000
@@ -154,3 +154,25 @@
         """It must be possible to show previous weeks by swiping the view."""
         for i in range(6):
             self._change_week(-1)
+
+    def test_selecting_a_day_switches_to_day_view(self):
+        """It must be possible to show a single day by clicking on it."""
+        first_day_date = self.week_view.firstDay
+        expected_day = first_day_date.day
+        expected_month = first_day_date.month
+        expected_year = first_day_date.year
+
+        days = self._get_days_of_week()
+        day_to_select = self.main_view.get_label_with_text(days[0])
+
+        self.pointing_device.click_object(day_to_select)
+
+        #Check that the view changed from 'Week' to 'Day'
+        day_view = self.main_view.get_day_view()
+        self.assertThat(day_view.visible, Eventually(Equals(True)))
+
+        #Check that the 'Day' view is on the correct/selected day.
+        selected_date = day_view.select_single("TimeLineHeader").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))