moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 08:26:37 +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

13
calendar/renderer.php
View file

@ -183,7 +183,7 @@ class core_calendar_renderer extends plugin_renderer_base {
$underway = array();
// First, print details about events that start today
foreach ($events as $event) {
$event = new calendar_event($event);
$event = new \core_calendar\event($event);
$event->calendarcourseid = $calendar->courseid;
if ($event->timestart >= $calendar->timestamp_today() && $event->timestart <= $calendar->timestamp_tomorrow()-1) { // Print it now
$event->time = calendar_format_event_time($event, time(), null, false, $calendar->timestamp_today());
@ -212,11 +212,11 @@ class core_calendar_renderer extends plugin_renderer_base {
/**
* Displays an event
*
* @param calendar_event $event
* @param \core_calendar\event $event
* @param bool $showactions
* @return string
*/
public function event(calendar_event $event, $showactions=true) {
public function event(\core_calendar\event $event, $showactions=true) {
global $CFG;
$event = calendar_add_event_metadata($event);
@ -366,7 +366,7 @@ class core_calendar_renderer extends plugin_renderer_base {
$events = calendar_get_events($display->tstart, $display->tend, $calendar->users, $calendar->groups, $calendar->courses);
if (!empty($events)) {
foreach($events as $eventid => $event) {
$event = new calendar_event($event);
$event = new \core_calendar\event($event);
if (!empty($event->modulename)) {
$cm = get_coursemodule_from_instance($event->modulename, $event->instance);
if (!\core_availability\info_module::is_user_visible($cm, 0, false)) {
@ -539,9 +539,8 @@ class core_calendar_renderer extends plugin_renderer_base {
if ($events) {
$output .= html_writer::start_tag('div', array('class' => 'eventlist'));
foreach ($events as $event) {
// Convert to calendar_event object so that we transform description
// accordingly
$event = new calendar_event($event);
// Convert to \core_calendar\event object so that we transform description accordingly.
$event = new \core_calendar\event($event);
$event->calendarcourseid = $calendar->courseid;
$output .= $this->event($event);
}