From 7d1549250dfd8ab2e6c54a6423a222c81d8cf202 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Thu, 3 Nov 2016 15:26:38 -0400 Subject: [PATCH] Fix condition in weekly recurrence calculator --- SOPE/NGCards/iCalDailyRecurrenceCalculator.m | 3 +-- SOPE/NGCards/iCalWeeklyRecurrenceCalculator.m | 8 ++++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/SOPE/NGCards/iCalDailyRecurrenceCalculator.m b/SOPE/NGCards/iCalDailyRecurrenceCalculator.m index 04106dab4..cb2172623 100644 --- a/SOPE/NGCards/iCalDailyRecurrenceCalculator.m +++ b/SOPE/NGCards/iCalDailyRecurrenceCalculator.m @@ -163,8 +163,7 @@ { r = [NGCalendarDateRange calendarDateRangeWithStartDate: currentStartDate endDate: currentEndDate]; - if ([_r containsDateRange: r] || [_r doesIntersectWithDateRange: r]) - [ranges addObject: r]; + [ranges addObject: r]; } } } diff --git a/SOPE/NGCards/iCalWeeklyRecurrenceCalculator.m b/SOPE/NGCards/iCalWeeklyRecurrenceCalculator.m index ad2812e15..fcd413f41 100644 --- a/SOPE/NGCards/iCalWeeklyRecurrenceCalculator.m +++ b/SOPE/NGCards/iCalWeeklyRecurrenceCalculator.m @@ -126,16 +126,16 @@ while ([currentStartDate compare: endDate] == NSOrderedAscending || [currentStartDate compare: endDate] == NSOrderedSame) { + currentEndDate = [currentStartDate addTimeInterval: [firstRange duration]]; if ([startDate compare: currentStartDate] == NSOrderedAscending || - [startDate compare: currentStartDate] == NSOrderedSame) + [startDate compare: currentStartDate] == NSOrderedSame || + [startDate compare: currentEndDate] == NSOrderedAscending) { NGCalendarDateRange *r; - currentEndDate = [currentStartDate addTimeInterval: [firstRange duration]]; r = [NGCalendarDateRange calendarDateRangeWithStartDate: currentStartDate endDate: currentEndDate]; - if ([_r containsDateRange: r]) - [ranges addObject: r]; + [ranges addObject: r]; } i++; currentStartDate = [firStart dateByAddingYears: 0