mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-54802-master' of git://github.com/lameze/moodle

Browse Source
This commit is contained in:
Dan Poltawski 2016-10-03 14:46:43 +01:00
commit 2d71da6851
4 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
mod/quiz/db/upgrade.php
View File

@ -220,5 +220,27 @@ function xmldb_quiz_upgrade($oldversion) {
upgrade_mod_savepoint(true, 2016092001, 'quiz');
}
if ($oldversion < 2016100300) {
// Find quizzes with the combination of require passing grade and grade to pass 0.
$quizzes = $DB->get_records_sql("
SELECT gi.id, gi.iteminstance
FROM {quiz} q
INNER JOIN {course_modules} cm ON q.id = cm.instance
INNER JOIN {grade_items} gi ON q.id = gi.iteminstance
WHERE q.completionpass = 1
AND gi.gradepass = 0
AND cm.completiongradeitemnumber IS NULL");
if ($quizzes) {
foreach ($quizzes as $quiz) {
$DB->execute("UPDATE {course_modules}
SET completiongradeitemnumber = :gradeitemid
WHERE instance = :quizid",
array('gradeitemid' => $quiz->id, 'quizid' => $quiz->iteminstance));
}
}
// Quiz savepoint reached.
upgrade_mod_savepoint(true, 2016100300, 'quiz');
}
return true;
}

1
mod/quiz/lang/en/quiz.php
View File

@ -396,6 +396,7 @@ $string['grademethod_help'] = 'When multiple attempts are allowed, the following
* Last attempt (all other attempts are ignored)';
$string['gradesdeleted'] = 'Quiz grades deleted';
$string['gradesofar'] = '{$a->method}: {$a->mygrade} / {$a->quizgrade}.';
$string['gradetopassnotset'] = 'This quiz does not have a grade to pass set so you cannot use this option. Please use the require grade setting instead.';
$string['gradingdetails'] = 'Marks for this submission: {$a->raw}/{$a->max}.';
$string['gradingdetailsadjustment'] = 'With previous penalties this gives <strong>{$a->cur}/{$a->max}</strong>.';
$string['gradingdetailspenalty'] = 'This submission attracted a penalty of {$a}.';

7
mod/quiz/mod_form.php
View File

@ -533,6 +533,13 @@ class mod_quiz_mod_form extends moodleform_mod {
}
}
if (array_key_exists('completion', $data) && $data['completion'] == COMPLETION_TRACKING_AUTOMATIC) {
// Show an error if require passing grade was selected and the grade to pass was setted to 0.
if ($data['completionpass'] == 1 && (empty($data['gradepass']) || grade_floatval($data['gradepass']) == 0)) {
$errors['gradepass'] = get_string('gradetopassnotset', 'quiz');
}
}
// Check the boundary value is a number or a percentage, and in range.
$i = 0;
while (!empty($data['feedbackboundaries'][$i] )) {

2
mod/quiz/version.php
View File

@ -24,7 +24,7 @@
defined('MOODLE_INTERNAL') || die();
$plugin->version = 2016092001;
$plugin->version = 2016100300;
$plugin->requires = 2016051900;
$plugin->component = 'mod_quiz';
$plugin->cron = 60;