moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-06 17:36:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-57497 core_calendar: added new calendar event class

Browse source 
Moved calendar_event class to new location using replaceclasses.php

Part of MDL-55611 epic.
This commit is contained in:
Mark Nelson 2016-12-23 11:31:06 +08:00 • committed by Damyon Wiese
parent e9dfeec94e
commit e057f279e4
25 changed files with 901 additions and 877 deletions
Download patch file Download diff file Expand all files Collapse all files

4
mod/assign/lib.php
View file

@ -300,13 +300,13 @@ function assign_update_events($assign, $override = null) {
$event->name = $eventname.' ('.get_string('duedate', 'assign').')';
$event->timestart = $duedate;
$event->eventtype = 'due';
calendar_event::create($event);
\core_calendar\event::create($event);
}
}
// Delete any leftover events.
foreach ($oldevents as $badevent) {
$badevent = calendar_event::load($badevent);
$badevent = \core_calendar\event::load($badevent);
$badevent->delete();
}
}

6
mod/assign/locallib.php
View file

@ -792,7 +792,7 @@ class assign {
}
$events = $DB->get_records('event', $conds);
foreach ($events as $event) {
$eventold = calendar_event::load($event);
$eventold = \core_calendar\event::load($event);
$eventold->delete();
}
@ -1197,7 +1197,7 @@ class assign {
}
if ($event->id) {
$calendarevent = calendar_event::load($event->id);
$calendarevent = \core_calendar\event::load($event->id);
$calendarevent->update($event);
} else {
unset($event->id);
@ -1208,7 +1208,7 @@ class assign {
$event->instance = $instance->id;
$event->eventtype = $eventtype;
$event->timeduration = 0;
calendar_event::create($event);
\core_calendar\event::create($event);
}
} else {
$DB->delete_records('event', array('modulename' => 'assign', 'instance' => $instance->id, 'eventtype' => $eventtype));

14
mod/chat/lib.php
View file

@ -126,7 +126,7 @@ function chat_add_instance($chat) {
$event->timestart = $chat->chattime;
$event->timeduration = 0;
calendar_event::create($event);
\core_calendar\event::create($event);
}
return $returnid;
}
@ -157,11 +157,11 @@ function chat_update_instance($chat) {
$event->description = format_module_intro('chat', $chat, $chat->coursemodule);
$event->timestart = $chat->chattime;
$calendarevent = calendar_event::load($event->id);
$calendarevent = \core_calendar\event::load($event->id);
$calendarevent->update($event);
} else {
// Do not publish this event, so delete it.
$calendarevent = calendar_event::load($event->id);
$calendarevent = \core_calendar\event::load($event->id);
$calendarevent->delete();
}
} else {
@ -179,7 +179,7 @@ function chat_update_instance($chat) {
$event->timestart = $chat->chattime;
$event->timeduration = 0;
calendar_event::create($event);
\core_calendar\event::create($event);
}
}
@ -446,7 +446,7 @@ function chat_refresh_events($courseid = 0) {
$event->timestart = $chat->chattime;
if ($event->id = $DB->get_field('event', 'id', array('modulename' => 'chat', 'instance' => $chat->id))) {
$calendarevent = calendar_event::load($event->id);
$calendarevent = \core_calendar\event::load($event->id);
$calendarevent->update($event);
} else if ($chat->schedule > 0) {
// The chat is scheduled and the event should be published.
@ -459,7 +459,7 @@ function chat_refresh_events($courseid = 0) {
$event->timeduration = 0;
$event->visible = $DB->get_field('course_modules', 'visible', array('module' => $moduleid, 'instance' => $chat->id));
calendar_event::create($event);
\core_calendar\event::create($event);
}
}
return true;
@ -665,7 +665,7 @@ function chat_update_chat_times($chatid=0) {
if ($event->id = $DB->get_field_select('event', 'id', $cond, $params)) {
$event->timestart = $chat->chattime;
$calendarevent = calendar_event::load($event->id);
$calendarevent = \core_calendar\event::load($event->id);
$calendarevent->update($event, false);
}
}

12
mod/choice/locallib.php
View file

@ -52,11 +52,11 @@ function choice_set_events($choice) {
$event->timestart = $choice->timeopen;
$event->visible = instance_is_visible('choice', $choice);
$event->timeduration = 0;
$calendarevent = calendar_event::load($event->id);
$calendarevent = \core_calendar\event::load($event->id);
$calendarevent->update($event);
} else {
// Calendar event is on longer needed.
$calendarevent = calendar_event::load($event->id);
$calendarevent = \core_calendar\event::load($event->id);
$calendarevent->delete();
}
} else {
@ -73,7 +73,7 @@ function choice_set_events($choice) {
$event->timestart = $choice->timeopen;
$event->visible = instance_is_visible('choice', $choice);
$event->timeduration = 0;
calendar_event::create($event);
\core_calendar\event::create($event);
}
}
@ -88,11 +88,11 @@ function choice_set_events($choice) {
$event->timestart = $choice->timeclose;
$event->visible = instance_is_visible('choice', $choice);
$event->timeduration = 0;
$calendarevent = calendar_event::load($event->id);
$calendarevent = \core_calendar\event::load($event->id);
$calendarevent->update($event);
} else {
// Calendar event is on longer needed.
$calendarevent = calendar_event::load($event->id);
$calendarevent = \core_calendar\event::load($event->id);
$calendarevent->delete();
}
} else {
@ -110,7 +110,7 @@ function choice_set_events($choice) {
$event->timestart = $choice->timeclose;
$event->visible = instance_is_visible('choice', $choice);
$event->timeduration = 0;
calendar_event::create($event);
\core_calendar\event::create($event);
}
}
}

2
mod/data/lib.php
View file

@ -1054,7 +1054,7 @@ function data_delete_instance($id) { // takes the dataid
// Remove old calendar events.
$events = $DB->get_records('event', array('modulename' => 'data', 'instance' => $id));
foreach ($events as $event) {
$event = calendar_event::load($event);
$event = \core_calendar\event::load($event);
$event->delete();
}

12
mod/data/locallib.php
View file

@ -608,11 +608,11 @@ function data_set_events($data) {
$event->timestart = $data->timeavailablefrom;
$event->visible = instance_is_visible('data', $data);
$event->timeduration = 0;
$calendarevent = calendar_event::load($event->id);
$calendarevent = \core_calendar\event::load($event->id);
$calendarevent->update($event);
} else {
// Calendar event is on longer needed.
$calendarevent = calendar_event::load($event->id);
$calendarevent = \core_calendar\event::load($event->id);
$calendarevent->delete();
}
} else {
@ -629,7 +629,7 @@ function data_set_events($data) {
$event->timestart = $data->timeavailablefrom;
$event->visible = instance_is_visible('data', $data);
$event->timeduration = 0;
calendar_event::create($event);
\core_calendar\event::create($event);
}
}
@ -644,11 +644,11 @@ function data_set_events($data) {
$event->timestart = $data->timeavailableto;
$event->visible = instance_is_visible('data', $data);
$event->timeduration = 0;
$calendarevent = calendar_event::load($event->id);
$calendarevent = \core_calendar\event::load($event->id);
$calendarevent->update($event);
} else {
// Calendar event is on longer needed.
$calendarevent = calendar_event::load($event->id);
$calendarevent = \core_calendar\event::load($event->id);
$calendarevent->delete();
}
} else {
@ -666,7 +666,7 @@ function data_set_events($data) {
$event->timestart = $data->timeavailableto;
$event->visible = instance_is_visible('data', $data);
$event->timeduration = 0;
calendar_event::create($event);
\core_calendar\event::create($event);
}
}
}

12
mod/feedback/lib.php
View file

@ -811,7 +811,7 @@ function feedback_set_events($feedback) {
if ($eventid) {
// Calendar event exists so update it.
$event->id = $eventid;
$calendarevent = calendar_event::load($event->id);
$calendarevent = \core_calendar\event::load($event->id);
$calendarevent->update($event);
} else {
// Event doesn't exist so create one.
@ -821,11 +821,11 @@ function feedback_set_events($feedback) {
$event->modulename = 'feedback';
$event->instance = $feedback->id;
$event->eventtype = 'open';
calendar_event::create($event);
\core_calendar\event::create($event);
}
} else if ($eventid) {
// Calendar event is on longer needed.
$calendarevent = calendar_event::load($eventid);
$calendarevent = \core_calendar\event::load($eventid);
$calendarevent->delete();
}
@ -843,7 +843,7 @@ function feedback_set_events($feedback) {
if ($eventid) {
// Calendar event exists so update it.
$event->id = $eventid;
$calendarevent = calendar_event::load($event->id);
$calendarevent = \core_calendar\event::load($event->id);
$calendarevent->update($event);
} else {
// Event doesn't exist so create one.
@ -853,11 +853,11 @@ function feedback_set_events($feedback) {
$event->modulename = 'feedback';
$event->instance = $feedback->id;
$event->eventtype = 'close';
calendar_event::create($event);
\core_calendar\event::create($event);
}
} else if ($eventid) {
// Calendar event is on longer needed.
$calendarevent = calendar_event::load($eventid);
$calendarevent = \core_calendar\event::load($eventid);
$calendarevent->delete();
}
}

8
mod/lesson/lib.php
View file

@ -206,8 +206,8 @@ function lesson_update_events($lesson, $override = null) {
unset($event->id);
}
$event->name = $eventname.' ('.get_string('lessonopens', 'lesson').')';
// The method calendar_event::create will reuse a db record if the id field is set.
calendar_event::create($event);
// The method \core_calendar\event::create will reuse a db record if the id field is set.
\core_calendar\event::create($event);
}
if ($deadline && $addclose) {
if ($oldevent = array_shift($oldevents)) {
@ -224,14 +224,14 @@ function lesson_update_events($lesson, $override = null) {
$event->priority = $closepriorities[$deadline];
}
}
calendar_event::create($event);
\core_calendar\event::create($event);
}
}
}
// Delete any leftover events.
foreach ($oldevents as $badevent) {
$badevent = calendar_event::load($badevent);
$badevent = \core_calendar\event::load($badevent);
$badevent->delete();
}
}

4
mod/lesson/locallib.php
View file

@ -1571,7 +1571,7 @@ class lesson extends lesson_base {
$DB->delete_records("lesson_branch", array("lessonid"=>$this->properties->id));
if ($events = $DB->get_records('event', array("modulename"=>'lesson', "instance"=>$this->properties->id))) {
foreach($events as $event) {
$event = calendar_event::load($event);
$event = \core_calendar\event::load($event);
$event->delete();
}
}
@ -1609,7 +1609,7 @@ class lesson extends lesson_base {
}
$events = $DB->get_records('event', $conds);
foreach ($events as $event) {
$eventold = calendar_event::load($event);
$eventold = \core_calendar\event::load($event);
$eventold->delete();
}

10
mod/quiz/lib.php
View file

@ -223,7 +223,7 @@ function quiz_delete_override($quiz, $overrideid) {
'instance' => $quiz->id, 'groupid' => (int)$override->groupid,
'userid' => (int)$override->userid));
foreach ($events as $event) {
$eventold = calendar_event::load($event);
$eventold = \core_calendar\event::load($event);
$eventold->delete();
}
@ -1284,8 +1284,8 @@ function quiz_update_events($quiz, $override = null) {
unset($event->id);
}
$event->name = $eventname.' ('.get_string('quizopens', 'quiz').')';
// The method calendar_event::create will reuse a db record if the id field is set.
calendar_event::create($event);
// The method \core_calendar\event::create will reuse a db record if the id field is set.
\core_calendar\event::create($event);
}
if ($timeclose && $addclose) {
if ($oldevent = array_shift($oldevents)) {
@ -1302,14 +1302,14 @@ function quiz_update_events($quiz, $override = null) {
$event->priority = $closepriorities[$timeclose];
}
}
calendar_event::create($event);
\core_calendar\event::create($event);
}
}
}
// Delete any leftover events.
foreach ($oldevents as $badevent) {
$badevent = calendar_event::load($badevent);
$badevent = \core_calendar\event::load($badevent);
$badevent->delete();
}
}

12
mod/workshop/lib.php
View file

@ -265,7 +265,7 @@ function workshop_delete_instance($id) {
// delete the calendar events
$events = $DB->get_records('event', array('modulename' => 'workshop', 'instance' => $workshop->id));
foreach ($events as $event) {
$event = calendar_event::load($event);
$event = \core_calendar\event::load($event);
$event->delete();
}
@ -1714,7 +1714,7 @@ function workshop_calendar_update(stdClass $workshop, $cmid) {
unset($event->id);
}
// update() will reuse a db record if the id field is set
$eventobj = new calendar_event($event);
$eventobj = new \core_calendar\event($event);
$eventobj->update($event, false);
}
@ -1729,7 +1729,7 @@ function workshop_calendar_update(stdClass $workshop, $cmid) {
unset($event->id);
}
// update() will reuse a db record if the id field is set
$eventobj = new calendar_event($event);
$eventobj = new \core_calendar\event($event);
$eventobj->update($event, false);
}
@ -1744,7 +1744,7 @@ function workshop_calendar_update(stdClass $workshop, $cmid) {
unset($event->id);
}
// update() will reuse a db record if the id field is set
$eventobj = new calendar_event($event);
$eventobj = new \core_calendar\event($event);
$eventobj->update($event, false);
}
@ -1759,13 +1759,13 @@ function workshop_calendar_update(stdClass $workshop, $cmid) {
unset($event->id);
}
// update() will reuse a db record if the id field is set
$eventobj = new calendar_event($event);
$eventobj = new \core_calendar\event($event);
$eventobj->update($event, false);
}
// delete any leftover events
foreach ($currentevents as $oldevent) {
$oldevent = calendar_event::load($oldevent);
$oldevent = \core_calendar\event::load($oldevent);
$oldevent->delete();
}
}