Indicator Date and Time

Merge lp:~3v1n0/indicator-datetime/planner-ignore-previous-day into lp:indicator-datetime

planner-ignore-previous-day
Merge into trunk.16.10

Proposed by Marco Trevisan (Treviño) on 2016-11-16

Status:

Merged

Approved by:

Charles Kerr on 2016-11-16

Approved revision:

469

Merged at revision:

469

Proposed branch:

lp:~3v1n0/indicator-datetime/planner-ignore-previous-day

Merge into:

lp:indicator-datetime

Diff against target:

12 lines (+1/-1)

1 file modified

src/planner-upcoming.cpp (+1/-1)

To merge this branch:

bzr merge lp:~3v1n0/indicator-datetime/planner-ignore-previous-day

Related bugs:

Bug #1641720: Selecting a day does not display all day event for that day	Low	Fix Released
Bug #1641726: Tapping a day displays all day event from previous day	Medium	Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Charles Kerr (community)		2016-11-16	Approve on 2016-11-16
unity-api-1-bot	continuous-integration		Approve on 2016-11-16
Review via email: mp+310952@code.launchpad.net

Commit message

UpcomingPlanner: don't get events from the day before of the selected one

We only need events from the midnight of the selected date to the next month

Description of the change

Without this, if I select, say the 24th october on my calendar (same in u8 and u7), im getting this output

(process:10958): Indicator-Datetime-DEBUG: 0x1065430 setting date range to [2016-11-23 00:00:00..2016-12-23 00:00:00]
(process:10958): Indicator-Datetime-DEBUG: rebuilding because the date range changed
(process:10958): Indicator-Datetime-DEBUG: getting all appointments from [2016-11-23 00:00:00 ... 2016-12-23 00:00:00]

Which looks indeed wrong... Using the start time of the selected day should be enough IMHO.

Revision history for this message

unity-api-1-bot (unity-api-1-bot) wrote on 2016-11-16:

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-datetime-ci/8/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

unity-api-1-bot (unity-api-1-bot) wrote on 2016-11-16:

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-datetime-ci/9/rebuild

review: Approve (continuous-integration)

Revision history for this message

Charles Kerr (charlesk) wrote on 2016-11-16:

LGTM. I'm not sure what that -1 was in there for.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Indicator Applet Developers

Marco Trevisan (Treviño)

1	=== modified file 'src/planner-upcoming.cpp'
2	--- src/planner-upcoming.cpp 2015-03-15 02:31:42 +0000
3	+++ src/planner-upcoming.cpp 2016-11-16 01:58:45 +0000
4	@@ -33,7 +33,7 @@
5	{
6	date().changed().connect([this](const DateTime& dt){
7	// set the range to the upcoming month
8	- const auto b = dt.add_days(-1).start_of_day();
9	+ const auto b = dt.start_of_day();
10	const auto e = b.add_full(0, 1, 0, 0, 0, 0);
11	g_debug("%p setting date range to [%s..%s]", this, b.format("%F %T").c_str(), e.format("%F %T").c_str());
12	m_range_planner->range().set(std::pair<DateTime,DateTime>(b,e));