diff --git a/calendar/amd/build/repository.min.js b/calendar/amd/build/repository.min.js index a7c085dfd458e..a33feeda93f8a 100644 --- a/calendar/amd/build/repository.min.js +++ b/calendar/amd/build/repository.min.js @@ -1 +1 @@ -define(["jquery","core/ajax"],function(a,b){var c=function(a){var c={methodname:"core_calendar_delete_calendar_events",args:{events:[{eventid:a,repeat:1}]}};return b.call([c])[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){var d={methodname:"core_calendar_get_calendar_monthly_view",args:{time:a,courseid:c}};return b.call([d])[0]},g=function(a,c){var d={methodname:"core_calendar_update_event_start_day",args:{eventId:a,dayTimestamp:c}};return b.call([d])[0]};return{getEventById:d,deleteEvent:c,updateEventStartDay:g,submitCreateUpdateForm:e,getCalendarMonthData:f}}); \ No newline at end of file +define(["jquery","core/ajax"],function(a,b){var c=function(a){var c={methodname:"core_calendar_delete_calendar_events",args:{events:[{eventid:a,repeat:1}]}};return b.call([c])[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){var d={methodname:"core_calendar_get_calendar_monthly_view",args:{time:a,courseid:c}};return b.call([d])[0]},g=function(a,c){var d={methodname:"core_calendar_update_event_start_day",args:{eventid:a,daytimestamp:c}};return b.call([d])[0]};return{getEventById:d,deleteEvent:c,updateEventStartDay:g,submitCreateUpdateForm:e,getCalendarMonthData:f}}); \ No newline at end of file diff --git a/calendar/amd/src/drag_drop.js b/calendar/amd/src/drag_drop.js index f2b17e655ed1f..de085f0f4f710 100644 --- a/calendar/amd/src/drag_drop.js +++ b/calendar/amd/src/drag_drop.js @@ -188,6 +188,8 @@ define([ return { /** * Initialise the event handlers for the drag events. + * + * @param {object} root The root calendar element that containers the drag drop elements */ init: function(root) { root = $(root); diff --git a/calendar/amd/src/repository.js b/calendar/amd/src/repository.js index a8aa489e97477..55c9db927cca7 100644 --- a/calendar/amd/src/repository.js +++ b/calendar/amd/src/repository.js @@ -116,8 +116,8 @@ define(['jquery', 'core/ajax'], function($, Ajax) { var request = { methodname: 'core_calendar_update_event_start_day', args: { - eventId: eventId, - dayTimestamp: dayTimestamp + eventid: eventId, + daytimestamp: dayTimestamp } }; diff --git a/calendar/classes/local/api.php b/calendar/classes/local/api.php index 9f80509b86cb6..5c5d7d6f57ea6 100644 --- a/calendar/classes/local/api.php +++ b/calendar/classes/local/api.php @@ -222,19 +222,19 @@ public static function get_action_events_by_courses( * modified, the time of day for the event will be left as is. * * @param event_interface $event The existing event to modify - * @param DateTimeInterface $startDate The new date to use for the start day + * @param DateTimeInterface $startdate The new date to use for the start day * @return event_interface The new event with updated start date */ public static function update_event_start_day( event_interface $event, - \DateTimeInterface $startDate + \DateTimeInterface $startdate ) { $mapper = container::get_event_mapper(); $legacyevent = $mapper->from_event_to_legacy_event($event); $starttime = $event->get_times()->get_start_time()->setDate( - $startDate->format('Y'), - $startDate->format('n'), - $startDate->format('j') + $startdate->format('Y'), + $startdate->format('n'), + $startdate->format('j') ); // This function does our capability checks. diff --git a/calendar/externallib.php b/calendar/externallib.php index ba6295130ccd6..6000a253a1f60 100644 --- a/calendar/externallib.php +++ b/calendar/externallib.php @@ -919,8 +919,8 @@ public static function get_calendar_monthly_view_returns() { public static function update_event_start_day_parameters() { return new external_function_parameters( [ - 'eventId' => new external_value(PARAM_INT, 'Id of event to be updated', VALUE_REQUIRED), - 'dayTimestamp' => new external_value(PARAM_INT, 'Timestamp for the new start day', VALUE_REQUIRED), + 'eventid' => new external_value(PARAM_INT, 'Id of event to be updated', VALUE_REQUIRED), + 'daytimestamp' => new external_value(PARAM_INT, 'Timestamp for the new start day', VALUE_REQUIRED), ] ); } @@ -934,25 +934,25 @@ public static function update_event_start_day_parameters() { * * The event's original time of day is maintained, only the date is shifted. * - * @param int $eventId Id of event to be updated - * @param int $dayTimestamp Timestamp for the new start day + * @param int $eventid Id of event to be updated + * @param int $daytimestamp Timestamp for the new start day * @return array */ - public static function update_event_start_day($eventId, $dayTimestamp) { + public static function update_event_start_day($eventid, $daytimestamp) { global $USER, $PAGE; // Parameter validation. $params = self::validate_parameters(self::update_event_start_day_parameters(), [ - 'eventId' => $eventId, - 'dayTimestamp' => $dayTimestamp, + 'eventid' => $eventid, + 'daytimestamp' => $daytimestamp, ]); $vault = event_container::get_event_vault(); $mapper = event_container::get_event_mapper(); - $event = $vault->get_event_by_id($eventId); + $event = $vault->get_event_by_id($eventid); if (!$event) { - throw new \moodle_exception('Unable to find event with id ' . $eventId); + throw new \moodle_exception('Unable to find event with id ' . $eventid); } $legacyevent = $mapper->from_event_to_legacy_event($event); @@ -963,7 +963,7 @@ public static function update_event_start_day($eventId, $dayTimestamp) { self::validate_context($legacyevent->context); - $newdate = usergetdate($dayTimestamp); + $newdate = usergetdate($daytimestamp); $startdatestring = implode('-', [$newdate['year'], $newdate['mon'], $newdate['mday']]); $startdate = new DateTimeImmutable($startdatestring); $event = local_api::update_event_start_day($event, $startdate); diff --git a/calendar/tests/externallib_test.php b/calendar/tests/externallib_test.php index bbf9f37c8ba92..8098f72608b88 100644 --- a/calendar/tests/externallib_test.php +++ b/calendar/tests/externallib_test.php @@ -1300,8 +1300,8 @@ public function test_update_event_start_day() { $user = $generator->create_user(); $roleid = $generator->create_role(); $context = \context_system::instance(); - $originalStartTime = new DateTimeImmutable('2017-01-1T15:00:00+08:00'); - $newStartDate = new DateTimeImmutable('2018-02-2T10:00:00+08:00'); + $originalstarttime = new DateTimeImmutable('2017-01-1T15:00:00+08:00'); + $newstartdate = new DateTimeImmutable('2018-02-2T10:00:00+08:00'); $expected = new DateTimeImmutable('2018-02-2T15:00:00+08:00'); $generator->role_assign($roleid, $user->id, $context->id); @@ -1318,11 +1318,11 @@ public function test_update_event_start_day() { null, [ 'courseid' => 0, - 'timestart' => $originalStartTime->getTimestamp() + 'timestart' => $originalstarttime->getTimestamp() ] ); - $result = core_calendar_external::update_event_start_day($event->id, $newStartDate->getTimestamp()); + $result = core_calendar_external::update_event_start_day($event->id, $newstartdate->getTimestamp()); $result = external_api::clean_returnvalue( core_calendar_external::update_event_start_day_returns(), $result @@ -1340,8 +1340,8 @@ public function test_update_event_start_day_no_permission() { $user = $generator->create_user(); $roleid = $generator->create_role(); $context = \context_system::instance(); - $originalStartTime = new DateTimeImmutable('2017-01-1T15:00:00+08:00'); - $newStartDate = new DateTimeImmutable('2018-02-2T10:00:00+08:00'); + $originalstarttime = new DateTimeImmutable('2017-01-1T15:00:00+08:00'); + $newstartdate = new DateTimeImmutable('2018-02-2T10:00:00+08:00'); $expected = new DateTimeImmutable('2018-02-2T15:00:00+08:00'); $generator->role_assign($roleid, $user->id, $context->id); @@ -1358,13 +1358,13 @@ public function test_update_event_start_day_no_permission() { null, [ 'courseid' => 0, - 'timestart' => $originalStartTime->getTimestamp() + 'timestart' => $originalstarttime->getTimestamp() ] ); assign_capability('moodle/calendar:manageownentries', CAP_PROHIBIT, $roleid, $context, true); $this->expectException('moodle_exception'); - $result = core_calendar_external::update_event_start_day($event->id, $newStartDate->getTimestamp()); + $result = core_calendar_external::update_event_start_day($event->id, $newstartdate->getTimestamp()); $result = external_api::clean_returnvalue( core_calendar_external::update_event_start_day_returns(), $result @@ -1378,12 +1378,12 @@ public function test_update_event_start_day_module_event() { $generator = $this->getDataGenerator(); $user = $generator->create_user(); $course = $generator->create_course(); - $moduleinstance = $generator->get_plugin_generator('mod_assign') - ->create_instance(['course' => $course->id]); + $plugingenerator = $generator->get_plugin_generator('mod_assign'); + $moduleinstance = $plugingenerator->create_instance(['course' => $course->id]); $roleid = $generator->create_role(); $context = \context_course::instance($course->id); - $originalStartTime = new DateTimeImmutable('2017-01-1T15:00:00+08:00'); - $newStartDate = new DateTimeImmutable('2018-02-2T10:00:00+08:00'); + $originalstarttime = new DateTimeImmutable('2017-01-1T15:00:00+08:00'); + $newstartdate = new DateTimeImmutable('2018-02-2T10:00:00+08:00'); $expected = new DateTimeImmutable('2018-02-2T15:00:00+08:00'); $generator->role_assign($roleid, $user->id, $context->id); @@ -1402,13 +1402,13 @@ public function test_update_event_start_day_module_event() { 'modulename' => 'assign', 'instance' => $moduleinstance->id, 'courseid' => $course->id, - 'timestart' => $originalStartTime->getTimestamp() + 'timestart' => $originalstarttime->getTimestamp() ] ); assign_capability('moodle/calendar:manageentries', CAP_ALLOW, $roleid, $context, true); $this->expectException('moodle_exception'); - $result = core_calendar_external::update_event_start_day($event->id, $newStartDate->getTimestamp()); + $result = core_calendar_external::update_event_start_day($event->id, $newstartdate->getTimestamp()); $result = external_api::clean_returnvalue( core_calendar_external::update_event_start_day_returns(), $result diff --git a/calendar/tests/local_api_test.php b/calendar/tests/local_api_test.php index 8e8ad272147ec..7f17a288efc57 100644 --- a/calendar/tests/local_api_test.php +++ b/calendar/tests/local_api_test.php @@ -870,8 +870,8 @@ public function test_update_event_start_day_updates_date() { $user = $generator->create_user(); $roleid = $generator->create_role(); $context = \context_system::instance(); - $originalStartTime = new DateTimeImmutable('2017-01-1T15:00:00+08:00'); - $newStartDate = new DateTimeImmutable('2018-02-2T10:00:00+08:00'); + $originalstarttime = new DateTimeImmutable('2017-01-1T15:00:00+08:00'); + $newstartdate = new DateTimeImmutable('2018-02-2T10:00:00+08:00'); $expected = new DateTimeImmutable('2018-02-2T15:00:00+08:00'); $mapper = container::get_event_mapper(); @@ -886,11 +886,11 @@ public function test_update_event_start_day_updates_date() { 'userid' => $user->id, 'eventtype' => 'user', 'repeats' => 0, - 'timestart' => $originalStartTime->getTimestamp(), + 'timestart' => $originalstarttime->getTimestamp(), ]); $event = $mapper->from_legacy_event_to_event($event); - $newEvent = \core_calendar\local\api::update_event_start_day($event, $newStartDate); + $newEvent = \core_calendar\local\api::update_event_start_day($event, $newstartdate); $actual = $newEvent->get_times()->get_start_time(); $this->assertEquals($expected->getTimestamp(), $actual->getTimestamp()); @@ -905,8 +905,8 @@ public function test_update_event_start_day_no_permission() { $user = $generator->create_user(); $roleid = $generator->create_role(); $context = \context_system::instance(); - $originalStartTime = new DateTimeImmutable('2017-01-1T15:00:00+08:00'); - $newStartDate = new DateTimeImmutable('2018-02-2T10:00:00+08:00'); + $originalstarttime = new DateTimeImmutable('2017-01-1T15:00:00+08:00'); + $newstartdate = new DateTimeImmutable('2018-02-2T10:00:00+08:00'); $expected = new DateTimeImmutable('2018-02-2T15:00:00+08:00'); $mapper = container::get_event_mapper(); @@ -920,12 +920,12 @@ public function test_update_event_start_day_no_permission() { 'userid' => $user->id, 'eventtype' => 'user', 'repeats' => 0, - 'timestart' => $originalStartTime->getTimestamp(), + 'timestart' => $originalstarttime->getTimestamp(), ]); $event = $mapper->from_legacy_event_to_event($event); assign_capability('moodle/calendar:manageownentries', CAP_PROHIBIT, $roleid, $context, true); $this->expectException('moodle_exception'); - $newEvent = \core_calendar\local\api::update_event_start_day($event, $newStartDate); + $newEvent = \core_calendar\local\api::update_event_start_day($event, $newstartdate); } }