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

MDL-79967 scorm: Fix scorm_insert_track grading calls.

Browse Source
This commit is contained in:
Dan Marsden 2023-11-06 13:51:30 +13:00
parent 14414fe253
commit 68991e95de
4 changed files with 87 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
mod/scorm/classes/task/update_grades.php Normal file
View File

@ -0,0 +1,37 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
namespace mod_scorm\task;
/**
* Adhoc task for recalculating grades.
*
* @package mod_scorm
* @copyright 2022 Dan Marsden
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class update_grades extends \core\task\adhoc_task {
/**
* Execute task.
*/
public function execute() {
global $CFG, $DB;
require_once($CFG->dirroot.'/mod/scorm/locallib.php');
$data = $this->get_custom_data();
$scorm = $DB->get_record('scorm', ['id' => $data->scormid]);
scorm_update_grades($scorm, $data->userid);
}
}

35
mod/scorm/db/upgrade.php
View File

@ -171,5 +171,40 @@ function xmldb_scorm_upgrade($oldversion) {
// Automatically generated Moodle v4.3.0 release upgrade line.
// Put any upgrade step following this.
if ($oldversion < 2023100901) {
// MDL-76697 - fix up any possible activity completion states since the upgrade to 2023042403.
// Get timestamp of when this site updated to version 2023042403.
$upgraded = $DB->get_field_sql("SELECT min(timemodified)
FROM {upgrade_log}
WHERE plugin = 'mod_scorm' AND version = '2023042403'");
if (empty($upgraded)) {
// The code causing this regression landed upstream 28 Jul 2023, if a site has done a fresh install since then,
// the upgrade step won't exist - set it to 20th July so we don't end up dealing with too many attempts.
$upgraded = 1689811200; // 20 July 2023 12AM
}
// Don't bother triggering this next step if the upgrade completed within the last hour.
if (time() - HOURSECS > $upgraded) {
// Get all attempts that have occurred since the upgrade.
$sql = "SELECT DISTINCT s.*, sa.userid
FROM {scorm} s
JOIN {scorm_attempt} sa ON sa.scormid = s.id
JOIN {scorm_scoes_value} sv on sv.attemptid = sa.id
WHERE sv.timemodified > ?";
$scorms = $DB->get_recordset_sql($sql, [$upgraded]);
foreach ($scorms as $scorm) {
// Run an ad-hoc task to update the grades.
$task = new \mod_scorm\task\update_grades();
$task->set_custom_data([
'scormid' => $scorm->id,
'userid' => $scorm->userid,
]);
\core\task\manager::queue_adhoc_task($task, true);
}
$scorms->close();
}
// Scorm savepoint reached.
upgrade_mod_savepoint(true, 2023100901, 'scorm');
}
return true;
}

28
mod/scorm/locallib.php
View File

@ -559,28 +559,27 @@ function scorm_insert_track($userid, $scormid, $scoid, $attemptornumber, $elemen
// Trigger updating grades based on a given set of SCORM CMI elements.
$scorm = false;
if (in_array($element, array('cmi.core.score.raw', 'cmi.score.raw')) ||
(in_array($element, array('cmi.completion_status', 'cmi.core.lesson_status', 'cmi.success_status'))
&& in_array($track->value, array('completed', 'passed')))) {
if (in_array($element, ['cmi.core.score.raw', 'cmi.score.raw']) ||
(in_array($element, ['cmi.completion_status', 'cmi.core.lesson_status', 'cmi.success_status'])
&& in_array($value, ['completed', 'passed']))) {
$scorm = $DB->get_record('scorm', array('id' => $scormid));
include_once($CFG->dirroot.'/mod/scorm/lib.php');
scorm_update_grades($scorm, $userid);
}
// Trigger CMI element events.
if (in_array($element, array('cmi.core.score.raw', 'cmi.score.raw')) ||
(in_array($element, array('cmi.completion_status', 'cmi.core.lesson_status', 'cmi.success_status'))
&& in_array($track->value, array('completed', 'failed', 'passed')))) {
if (in_array($element, ['cmi.core.score.raw', 'cmi.score.raw']) ||
(in_array($element, ['cmi.completion_status', 'cmi.core.lesson_status', 'cmi.success_status'])
&& in_array($value, ['completed', 'failed', 'passed']))) {
if (!$scorm) {
$scorm = $DB->get_record('scorm', array('id' => $scormid));
}
$cm = get_coursemodule_from_instance('scorm', $scormid);
$data = array(
'other' => array('attemptid' => $attempt->id, 'cmielement' => $element, 'cmivalue' => $track->value),
'objectid' => $scorm->id,
'context' => context_module::instance($cm->id),
'relateduserid' => $userid
);
$data = ['other' => ['attemptid' => $attempt->id, 'cmielement' => $element, 'cmivalue' => $value],
'objectid' => $scorm->id,
'context' => context_module::instance($cm->id),
'relateduserid' => $userid,
];
if (in_array($element, array('cmi.core.score.raw', 'cmi.score.raw'))) {
// Create score submitted event.
$event = \mod_scorm\event\scoreraw_submitted::create($data);
@ -590,9 +589,10 @@ function scorm_insert_track($userid, $scormid, $scoid, $attemptornumber, $elemen
}
// Fix the missing track keys when the SCORM track record already exists, see $trackdata in datamodel.php.
// There, for performances reasons, columns are limited to: element, id, value, timemodified.
// Missing fields are: scoid, attempt.
// Missing fields are: scoid, attemptid, elementid.
$track->scoid = $scoid;
$track->attempt = $attempt->id;
$track->attemptid = $attempt->id;
$track->elementid = scorm_get_elementid($element);
$track->id = $id;
// Trigger submitted event.
$event->add_record_snapshot('scorm_scoes_value', $track);

2
mod/scorm/version.php
View File

@ -24,7 +24,7 @@
defined('MOODLE_INTERNAL') || die();
$plugin->version = 2023100900; // The current module version (Date: YYYYMMDDXX).
$plugin->version = 2023100901; // The current module version (Date: YYYYMMDDXX).
$plugin->requires = 2023100400; // Requires this Moodle version.
$plugin->component = 'mod_scorm'; // Full name of the plugin (used for diagnostics).