L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-57793-master' of git://github.com/junpataleta/moodle

Browse Source
This commit is contained in:
Jake Dallimore
2017-04-24 15:16:30 +08:00
parent 4c7dc6af94 6d5661a9b3
commit 0dcfadd9e4
2 changed files with 67 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
calendar/classes/rrule_manager.php
+14
View File
@@ -721,6 +721,20 @@ class rrule_manager {
unset($cloneevent->id);
\calendar_event::create($cloneevent, false);
}
// If COUNT rule is defined and the number of the generated event times is less than the the COUNT rule,
// repeat the processing until the COUNT rule is satisfied.
if ($count !== false && $count > 0) {
// Set count to the remaining counts.
$this->count = $count;
// Clone the original event, but set the timestart to the last generated event time.
$tmpevent = clone($event);
$tmpevent->timestart = end($eventtimes);
// Generate the additional event times.
$additionaleventtimes = $this->generate_recurring_event_times($tmpevent);
// Create the additional events.
$this->create_recurring_events($event, $additionaleventtimes);
}
}
/**
calendar/tests/rrule_manager_test.php
+53
View File
@@ -2691,6 +2691,59 @@ class core_calendar_rrule_manager_testcase extends advanced_testcase {
}
}
/*
* Other edge case tests.
*/
/**
* Tests for MONTHLY RRULE with BYMONTHDAY set to 31.
* Should not include February, April, June, September and November.
*/
public function test_monthly_bymonthday_31() {
global $DB;
$rrule = 'FREQ=MONTHLY;BYMONTHDAY=31;COUNT=20';
$mang = new rrule_manager($rrule);
$mang->parse_rrule();
$mang->create_events($this->event);
$records = $DB->get_records('event', ['repeatid' => $this->event->id], 'timestart ASC', 'id, repeatid, timestart');
$this->assertCount(20, $records);
$non31months = ['February', 'April', 'June', 'September', 'November'];
foreach ($records as $record) {
$month = date('F', $record->timestart);
$this->assertNotContains($month, $non31months);
}
}
/**
* Tests for the last day in February. (Leap year test)
*/
public function test_yearly_on_the_last_day_of_february() {
global $DB;
$rrule = 'FREQ=YEARLY;BYMONTH=2;BYMONTHDAY=-1;COUNT=30';
$mang = new rrule_manager($rrule);
$mang->parse_rrule();
$mang->create_events($this->event);
$records = $DB->get_records('event', ['repeatid' => $this->event->id], 'timestart ASC', 'id, repeatid, timestart');
$this->assertCount(30, $records);
foreach ($records as $record) {
$date = new DateTime(date('Y-m-d H:i:s', $record->timestart));
$year = $date->format('Y');
$day = $date->format('d');
if ($year % 4 == 0) {
$this->assertEquals(29, $day);
} else {
$this->assertEquals(28, $day);
}
}
}
/**
* Change the event's timestart (DTSTART) based on the test's needs.
*