mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-22 08:55:15 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-59032-master' of git://github.com/damyon/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7) 2017-06-13 01:28:13 +02:00 committed by Dan Poltawski
commit 1e34274846
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mod/scorm/lib.php
View File

@ -1633,6 +1633,11 @@ function mod_scorm_core_calendar_provide_event_action(calendar_event $event,
$cm = get_fast_modinfo($event->courseid)->instances['scorm'][$event->instance];
if (has_capability('mod/scorm:viewreport', $cm->context)) {
// Teachers do not need to be reminded to complete a scorm.
return null;
}
if (!empty($cm->customdata['timeclose']) && $cm->customdata['timeclose'] < time()) {
// The scorm has closed so the user can no longer submit anything.
return null;

9
mod/scorm/tests/lib_test.php
View File

@ -207,6 +207,9 @@ class mod_scorm_lib_testcase extends externallib_advanced_testcase {
// Create a calendar event.
$event = $this->create_action_event($course->id, $scorm->id, SCORM_EVENT_TYPE_OPEN);
// Only students see scorm events.
$this->setUser($this->student);
// Create an action factory.
$factory = new \core_calendar\action_factory();
@ -261,6 +264,9 @@ class mod_scorm_lib_testcase extends externallib_advanced_testcase {
// Create a calendar event.
$event = $this->create_action_event($course->id, $scorm->id, SCORM_EVENT_TYPE_OPEN);
// Only students see scorm events.
$this->setUser($this->student);
// Create an action factory.
$factory = new \core_calendar\action_factory();
@ -289,6 +295,9 @@ class mod_scorm_lib_testcase extends externallib_advanced_testcase {
// Create a calendar event.
$event = $this->create_action_event($course->id, $scorm->id, SCORM_EVENT_TYPE_OPEN);
// Only students see scorm events.
$this->setUser($this->student);
// Create an action factory.
$factory = new \core_calendar\action_factory();