1
=== modified file 'MonthView.qml'
2
--- MonthView.qml	2014-01-09 23:15:57 +0000
3
+++ MonthView.qml	2014-02-10 13:56:10 +0000
4
@@ -14,7 +14,7 @@
5
14
    PathViewBase{
14
    PathViewBase{
6
15
        id: monthViewPath
15
        id: monthViewPath
7
16
16
9
17
        property var startMonth: addMonth(currentMonth,-1);
17
        property var startMonth: currentMonth;
10
18
18
11
19
        anchors.top:parent.top
19
        anchors.top:parent.top
12
20
20
13
@@ -44,6 +44,8 @@
14
44
        }
44
        }
15
45
45
16
46
        delegate: MonthComponent{
46
        delegate: MonthComponent{
17
47
            property bool isCurrentItem: index === monthViewPath.currentIndex
18
48
19
47
            width: parent.width - units.gu(5)
49
            width: parent.width - units.gu(5)
20
48
            height: parent.height - units.gu(5)
50
            height: parent.height - units.gu(5)
21
49
51
22
@@ -54,7 +56,7 @@
23
54
                case 0:
56
                case 0:
24
55
                    return monthViewPath.startMonth;
57
                    return monthViewPath.startMonth;
25
56
                case -1:
58
                case -1:
27
57
                    return monthViewPath.addMonth(monthViewPath.startMonth,2);
59
                    return monthViewPath.addMonth(monthViewPath.startMonth,-1);
28
58
                case 1:
60
                case 1:
29
59
                    return monthViewPath.addMonth(monthViewPath.startMonth,1);
61
                    return monthViewPath.addMonth(monthViewPath.startMonth,1);
30
60
                }
62
                }
31
61
63
32
=== modified file 'PathViewBase.qml'
33
--- PathViewBase.qml	2013-09-16 14:04:01 +0000
34
+++ PathViewBase.qml	2014-02-10 13:56:10 +0000
35
@@ -9,11 +9,12 @@
36
9
    signal nextItemHighlighted();
9
    signal nextItemHighlighted();
37
10
    signal previousItemHighlighted();
10
    signal previousItemHighlighted();
38
11
11
39
12
    preferredHighlightBegin: 0.5
40
13
    preferredHighlightEnd: 0.5
41
14
42
12
    path: Path {
15
    path: Path {
47
13
        startX: -(root.width/2); startY: root.height/2
16
        startX: -(root.width); startY: root.height/2
48
14
        PathLine { relativeX: root.width; relativeY: 0 }
17
        PathLine { x: (root.width)*2  ; relativeY: 0;  }
45
15
        PathLine { relativeX: root.width; relativeY: 0 }
46
16
        PathLine { relativeX: root.width; relativeY: 0 }
49
17
    }
18
    }
50
18
19
51
19
    // 0= current index, -1= previous index, 1 next index
20
    // 0= current index, -1= previous index, 1 next index
52
20
21
53
=== modified file 'TimeLineHeader.qml'
54
--- TimeLineHeader.qml	2013-09-28 09:37:52 +0000
55
+++ TimeLineHeader.qml	2014-02-10 13:56:10 +0000
56
@@ -64,7 +64,7 @@
57
64
            case 0:
64
            case 0:
58
65
                return date;
65
                return date;
59
66
            case -1:
66
            case -1:
61
67
                return date.addDays(14);
67
                return date.addDays(-7);
62
68
            case 1:
68
            case 1:
63
69
                return date.addDays(7);
69
                return date.addDays(7);
64
70
            }
70
            }
65
71
71
66
=== modified file 'WeekView.qml'
67
--- WeekView.qml	2014-01-28 01:51:29 +0000
68
+++ WeekView.qml	2014-02-10 13:56:10 +0000
69
@@ -31,7 +31,7 @@
70
31
        id: weekViewPath
31
        id: weekViewPath
71
32
32
72
33
        property var visibleWeek: dayStart.weekStart(Qt.locale().firstDayOfWeek);
33
        property var visibleWeek: dayStart.weekStart(Qt.locale().firstDayOfWeek);
74
34
        property var weekStart: weekViewPath.visibleWeek.addDays(-7)
34
        property var weekStart: weekViewPath.visibleWeek
75
35
35
76
36
        width: parent.width
36
        width: parent.width
77
37
        height: root.height - weekViewPath.y
37
        height: root.height - weekViewPath.y
78
@@ -71,7 +71,7 @@
79
71
                    return weekViewPath.weekStart;
71
                    return weekViewPath.weekStart;
80
72
                case -1:
72
                case -1:
81
73
                    var weekStartDay= weekViewPath.weekStart.weekStart(Qt.locale().firstDayOfWeek);
73
                    var weekStartDay= weekViewPath.weekStart.weekStart(Qt.locale().firstDayOfWeek);
83
74
                    return weekStartDay.addDays(14);
74
                    return weekStartDay.addDays(-7);
84
75
                case 1:
75
                case 1:
85
76
                    var weekStartDay = weekViewPath.weekStart.weekStart(Qt.locale().firstDayOfWeek);
76
                    var weekStartDay = weekViewPath.weekStart.weekStart(Qt.locale().firstDayOfWeek);
86
77
                    return weekStartDay.addDays(7);
77
                    return weekStartDay.addDays(7);
87
78
78
88
=== modified file 'YearView.qml'
89
--- YearView.qml	2014-01-09 23:15:57 +0000
90
+++ YearView.qml	2014-02-10 13:56:10 +0000
91
@@ -25,25 +25,21 @@
92
25
        return new Date(year,0,1,0,0,0,0);
25
        return new Date(year,0,1,0,0,0,0);
93
26
    }
26
    }
94
27
27
95
28
    QtObject{
96
29
        id: intern
97
30
        property var startYear: getDateFromYear(currentYear.getFullYear()-1);
98
31
    }
99
32
100
33
    delegate: GridView{
28
    delegate: GridView{
101
34
        id: yearView
29
        id: yearView
102
35
        clip: true
30
        clip: true
103
36
31
104
32
        property bool isCurrentItem: index == root.currentIndex
105
37
        property var year: getYear();
33
        property var year: getYear();
106
38
34
107
39
        function getYear() {
35
        function getYear() {
108
40
            switch( root.indexType(index)) {
36
            switch( root.indexType(index)) {
109
41
            case 0:
37
            case 0:
111
42
                return intern.startYear;
38
                return currentYear;
112
43
            case -1:
39
            case -1:
114
44
                return getDateFromYear(intern.startYear.getFullYear() - 1);
40
                return getDateFromYear(currentYear.getFullYear() - 1);
115
45
            case 1:
41
            case 1:
117
46
                return getDateFromYear(intern.startYear.getFullYear() + 1);
42
                return getDateFromYear(currentYear.getFullYear() + 1);
118
47
            }
43
            }
119
48
        }
44
        }
120
49
45
121
50
46
122
=== modified file 'tests/autopilot/calendar_app/tests/test_weekview.py'
123
--- tests/autopilot/calendar_app/tests/test_weekview.py	2014-01-09 23:30:55 +0000
124
+++ tests/autopilot/calendar_app/tests/test_weekview.py	2014-02-10 13:56:10 +0000
125
@@ -70,7 +70,8 @@
126
70
70
127
71
    def _get_date_label_headers(self):
71
    def _get_date_label_headers(self):
128
72
        header = self.main_view.select_single(objectName="weekHeader")
72
        header = self.main_view.select_single(objectName="weekHeader")
130
73
        timeline = header.select_many("TimeLineHeaderComponent")[0]
73
        timeline = header.select_single("TimeLineHeaderComponent",
131
74
                                        isCurrentItem=True)
132
74
        dateLabels = timeline.select_many("Label", objectName="dateLabel")
75
        dateLabels = timeline.select_many("Label", objectName="dateLabel")
133
75
        return dateLabels
76
        return dateLabels
134
76
77
135
77
78
136
=== modified file 'tests/autopilot/calendar_app/tests/test_yearview.py'
137
--- tests/autopilot/calendar_app/tests/test_yearview.py	2014-01-09 23:28:15 +0000
138
+++ tests/autopilot/calendar_app/tests/test_yearview.py	2014-02-10 13:56:10 +0000
139
@@ -10,7 +10,6 @@
140
10
"""
10
"""
141
11
11
142
12
from datetime import datetime
12
from datetime import datetime
143
13
144
14
from autopilot.matchers import Eventually
13
from autopilot.matchers import Eventually
145
15
from testtools.matchers import Equals, NotEquals
14
from testtools.matchers import Equals, NotEquals
146
16
15
147
@@ -28,13 +27,19 @@
148
28
27
149
29
        self.year_view = self.main_view.get_year_view()
28
        self.year_view = self.main_view.get_year_view()
150
30
29
151
30
    def get_current_year(self):
152
31
        return self.year_view.select_single("QQuickGridView",
153
32
                                            isCurrentItem=True)
154
33
155
31
    def test_selecting_a_month_switch_to_month_view(self):
34
    def test_selecting_a_month_switch_to_month_view(self):
156
32
        """It must be possible to select a month and open the month view."""
35
        """It must be possible to select a month and open the month view."""
157
33
36
158
34
        # TODO: the component indexed at 1 is the one currently displayed,
37
        # TODO: the component indexed at 1 is the one currently displayed,
159
35
        # investigate a way to validate this assumption visually.
38
        # investigate a way to validate this assumption visually.
161
36
        year_grid = self.year_view.select_many("QQuickGridView")[0]
39
        year_grid = self.get_current_year()
162
40
        self.assertThat(year_grid, NotEquals(None))
163
37
        months = year_grid.select_many("MonthComponent")
41
        months = year_grid.select_many("MonthComponent")
164
42
        months.sort(key=lambda month: month.monthDate)
165
38
        self.assert_current_year_is_default_one(months[0])
43
        self.assert_current_year_is_default_one(months[0])
166
39
44
167
40
        february = months[1]
45
        february = months[1]
168
@@ -48,7 +53,11 @@
169
48
53
170
49
        month_view = self.main_view.get_month_view()
54
        month_view = self.main_view.get_month_view()
171
50
        self.assertThat(month_view.visible, Eventually(Equals(True)))
55
        self.assertThat(month_view.visible, Eventually(Equals(True)))
173
51
        selected_month = month_view.select_many("MonthComponent")[0]
56
174
57
        selected_month = month_view.select_single("MonthComponent",
175
58
                                                  isCurrentItem=True)
176
59
177
60
        self.assertThat(selected_month, NotEquals(None))
178
52
61
179
53
        self.assertThat(self.main_view.get_year(selected_month),
62
        self.assertThat(self.main_view.get_year(selected_month),
180
54
                        Equals(expected_year))
63
                        Equals(expected_year))
181
@@ -108,13 +117,13 @@
182
108
        if now.month > 6:
117
        if now.month > 6:
183
109
            self.drag_page_up()
118
            self.drag_page_up()
184
110
119
186
111
        year_grid = self.year_view.select_many("QQuickGridView")[0]
120
        year_grid = self.get_current_year()
187
121
        self.assertThat(year_grid, NotEquals(None))
188
112
        months = year_grid.select_many("MonthComponent")
122
        months = year_grid.select_many("MonthComponent")
189
113
123
190
114
        for month in months:
124
        for month in months:
191
115
            current_month_label = month.select_single(
125
            current_month_label = month.select_single(
192
116
                "Label", objectName="monthLabel")
126
                "Label", objectName="monthLabel")
193
117
194
118
            if current_month_name == current_month_label.text:
127
            if current_month_name == current_month_label.text:
195
119
                return month
128
                return month
196
120
129
Status:	Merged
Approved by:	Olivier Tilloy on 2014-02-10
Approved revision:	194
Merged at revision:	195
Proposed branch:	lp:~pkunal-parmar/ubuntu-calendar-app/nextYearFix
Merge into:	lp:ubuntu-calendar-app
Diff against target:	195 lines (+32/-23) 7 files modified MonthView.qml (+4/-2) PathViewBase.qml (+5/-4) TimeLineHeader.qml (+1/-1) WeekView.qml (+2/-2) YearView.qml (+4/-8) tests/autopilot/calendar_app/tests/test_weekview.py (+2/-1) tests/autopilot/calendar_app/tests/test_yearview.py (+14/-5)
To merge this branch:	bzr merge lp:~pkunal-parmar/ubuntu-calendar-app/nextYearFix
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Olivier Tilloy (community)		2013-12-03	Approve on 2014-02-10
Ubuntu Phone Apps Jenkins Bot	continuous-integration		Approve on 2014-02-10
Review via email: mp+197624@code.launchpad.net
1	=== modified file 'MonthView.qml'
2	--- MonthView.qml 2014-01-09 23:15:57 +0000
3	+++ MonthView.qml 2014-02-10 13:56:10 +0000
4	@@ -14,7 +14,7 @@
5	14	PathViewBase{	14	PathViewBase{
6	15	id: monthViewPath	15	id: monthViewPath
7	16		16
9	17	property var startMonth: addMonth(currentMonth,-1);	17	property var startMonth: currentMonth;
10	18		18
11	19	anchors.top:parent.top	19	anchors.top:parent.top
12	20		20
13	@@ -44,6 +44,8 @@
14	44	}	44	}
15	45		45
16	46	delegate: MonthComponent{	46	delegate: MonthComponent{
17			47	property bool isCurrentItem: index === monthViewPath.currentIndex
18			48
19	47	width: parent.width - units.gu(5)	49	width: parent.width - units.gu(5)
20	48	height: parent.height - units.gu(5)	50	height: parent.height - units.gu(5)
21	49		51
22	@@ -54,7 +56,7 @@
23	54	case 0:	56	case 0:
24	55	return monthViewPath.startMonth;	57	return monthViewPath.startMonth;
25	56	case -1:	58	case -1:
27	57	return monthViewPath.addMonth(monthViewPath.startMonth,2);	59	return monthViewPath.addMonth(monthViewPath.startMonth,-1);
28	58	case 1:	60	case 1:
29	59	return monthViewPath.addMonth(monthViewPath.startMonth,1);	61	return monthViewPath.addMonth(monthViewPath.startMonth,1);
30	60	}	62	}
31	61		63
32	=== modified file 'PathViewBase.qml'
33	--- PathViewBase.qml 2013-09-16 14:04:01 +0000
34	+++ PathViewBase.qml 2014-02-10 13:56:10 +0000
35	@@ -9,11 +9,12 @@
36	9	signal nextItemHighlighted();	9	signal nextItemHighlighted();
37	10	signal previousItemHighlighted();	10	signal previousItemHighlighted();
38	11		11
39			12	preferredHighlightBegin: 0.5
40			13	preferredHighlightEnd: 0.5
41			14
42	12	path: Path {	15	path: Path {
47	13	startX: -(root.width/2); startY: root.height/2	16	startX: -(root.width); startY: root.height/2
48	14	PathLine { relativeX: root.width; relativeY: 0 }	17	PathLine { x: (root.width)*2 ; relativeY: 0; }
45	15	PathLine { relativeX: root.width; relativeY: 0 }
46	16	PathLine { relativeX: root.width; relativeY: 0 }
49	17	}	18	}
50	18		19
51	19	// 0= current index, -1= previous index, 1 next index	20	// 0= current index, -1= previous index, 1 next index
52	20		21
53	=== modified file 'TimeLineHeader.qml'
54	--- TimeLineHeader.qml 2013-09-28 09:37:52 +0000
55	+++ TimeLineHeader.qml 2014-02-10 13:56:10 +0000
56	@@ -64,7 +64,7 @@
57	64	case 0:	64	case 0:
58	65	return date;	65	return date;
59	66	case -1:	66	case -1:
61	67	return date.addDays(14);	67	return date.addDays(-7);
62	68	case 1:	68	case 1:
63	69	return date.addDays(7);	69	return date.addDays(7);
64	70	}	70	}
65	71		71
66	=== modified file 'WeekView.qml'
67	--- WeekView.qml 2014-01-28 01:51:29 +0000
68	+++ WeekView.qml 2014-02-10 13:56:10 +0000
69	@@ -31,7 +31,7 @@
70	31	id: weekViewPath	31	id: weekViewPath
71	32		32
72	33	property var visibleWeek: dayStart.weekStart(Qt.locale().firstDayOfWeek);	33	property var visibleWeek: dayStart.weekStart(Qt.locale().firstDayOfWeek);
74	34	property var weekStart: weekViewPath.visibleWeek.addDays(-7)	34	property var weekStart: weekViewPath.visibleWeek
75	35		35
76	36	width: parent.width	36	width: parent.width
77	37	height: root.height - weekViewPath.y	37	height: root.height - weekViewPath.y
78	@@ -71,7 +71,7 @@
79	71	return weekViewPath.weekStart;	71	return weekViewPath.weekStart;
80	72	case -1:	72	case -1:
81	73	var weekStartDay= weekViewPath.weekStart.weekStart(Qt.locale().firstDayOfWeek);	73	var weekStartDay= weekViewPath.weekStart.weekStart(Qt.locale().firstDayOfWeek);
83	74	return weekStartDay.addDays(14);	74	return weekStartDay.addDays(-7);
84	75	case 1:	75	case 1:
85	76	var weekStartDay = weekViewPath.weekStart.weekStart(Qt.locale().firstDayOfWeek);	76	var weekStartDay = weekViewPath.weekStart.weekStart(Qt.locale().firstDayOfWeek);
86	77	return weekStartDay.addDays(7);	77	return weekStartDay.addDays(7);
87	78		78
88	=== modified file 'YearView.qml'
89	--- YearView.qml 2014-01-09 23:15:57 +0000
90	+++ YearView.qml 2014-02-10 13:56:10 +0000
91	@@ -25,25 +25,21 @@
92	25	return new Date(year,0,1,0,0,0,0);	25	return new Date(year,0,1,0,0,0,0);
93	26	}	26	}
94	27		27
95	28	QtObject{
96	29	id: intern
97	30	property var startYear: getDateFromYear(currentYear.getFullYear()-1);
98	31	}
99	32
100	33	delegate: GridView{	28	delegate: GridView{
101	34	id: yearView	29	id: yearView
102	35	clip: true	30	clip: true
103	36		31
104			32	property bool isCurrentItem: index == root.currentIndex
105	37	property var year: getYear();	33	property var year: getYear();
106	38		34
107	39	function getYear() {	35	function getYear() {
108	40	switch( root.indexType(index)) {	36	switch( root.indexType(index)) {
109	41	case 0:	37	case 0:
111	42	return intern.startYear;	38	return currentYear;
112	43	case -1:	39	case -1:
114	44	return getDateFromYear(intern.startYear.getFullYear() - 1);	40	return getDateFromYear(currentYear.getFullYear() - 1);
115	45	case 1:	41	case 1:
117	46	return getDateFromYear(intern.startYear.getFullYear() + 1);	42	return getDateFromYear(currentYear.getFullYear() + 1);
118	47	}	43	}
119	48	}	44	}
120	49		45
121	50		46
122	=== modified file 'tests/autopilot/calendar_app/tests/test_weekview.py'
123	--- tests/autopilot/calendar_app/tests/test_weekview.py 2014-01-09 23:30:55 +0000
124	+++ tests/autopilot/calendar_app/tests/test_weekview.py 2014-02-10 13:56:10 +0000
125	@@ -70,7 +70,8 @@
126	70		70
127	71	def _get_date_label_headers(self):	71	def _get_date_label_headers(self):
128	72	header = self.main_view.select_single(objectName="weekHeader")	72	header = self.main_view.select_single(objectName="weekHeader")
130	73	timeline = header.select_many("TimeLineHeaderComponent")[0]	73	timeline = header.select_single("TimeLineHeaderComponent",
131			74	isCurrentItem=True)
132	74	dateLabels = timeline.select_many("Label", objectName="dateLabel")	75	dateLabels = timeline.select_many("Label", objectName="dateLabel")
133	75	return dateLabels	76	return dateLabels
134	76		77
135	77		78
136	=== modified file 'tests/autopilot/calendar_app/tests/test_yearview.py'
137	--- tests/autopilot/calendar_app/tests/test_yearview.py 2014-01-09 23:28:15 +0000
138	+++ tests/autopilot/calendar_app/tests/test_yearview.py 2014-02-10 13:56:10 +0000
139	@@ -10,7 +10,6 @@
140	10	"""	10	"""
141	11		11
142	12	from datetime import datetime	12	from datetime import datetime
143	13
144	14	from autopilot.matchers import Eventually	13	from autopilot.matchers import Eventually
145	15	from testtools.matchers import Equals, NotEquals	14	from testtools.matchers import Equals, NotEquals
146	16		15
147	@@ -28,13 +27,19 @@
148	28		27
149	29	self.year_view = self.main_view.get_year_view()	28	self.year_view = self.main_view.get_year_view()
150	30		29
151			30	def get_current_year(self):
152			31	return self.year_view.select_single("QQuickGridView",
153			32	isCurrentItem=True)
154			33
155	31	def test_selecting_a_month_switch_to_month_view(self):	34	def test_selecting_a_month_switch_to_month_view(self):
156	32	"""It must be possible to select a month and open the month view."""	35	"""It must be possible to select a month and open the month view."""
157	33		36
158	34	# TODO: the component indexed at 1 is the one currently displayed,	37	# TODO: the component indexed at 1 is the one currently displayed,
159	35	# investigate a way to validate this assumption visually.	38	# investigate a way to validate this assumption visually.
161	36	year_grid = self.year_view.select_many("QQuickGridView")[0]	39	year_grid = self.get_current_year()
162			40	self.assertThat(year_grid, NotEquals(None))
163	37	months = year_grid.select_many("MonthComponent")	41	months = year_grid.select_many("MonthComponent")
164			42	months.sort(key=lambda month: month.monthDate)
165	38	self.assert_current_year_is_default_one(months[0])	43	self.assert_current_year_is_default_one(months[0])
166	39		44
167	40	february = months[1]	45	february = months[1]
168	@@ -48,7 +53,11 @@
169	48		53
170	49	month_view = self.main_view.get_month_view()	54	month_view = self.main_view.get_month_view()
171	50	self.assertThat(month_view.visible, Eventually(Equals(True)))	55	self.assertThat(month_view.visible, Eventually(Equals(True)))
173	51	selected_month = month_view.select_many("MonthComponent")[0]	56
174			57	selected_month = month_view.select_single("MonthComponent",
175			58	isCurrentItem=True)
176			59
177			60	self.assertThat(selected_month, NotEquals(None))
178	52		61
179	53	self.assertThat(self.main_view.get_year(selected_month),	62	self.assertThat(self.main_view.get_year(selected_month),
180	54	Equals(expected_year))	63	Equals(expected_year))
181	@@ -108,13 +117,13 @@
182	108	if now.month > 6:	117	if now.month > 6:
183	109	self.drag_page_up()	118	self.drag_page_up()
184	110		119
186	111	year_grid = self.year_view.select_many("QQuickGridView")[0]	120	year_grid = self.get_current_year()
187			121	self.assertThat(year_grid, NotEquals(None))
188	112	months = year_grid.select_many("MonthComponent")	122	months = year_grid.select_many("MonthComponent")
189	113		123
190	114	for month in months:	124	for month in months:
191	115	current_month_label = month.select_single(	125	current_month_label = month.select_single(
192	116	"Label", objectName="monthLabel")	126	"Label", objectName="monthLabel")
193	117
194	118	if current_month_name == current_month_label.text:	127	if current_month_name == current_month_label.text:
195	119	return month	128	return month
196	120		129