mirror of
https://github.com/moodle/moodle.git
synced 2025-04-13 04:22:07 +02:00
MDL-60826 calendar: lazy load groups on event form
This commit is contained in:
parent
633c5ffbfe
commit
dfc609e55d
2
calendar/amd/build/event_form.min.js
vendored
2
calendar/amd/build/event_form.min.js
vendored
@ -1 +1 @@
|
||||
define(["jquery"],function(a){var b={EVENT_GROUP_COURSE_ID:'[name="groupcourseid"]',EVENT_GROUP_ID:'[name="groupid"]',SELECT_OPTION:"option"},c=function(c){c.find(b.EVENT_GROUP_ID).find(b.SELECT_OPTION).each(function(b,c){c=a(c);var d=c.attr("value"),e=d.split("-"),f=e[0];c.attr("data-course-id",f)})},d=function(c){var d=c.find(b.EVENT_GROUP_COURSE_ID),e=c.find(b.EVENT_GROUP_ID),f=e.find(b.SELECT_OPTION),g=function(){var b=d.val(),c=null,g=!1;f.each(function(d,e){e=a(e),e.attr("data-course-id")==b?(e.removeClass("hidden"),e.prop("disabled",!1),g=!0,(null===c||e.attr("selected"))&&(c=d)):(e.addClass("hidden"),e.prop("disabled",!0))}),g?e.prop("disabled",!1):e.prop("disabled",!0),e.prop("selectedIndex",c)};d.on("change",g),g()},e=function(b){var e=a("#"+b);c(e),d(e)};return{init:e}});
|
||||
define(["jquery","core_calendar/repository"],function(a,b){var c={EVENT_GROUP_COURSE_ID:'[name="groupcourseid"]',EVENT_GROUP_ID:'[name="groupid"]',SELECT_OPTION:"option"},d=function(d){var e=d.find(c.EVENT_GROUP_COURSE_ID),f=function(b){var e=d.find(c.EVENT_GROUP_ID),f=e.find(c.SELECT_OPTION),g=a(b);f.remove(),e.prop("disabled",!1),g.each(function(b,c){a(e).append(a("<option></option>").attr("value",c.id).text(c.name))})};e.on("change",function(){var a=d.find(c.EVENT_GROUP_COURSE_ID).val();b.getCourseGroupsData(a).then(function(a){return f(a)})["catch"](Notification.exception)})},e=function(b){var c=a("#"+b);d(c)};return{init:e}});
|
2
calendar/amd/build/repository.min.js
vendored
2
calendar/amd/build/repository.min.js
vendored
@ -1 +1 @@
|
||||
define(["jquery","core/ajax"],function(a,b){var c=function(a,c){"undefined"==typeof c&&(c=!1);var d={methodname:"core_calendar_delete_calendar_events",args:{events:[{eventid:a,repeat:c}]}};return b.call([d])[0]},d=function(a){var c={methodname:"core_calendar_get_calendar_event_by_id",args:{eventid:a}};return b.call([c])[0]},e=function(a){var c={methodname:"core_calendar_submit_create_update_form",args:{formdata:a}};return b.call([c])[0]},f=function(a,c,d,e,f,g){var h={methodname:"core_calendar_get_calendar_monthly_view",args:{year:a,month:c,courseid:d,categoryid:e,includenavigation:f,mini:g}};return b.call([h])[0]},g=function(a,c,d,e,f){var g={methodname:"core_calendar_get_calendar_day_view",args:{year:a,month:c,day:d,courseid:e,categoryid:f}};return b.call([g])[0]},h=function(a,c){var d={methodname:"core_calendar_update_event_start_day",args:{eventid:a,daytimestamp:c}};return b.call([d])[0]},i=function(a,c){var d={methodname:"core_calendar_get_calendar_upcoming_view",args:{courseid:a,categoryid:c}};return b.call([d])[0]};return{getEventById:d,deleteEvent:c,updateEventStartDay:h,submitCreateUpdateForm:e,getCalendarMonthData:f,getCalendarDayData:g,getCalendarUpcomingData:i}});
|
||||
define(["jquery","core/ajax"],function(a,b){var c=function(a,c){"undefined"==typeof c&&(c=!1);var d={methodname:"core_calendar_delete_calendar_events",args:{events:[{eventid:a,repeat:c}]}};return b.call([d])[0]},d=function(a){var c={methodname:"core_calendar_get_calendar_event_by_id",args:{eventid:a}};return b.call([c])[0]},e=function(a){var c={methodname:"core_calendar_submit_create_update_form",args:{formdata:a}};return b.call([c])[0]},f=function(a,c,d,e,f,g){var h={methodname:"core_calendar_get_calendar_monthly_view",args:{year:a,month:c,courseid:d,categoryid:e,includenavigation:f,mini:g}};return b.call([h])[0]},g=function(a,c,d,e,f){var g={methodname:"core_calendar_get_calendar_day_view",args:{year:a,month:c,day:d,courseid:e,categoryid:f}};return b.call([g])[0]},h=function(a,c){var d={methodname:"core_calendar_update_event_start_day",args:{eventid:a,daytimestamp:c}};return b.call([d])[0]},i=function(a,c){var d={methodname:"core_calendar_get_calendar_upcoming_view",args:{courseid:a,categoryid:c}};return b.call([d])[0]},j=function(a){var c={methodname:"core_group_get_course_groups",args:{courseid:a}};return b.call([c])[0]};return{getEventById:d,deleteEvent:c,updateEventStartDay:h,submitCreateUpdateForm:e,getCalendarMonthData:f,getCalendarDayData:g,getCalendarUpcomingData:i,getCourseGroupsData:j}});
|
@ -21,42 +21,12 @@
|
||||
* @copyright 2017 Ryan Wyllie <ryan@moodle.com>
|
||||
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
|
||||
*/
|
||||
define(['jquery'], function($) {
|
||||
define(['jquery', 'core_calendar/repository'], function($, CalendarRepository) {
|
||||
|
||||
var SELECTORS = {
|
||||
EVENT_GROUP_COURSE_ID: '[name="groupcourseid"]',
|
||||
EVENT_GROUP_ID: '[name="groupid"]',
|
||||
SELECT_OPTION: 'option',
|
||||
};
|
||||
|
||||
/**
|
||||
* Parse the group id select element in the event form and pull out
|
||||
* the course id from the value to allow us to toggle other select
|
||||
* elements based on the course id for the group a user selects.
|
||||
*
|
||||
* This is a little hacky but I couldn't find a better way to pass
|
||||
* the course id for each group id with the limitations of mforms.
|
||||
*
|
||||
* The group id options are rendered with a value like:
|
||||
* "<courseid>-<groupid>"
|
||||
* E.g.
|
||||
* For a group with id 10 in a course with id 3 the value of the
|
||||
* option will be 3-10.
|
||||
*
|
||||
* @method parseGroupSelect
|
||||
* @param {object} formElement The root form element
|
||||
*/
|
||||
var parseGroupSelect = function(formElement) {
|
||||
formElement.find(SELECTORS.EVENT_GROUP_ID)
|
||||
.find(SELECTORS.SELECT_OPTION)
|
||||
.each(function(index, element) {
|
||||
element = $(element);
|
||||
var value = element.attr('value');
|
||||
var splits = value.split('-');
|
||||
var courseId = splits[0];
|
||||
|
||||
element.attr('data-course-id', courseId);
|
||||
});
|
||||
SELECT_OPTION: 'option'
|
||||
};
|
||||
|
||||
/**
|
||||
@ -69,39 +39,29 @@ define(['jquery'], function($) {
|
||||
*/
|
||||
var addCourseGroupSelectListeners = function(formElement) {
|
||||
var courseGroupSelect = formElement.find(SELECTORS.EVENT_GROUP_COURSE_ID);
|
||||
var groupSelect = formElement.find(SELECTORS.EVENT_GROUP_ID);
|
||||
var groupSelectOptions = groupSelect.find(SELECTORS.SELECT_OPTION);
|
||||
var filterGroupSelectOptions = function() {
|
||||
var selectedCourseId = courseGroupSelect.val();
|
||||
var selectedIndex = null;
|
||||
var hasGroups = false;
|
||||
groupSelectOptions.each(function(index, element) {
|
||||
element = $(element);
|
||||
|
||||
if (element.attr('data-course-id') == selectedCourseId) {
|
||||
element.removeClass('hidden');
|
||||
element.prop('disabled', false);
|
||||
hasGroups = true;
|
||||
if (selectedIndex === null || element.attr('selected')) {
|
||||
selectedIndex = index;
|
||||
}
|
||||
} else {
|
||||
element.addClass('hidden');
|
||||
element.prop('disabled', true);
|
||||
}
|
||||
var loadGroupSelectOptions = function(groups) {
|
||||
var groupSelect = formElement.find(SELECTORS.EVENT_GROUP_ID),
|
||||
groupSelectOptions = groupSelect.find(SELECTORS.SELECT_OPTION),
|
||||
courseGroups = $(groups);
|
||||
|
||||
// Let's clear all options first.
|
||||
groupSelectOptions.remove();
|
||||
groupSelect.prop("disabled", false);
|
||||
courseGroups.each(function(id, group) {
|
||||
$(groupSelect).append($("<option></option>").attr("value", group.id).text(group.name));
|
||||
});
|
||||
|
||||
if (hasGroups) {
|
||||
groupSelect.prop('disabled', false);
|
||||
} else {
|
||||
groupSelect.prop('disabled', true);
|
||||
}
|
||||
|
||||
groupSelect.prop('selectedIndex', selectedIndex);
|
||||
};
|
||||
|
||||
courseGroupSelect.on('change', filterGroupSelectOptions);
|
||||
filterGroupSelectOptions();
|
||||
// If the user choose a course in the selector do a WS request to get groups.
|
||||
courseGroupSelect.on('change', function() {
|
||||
var courseId = formElement.find(SELECTORS.EVENT_GROUP_COURSE_ID).val();
|
||||
CalendarRepository.getCourseGroupsData(courseId)
|
||||
.then(function(groups) {
|
||||
return loadGroupSelectOptions(groups);
|
||||
})
|
||||
.catch(Notification.exception);
|
||||
});
|
||||
};
|
||||
|
||||
/**
|
||||
@ -112,8 +72,6 @@ define(['jquery'], function($) {
|
||||
*/
|
||||
var init = function(formId) {
|
||||
var formElement = $('#' + formId);
|
||||
|
||||
parseGroupSelect(formElement);
|
||||
addCourseGroupSelectListeners(formElement);
|
||||
};
|
||||
|
||||
|
@ -181,6 +181,23 @@ define(['jquery', 'core/ajax'], function($, Ajax) {
|
||||
return Ajax.call([request])[0];
|
||||
};
|
||||
|
||||
/**
|
||||
* Get the groups by course id.
|
||||
*
|
||||
* @param {Number} courseid The course id to fetch the groups from.
|
||||
* @return {promise} Resolved with the course groups.
|
||||
*/
|
||||
var getCourseGroupsData = function(courseid) {
|
||||
var request = {
|
||||
methodname: 'core_group_get_course_groups',
|
||||
args: {
|
||||
courseid: courseid
|
||||
}
|
||||
};
|
||||
|
||||
return Ajax.call([request])[0];
|
||||
};
|
||||
|
||||
return {
|
||||
getEventById: getEventById,
|
||||
deleteEvent: deleteEvent,
|
||||
@ -188,6 +205,7 @@ define(['jquery', 'core/ajax'], function($, Ajax) {
|
||||
submitCreateUpdateForm: submitCreateUpdateForm,
|
||||
getCalendarMonthData: getCalendarMonthData,
|
||||
getCalendarDayData: getCalendarDayData,
|
||||
getCalendarUpcomingData: getCalendarUpcomingData
|
||||
getCalendarUpcomingData: getCalendarUpcomingData,
|
||||
getCourseGroupsData: getCourseGroupsData
|
||||
};
|
||||
});
|
||||
|
@ -66,9 +66,11 @@ class create extends \moodleform {
|
||||
$mform = $this->_form;
|
||||
$starttime = isset($this->_customdata['starttime']) ? $this->_customdata['starttime'] : 0;
|
||||
$editoroptions = !(empty($this->_customdata['editoroptions'])) ? $this->_customdata['editoroptions'] : null;
|
||||
$eventtypes = calendar_get_all_allowed_types();
|
||||
$courseid = !(empty($this->_customdata['courseid'])) ? $this->_customdata['courseid'] : null;
|
||||
|
||||
if (empty($eventtypes)) {
|
||||
$eventtypes = calendar_get_allowed_event_types($courseid);
|
||||
|
||||
if (in_array(true, $eventtypes, true) === false) {
|
||||
print_error('nopermissiontoupdatecalendar');
|
||||
}
|
||||
|
||||
@ -120,18 +122,20 @@ class create extends \moodleform {
|
||||
* @return array
|
||||
*/
|
||||
public function validation($data, $files) {
|
||||
global $DB, $CFG;
|
||||
global $DB;
|
||||
|
||||
$errors = parent::validation($data, $files);
|
||||
$eventtypes = calendar_get_all_allowed_types();
|
||||
$eventtype = isset($data['eventtype']) ? $data['eventtype'] : null;
|
||||
$coursekey = ($eventtype == 'group') ? 'groupcourseid' : 'courseid';
|
||||
if (empty($eventtype) || !isset($eventtypes[$eventtype])) {
|
||||
$courseid = (!empty($data[$coursekey])) ? $data[$coursekey] : null;
|
||||
$eventtypes = calendar_get_allowed_event_types($courseid);
|
||||
|
||||
if (empty($eventtype) || !isset($eventtypes[$eventtype]) || $eventtypes[$eventtype] == false) {
|
||||
$errors['eventtype'] = get_string('invalideventtype', 'calendar');
|
||||
}
|
||||
|
||||
if (isset($data[$coursekey]) && $data[$coursekey] > 0) {
|
||||
if ($course = $DB->get_record('course', ['id' => $data[$coursekey]])) {
|
||||
if ($courseid && $courseid > 0) {
|
||||
if ($course = $DB->get_record('course', ['id' => $courseid])) {
|
||||
if ($data['timestart'] < $course->startdate) {
|
||||
$errors['timestart'] = get_string('errorbeforecoursestart', 'calendar');
|
||||
}
|
||||
@ -140,11 +144,15 @@ class create extends \moodleform {
|
||||
}
|
||||
}
|
||||
|
||||
if ($eventtype == 'course' && empty($data['courseid'])) {
|
||||
if ($eventtype == 'course' && empty($courseid)) {
|
||||
$errors['courseid'] = get_string('selectacourse');
|
||||
}
|
||||
|
||||
if ($eventtype == 'group' && empty($data['groupcourseid'])) {
|
||||
if ($eventtype == 'group' && (!empty($courseid) && empty($data['groupid']))) {
|
||||
$errors['groupcourseid'] = get_string('nogroups', 'core_group');
|
||||
}
|
||||
|
||||
if ($eventtype == 'group' && empty($courseid)) {
|
||||
$errors['groupcourseid'] = get_string('selectacourse');
|
||||
}
|
||||
|
||||
|
@ -53,28 +53,29 @@ trait eventtype {
|
||||
* @param array $eventtypes The available event types for the user
|
||||
*/
|
||||
protected function add_event_type_elements($mform, $eventtypes) {
|
||||
global $DB;
|
||||
$options = [];
|
||||
|
||||
if (isset($eventtypes['user'])) {
|
||||
if (!empty($eventtypes['user'])) {
|
||||
$options['user'] = get_string('user');
|
||||
}
|
||||
if (isset($eventtypes['group'])) {
|
||||
if (!empty($eventtypes['group'])) {
|
||||
$options['group'] = get_string('group');
|
||||
}
|
||||
if (isset($eventtypes['course'])) {
|
||||
if (!empty($eventtypes['course'])) {
|
||||
$options['course'] = get_string('course');
|
||||
}
|
||||
if (isset($eventtypes['category'])) {
|
||||
if (!empty($eventtypes['category'])) {
|
||||
$options['category'] = get_string('category');
|
||||
}
|
||||
if (isset($eventtypes['site'])) {
|
||||
if (!empty($eventtypes['site'])) {
|
||||
$options['site'] = get_string('site');
|
||||
}
|
||||
|
||||
// If we only have one event type and it's 'user' event then don't bother
|
||||
// rendering the select boxes because there is no choice for the user to
|
||||
// make.
|
||||
if (count(array_keys($eventtypes)) == 1 && isset($eventtypes['user'])) {
|
||||
if (!empty($eventtypes['user']) && count($options) == 1) {
|
||||
$mform->addElement('hidden', 'eventtype');
|
||||
$mform->setType('eventtype', PARAM_TEXT);
|
||||
$mform->setDefault('eventtype', 'user');
|
||||
@ -87,9 +88,9 @@ trait eventtype {
|
||||
$mform->addElement('select', 'eventtype', get_string('eventkind', 'calendar'), $options);
|
||||
}
|
||||
|
||||
if (isset($eventtypes['category'])) {
|
||||
if (!empty($eventtypes['category'])) {
|
||||
$categoryoptions = [];
|
||||
foreach ($eventtypes['category'] as $id => $category) {
|
||||
foreach (\coursecat::make_categories_list('moodle/category:manage') as $id => $category) {
|
||||
$categoryoptions[$id] = $category;
|
||||
}
|
||||
|
||||
@ -97,33 +98,27 @@ trait eventtype {
|
||||
$mform->hideIf('categoryid', 'eventtype', 'noteq', 'category');
|
||||
}
|
||||
|
||||
if (isset($eventtypes['course'])) {
|
||||
if (!empty($eventtypes['course'])) {
|
||||
$limit = !has_capability('moodle/calendar:manageentries', \context_system::instance());
|
||||
$mform->addElement('course', 'courseid', get_string('course'), ['limittoenrolled' => $limit]);
|
||||
$mform->hideIf('courseid', 'eventtype', 'noteq', 'course');
|
||||
}
|
||||
|
||||
if (isset($eventtypes['group'])) {
|
||||
$options = ['limittoenrolled' => true];
|
||||
// Exclude courses without group.
|
||||
if (isset($eventtypes['course']) && isset($eventtypes['groupcourses'])) {
|
||||
$options['exclude'] = array_diff(array_keys($eventtypes['course']),
|
||||
array_keys($eventtypes['groupcourses']));
|
||||
}
|
||||
|
||||
$mform->addElement('course', 'groupcourseid', get_string('course'), $options);
|
||||
if (!empty($eventtypes['group'])) {
|
||||
$groups = !(empty($this->_customdata['groups'])) ? $this->_customdata['groups'] : null;
|
||||
$limit = !has_capability('moodle/calendar:manageentries', \context_system::instance());
|
||||
// Get the list of courses without groups to filter on the course selector.
|
||||
$sql = "SELECT c.id
|
||||
FROM {course} c
|
||||
LEFT JOIN {groups} g ON g.courseid = c.id
|
||||
GROUP BY c.id
|
||||
HAVING COUNT(g.id) = 0";
|
||||
$coursesnogroup = $DB->get_records_sql($sql);
|
||||
$mform->addElement('course', 'groupcourseid', get_string('course'), ['limittoenrolled' => $limit,
|
||||
'exclude' => array_keys($coursesnogroup)]);
|
||||
$mform->hideIf('groupcourseid', 'eventtype', 'noteq', 'group');
|
||||
|
||||
$groupoptions = [];
|
||||
foreach ($eventtypes['group'] as $group) {
|
||||
// We are formatting it this way in order to provide the javascript both
|
||||
// the course and group ids so that it can enhance the form for the user.
|
||||
$index = "{$group->courseid}-{$group->id}";
|
||||
$groupoptions[$index] = format_string($group->name, true,
|
||||
['context' => \context_course::instance($group->courseid)]);
|
||||
}
|
||||
|
||||
$mform->addElement('select', 'groupid', get_string('group'), $groupoptions);
|
||||
$mform->addElement('select', 'groupid', get_string('group'), $groups);
|
||||
$mform->hideIf('groupid', 'eventtype', 'noteq', 'group');
|
||||
// We handle the group select hide/show actions on the event_form module.
|
||||
}
|
||||
|
@ -58,7 +58,7 @@ class create_update_form_mapper implements create_update_form_mapper_interface {
|
||||
|
||||
if ($legacyevent->eventtype == 'group') {
|
||||
// Set up the correct value for the to display on the form.
|
||||
$data->groupid = "{$legacyevent->courseid}-{$legacyevent->groupid}";
|
||||
$data->groupid = $legacyevent->groupid;
|
||||
$data->groupcourseid = $legacyevent->courseid;
|
||||
}
|
||||
if ($legacyevent->eventtype == 'course') {
|
||||
@ -93,12 +93,8 @@ class create_update_form_mapper implements create_update_form_mapper_interface {
|
||||
$properties->courseid = $data->groupcourseid;
|
||||
unset($properties->groupcourseid);
|
||||
}
|
||||
|
||||
// Pull the group id back out of the value. The form saves the value
|
||||
// as "<courseid>-<groupid>" to allow the javascript to work correctly.
|
||||
if (isset($data->groupid)) {
|
||||
list($courseid, $groupid) = explode('-', $data->groupid);
|
||||
$properties->groupid = $groupid;
|
||||
$properties->groupid = $data->groupid;
|
||||
}
|
||||
} else {
|
||||
// Default course id if none is set.
|
||||
|
@ -865,15 +865,31 @@ class core_calendar_external extends external_api {
|
||||
self::validate_context($context);
|
||||
parse_str($params['formdata'], $data);
|
||||
|
||||
$eventtype = isset($data['eventtype']) ? $data['eventtype'] : null;
|
||||
$coursekey = ($eventtype == 'group') ? 'groupcourseid' : 'courseid';
|
||||
$courseid = (!empty($data[$coursekey])) ? $data[$coursekey] : null;
|
||||
$editoroptions = \core_calendar\local\event\forms\create::build_editor_options($context);
|
||||
$formoptions = ['editoroptions' => $editoroptions, 'courseid' => $courseid];
|
||||
if ($courseid) {
|
||||
require_once($CFG->libdir . '/grouplib.php');
|
||||
$groupcoursedata = groups_get_course_data($courseid);
|
||||
if (!empty($groupcoursedata->groups)) {
|
||||
$formoptions['groups'] = [];
|
||||
foreach ($groupcoursedata->groups as $groupid => $groupdata) {
|
||||
$formoptions['groups'][$groupid] = $groupdata->name;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (!empty($data['id'])) {
|
||||
$eventid = clean_param($data['id'], PARAM_INT);
|
||||
$legacyevent = calendar_event::load($eventid);
|
||||
$legacyevent->count_repeats();
|
||||
$formoptions = ['event' => $legacyevent];
|
||||
$formoptions['event'] = $legacyevent;
|
||||
$mform = new update_event_form(null, $formoptions, 'post', '', null, true, $data);
|
||||
} else {
|
||||
$legacyevent = null;
|
||||
$mform = new create_event_form(null, null, 'post', '', null, true, $data);
|
||||
$mform = new create_event_form(null, $formoptions, 'post', '', null, true, $data);
|
||||
}
|
||||
|
||||
if ($validateddata = $mform->get_data()) {
|
||||
|
@ -3508,18 +3508,18 @@ function calendar_get_view(\calendar_information $calendar, $view, $includenavig
|
||||
*/
|
||||
function calendar_output_fragment_event_form($args) {
|
||||
global $CFG, $OUTPUT, $USER;
|
||||
|
||||
require_once($CFG->libdir . '/grouplib.php');
|
||||
$html = '';
|
||||
$data = [];
|
||||
$eventid = isset($args['eventid']) ? clean_param($args['eventid'], PARAM_INT) : null;
|
||||
$starttime = isset($args['starttime']) ? clean_param($args['starttime'], PARAM_INT) : null;
|
||||
$courseid = isset($args['courseid']) ? clean_param($args['courseid'], PARAM_INT) : null;
|
||||
$courseid = (isset($args['courseid']) && $args['courseid'] != SITEID) ? clean_param($args['courseid'], PARAM_INT) : null;
|
||||
$categoryid = isset($args['categoryid']) ? clean_param($args['categoryid'], PARAM_INT) : null;
|
||||
$event = null;
|
||||
$hasformdata = isset($args['formdata']) && !empty($args['formdata']);
|
||||
$context = \context_user::instance($USER->id);
|
||||
$editoroptions = \core_calendar\local\event\forms\create::build_editor_options($context);
|
||||
$formoptions = ['editoroptions' => $editoroptions];
|
||||
$formoptions = ['editoroptions' => $editoroptions, 'courseid' => $courseid];
|
||||
$draftitemid = 0;
|
||||
|
||||
if ($hasformdata) {
|
||||
@ -3534,6 +3534,13 @@ function calendar_output_fragment_event_form($args) {
|
||||
}
|
||||
|
||||
if (is_null($eventid)) {
|
||||
if (!empty($courseid)) {
|
||||
$groupcoursedata = groups_get_course_data($courseid);
|
||||
$formoptions['groups'] = [];
|
||||
foreach ($groupcoursedata->groups as $groupid => $groupdata) {
|
||||
$formoptions['groups'][$groupid] = $groupdata->name;
|
||||
}
|
||||
}
|
||||
$mform = new \core_calendar\local\event\forms\create(
|
||||
null,
|
||||
$formoptions,
|
||||
@ -3545,16 +3552,19 @@ function calendar_output_fragment_event_form($args) {
|
||||
);
|
||||
|
||||
// Let's check first which event types user can add.
|
||||
calendar_get_allowed_types($allowed, $courseid);
|
||||
$eventtypes = calendar_get_allowed_event_types($courseid);
|
||||
|
||||
// If the user is on course context and is allowed to add course events set the event type default to course.
|
||||
if ($courseid != SITEID && !empty($allowed->courses)) {
|
||||
if ($courseid != SITEID && !empty($eventtypes['course'])) {
|
||||
$data['eventtype'] = 'course';
|
||||
$data['courseid'] = $courseid;
|
||||
$data['groupcourseid'] = $courseid;
|
||||
} else if (!empty($categoryid) && !empty($allowed->category)) {
|
||||
} else if (!empty($categoryid) && !empty($eventtypes['category'])) {
|
||||
$data['eventtype'] = 'category';
|
||||
$data['categoryid'] = $categoryid;
|
||||
} else if (!empty($groupcoursedata) && !empty($eventtypes['group'])) {
|
||||
$data['groupcourseid'] = $courseid;
|
||||
$data['groups'] = $groupcoursedata->groups;
|
||||
}
|
||||
$mform->set_data($data);
|
||||
} else {
|
||||
@ -3564,6 +3574,15 @@ function calendar_output_fragment_event_form($args) {
|
||||
$data = array_merge((array) $eventdata, $data);
|
||||
$event->count_repeats();
|
||||
$formoptions['event'] = $event;
|
||||
|
||||
if (!empty($event->courseid)) {
|
||||
$groupcoursedata = groups_get_course_data($event->courseid);
|
||||
$formoptions['groups'] = [];
|
||||
foreach ($groupcoursedata->groups as $groupid => $groupdata) {
|
||||
$formoptions['groups'][$groupid] = $groupdata->name;
|
||||
}
|
||||
}
|
||||
|
||||
$data['description']['text'] = file_prepare_draft_area(
|
||||
$draftitemid,
|
||||
$event->context->id,
|
||||
@ -3745,7 +3764,7 @@ function calendar_get_allowed_event_types(int $courseid = null) {
|
||||
|
||||
// We still don't know if the user can create group and course events, so iterate over the courses to find out
|
||||
// if the user has capabilities in one of the courses.
|
||||
if (empty($courseid) && ($types['course'] == false || $types['group'] == false)) {
|
||||
if ($types['course'] == false || $types['group'] == false) {
|
||||
$courses = calendar_get_default_courses(null, 'id', true);
|
||||
|
||||
if (!empty($courses)) {
|
||||
|
@ -1989,12 +1989,12 @@ class core_calendar_externallib_testcase extends externallib_advanced_testcase {
|
||||
$this->resetAfterTest(true);
|
||||
$this->setUser($user);
|
||||
|
||||
$this->expectException('moodle_exception');
|
||||
|
||||
external_api::clean_returnvalue(
|
||||
$result = external_api::clean_returnvalue(
|
||||
core_calendar_external::submit_create_update_form_returns(),
|
||||
core_calendar_external::submit_create_update_form($querystring)
|
||||
);
|
||||
|
||||
$this->assertTrue($result['validationerror']);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -2027,7 +2027,7 @@ class core_calendar_externallib_testcase extends externallib_advanced_testcase {
|
||||
'minute' => 0,
|
||||
],
|
||||
'eventtype' => 'group',
|
||||
'groupid' => "{$course->id}-{$group->id}", // The form format.
|
||||
'groupid' => $group->id,
|
||||
'groupcourseid' => $course->id,
|
||||
'description' => [
|
||||
'text' => '',
|
||||
@ -2100,7 +2100,7 @@ class core_calendar_externallib_testcase extends externallib_advanced_testcase {
|
||||
'minute' => 0,
|
||||
],
|
||||
'eventtype' => 'group',
|
||||
'groupid' => "{$course->id}-{$group->id}", // The form format.
|
||||
'groupid' => $group->id,
|
||||
'groupcourseid' => $course->id,
|
||||
'description' => [
|
||||
'text' => '',
|
||||
@ -2174,7 +2174,7 @@ class core_calendar_externallib_testcase extends externallib_advanced_testcase {
|
||||
'minute' => 0,
|
||||
],
|
||||
'eventtype' => 'group',
|
||||
'groupid' => "{$course->id}-{$group->id}", // The form format.
|
||||
'groupid' => $group->id,
|
||||
'groupcourseid' => $course->id,
|
||||
'description' => [
|
||||
'text' => '',
|
||||
@ -2248,7 +2248,7 @@ class core_calendar_externallib_testcase extends externallib_advanced_testcase {
|
||||
'minute' => 0,
|
||||
],
|
||||
'eventtype' => 'group',
|
||||
'groupid' => "{$course->id}-{$group->id}", // The form format.
|
||||
'groupid' => $group->id,
|
||||
'groupcourseid' => $course->id,
|
||||
'description' => [
|
||||
'text' => '',
|
||||
|
@ -764,6 +764,7 @@ $functions = array(
|
||||
'classpath' => 'group/externallib.php',
|
||||
'description' => 'Returns all groups in specified course.',
|
||||
'type' => 'read',
|
||||
'ajax' => true,
|
||||
'capabilities' => 'moodle/course:managegroups'
|
||||
),
|
||||
'core_group_get_course_user_groups' => array(
|
||||
|
Loading…
x
Reference in New Issue
Block a user