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

mod/scorm/lib.php

@@ -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;

mod/scorm/tests/lib_test.php

@@ -207,6 +207,9 @@ public function test_scorm_core_calendar_provide_event_action_open() {
         // 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 @@ public function test_scorm_core_calendar_provide_event_action_open_in_future() {
         // 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 @@ public function test_scorm_core_calendar_provide_event_action_no_time_specified(
         // 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();