From 45a5b533a3d25ee2472ad04def38dac672017f8b Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Wed, 2 Aug 2017 16:51:02 -0400 Subject: [PATCH] (web) Improve event lists results --- UI/Scheduler/UIxCalListingActions.m | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/UI/Scheduler/UIxCalListingActions.m b/UI/Scheduler/UIxCalListingActions.m index 2e65e5b6d..b49ef9e05 100644 --- a/UI/Scheduler/UIxCalListingActions.m +++ b/UI/Scheduler/UIxCalListingActions.m @@ -115,6 +115,7 @@ static NSArray *tasksFields = nil; user = [[self context] activeUser]; ASSIGN (dateFormatter, [user dateFormatterInContext: context]); ASSIGN (userTimeZone, [[user userDefaults] timeZone]); + [now setTimeZone: userTimeZone]; dayBasedView = NO; currentView = nil; ASSIGN (enabledWeekDays, [[user userDefaults] calendarWeekdays]); @@ -153,23 +154,20 @@ static NSArray *tasksFields = nil; } else if ([popupValue isEqualToString: @"view_next7"]) { - newDate = [NSCalendarDate calendarDate]; - [newDate setTimeZone: userTZ]; - startDate = [newDate beginOfDay]; + startDate = [NSCalendarDate calendarDate]; + [startDate setTimeZone: userTZ]; endDate = [[startDate dateByAddingYears: 0 months: 0 days: 6] endOfDay]; } else if ([popupValue isEqualToString: @"view_next14"]) { - newDate = [NSCalendarDate calendarDate]; - [newDate setTimeZone: userTZ]; - startDate = [newDate beginOfDay]; + startDate = [NSCalendarDate calendarDate]; + [startDate setTimeZone: userTZ]; endDate = [[startDate dateByAddingYears: 0 months: 0 days: 13] endOfDay]; } else if ([popupValue isEqualToString: @"view_next31"]) { - newDate = [NSCalendarDate calendarDate]; - [newDate setTimeZone: userTZ]; - startDate = [newDate beginOfDay]; + startDate = [NSCalendarDate calendarDate]; + [startDate setTimeZone: userTZ]; endDate = [[startDate dateByAddingYears: 0 months: 0 days: 30] endOfDay]; } else if ([popupValue isEqualToString: @"view_thismonth"]) @@ -181,9 +179,8 @@ static NSArray *tasksFields = nil; } else if ([popupValue isEqualToString: @"view_future"]) { - newDate = [NSCalendarDate calendarDate]; - [newDate setTimeZone: userTZ]; - startDate = [newDate beginOfDay]; + startDate = [NSCalendarDate calendarDate]; + [startDate setTimeZone: userTZ]; endDate = nil; } else if ([popupValue isEqualToString: @"view_selectedday"])