Revert "fix(calendar): Flatten cycle change: the day at 00:00 is now used to retrieve all occurrences. This change should resolve the issue where resource availability is not detected if the event is shorter than the occurrence duration in the resource."

This reverts commit 9941e2a04b.
This commit is contained in:
Hivert Quentin
2025-02-17 16:49:42 +01:00
parent 02dd5c3501
commit a1e8a5c4af

View File

@@ -1381,7 +1381,6 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
// Calculate the occurrences for the given range
records = [NSMutableArray array];
ranges = [NSMutableArray arrayWithArray:
[iCalRecurrenceCalculator recurrenceRangesWithinCalendarDateRange: recurrenceRange
firstInstanceCalendarDateRange: firstRange
@@ -1447,16 +1446,7 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
max = [_records count];
ma = [NSMutableArray arrayWithCapacity: max];
NSCalendarDate *originalDate = [_r startDate];
// Adjust the start date to the beginning of the day to ensure it intersects with events where the new event starts after an existing events start time.
_r = [NGCalendarDateRange calendarDateRangeWithStartDate:[NSCalendarDate dateWithYear:originalDate.yearOfCommonEra
month:originalDate.monthOfYear
day:originalDate.dayOfMonth
hour:0
minute:0
second:0
timeZone:originalDate.timeZone]
_r = [NGCalendarDateRange calendarDateRangeWithStartDate: [_r startDate]
endDate: [_r endDate]];
for (count = 0; count < max; count++)