'. $message .'
'; - echo ''; - print_box_end(); - - return GRADE_UPDATE_ITEM_LOCKED; - } - } - } - return grade_update('mod/quiz', $quiz->course, 'mod', 'quiz', $quiz->id, 0, $grades, $params); } @@ -970,6 +957,7 @@ * Removes all grades from gradebook * @param int $courseid * @param string optional type + * @return array Array of quizzes for which grades could not be deleted */ function quiz_reset_gradebook($courseid, $type='') { global $CFG; @@ -978,11 +966,18 @@ FROM {$CFG->prefix}quiz q, {$CFG->prefix}course_modules cm, {$CFG->prefix}modules m WHERE m.name='quiz' AND m.id=cm.module AND cm.instance=q.id AND q.course=$courseid"; + $locked_quizes = array(); + if ($quizs = get_records_sql($sql)) { foreach ($quizs as $quiz) { - quiz_grade_item_update($quiz, 'reset'); + if (quiz_grade_item_update($quiz, 'reset') == GRADE_UPDATE_ITEM_LOCKED) { + $locked_quizes[] = $quiz; + } } } + + // TODO MDL-14119 Use this return array to display a notice + return $locked_quizes; } /** @@ -1174,4 +1169,31 @@ } return ''; } + +function quiz_item_locked_confirm($quiz, $back_link, $forward_link, $back_params=false, $forward_params=false, $confirm_text=null, $return=false) { + global $CFG; + + if (empty($confirm_text)) { + $confirm_text = get_string('proceedanyway'); + } + + $return_string = ''; + + $message = get_string('gradeitemislocked', 'grades'); + + $return_string .= print_box_start('generalbox', 'notice', true); + $return_string .= ''. $message .'
'; + $return_string .= ''; + $return_string .= print_box_end(true); + + if ($return) { + return $return_string; + } else { + echo $return_string; + } + +} ?> Index: mod/quiz/locallib.php =================================================================== RCS file: /cvsroot/moodle/moodle/mod/quiz/locallib.php,v retrieving revision 1.127.2.10 diff -u -r1.127.2.10 locallib.php --- mod/quiz/locallib.php 29 Feb 2008 16:22:13 -0000 1.127.2.10 +++ mod/quiz/locallib.php 1 Apr 2008 12:07:33 -0000 @@ -102,8 +102,13 @@ /** * Delete a quiz attempt. + * @param object $attempt + * @param object $quiz + * @param bool $test If true, only returns the gradebook's response to the grade delete request + * @return mixed */ -function quiz_delete_attempt($attempt, $quiz) { +function quiz_delete_attempt($attempt, $quiz, $test=false) { + if (is_numeric($attempt)) { if (!$attempt = get_record('quiz_attempts', 'id', $attempt)) { return; @@ -116,6 +121,11 @@ return; } + if ($test) { + $userid = $attempt->userid; + return quiz_update_grades($quiz, $userid); + } + delete_records('quiz_attempts', 'id', $attempt->id); delete_attempt($attempt->uniqueid); @@ -130,7 +140,7 @@ quiz_save_best_grade($quiz, $userid); } - quiz_update_grades($quiz, $userid); + return quiz_update_grades($quiz, $userid); } /// Functions to do with quiz layout and pages //////////////////////////////// @@ -373,9 +383,14 @@ * * @param float $newgrade the new maximum grade for the quiz. * @param object $quiz the quiz we are updating. Passed by reference so its grade field can be updated too. + * @param bool $test Only do a test to see if the gradebook will accept the update: does not perform any change in DB * @return boolean indicating success or failure. */ -function quiz_set_grade($newgrade, &$quiz) { +function quiz_set_grade($newgrade, &$quiz, $test=false) { + if ($test) { + return quiz_grade_item_update($quiz); + } + // This is potentially expensive, so only do it if necessary. if (abs($quiz->grade - $newgrade) < 1e-7) { // Nothing to do. @@ -412,11 +427,20 @@ } // update grade item and send all grades to gradebook - quiz_grade_item_update($quiz); + $item_locked = false; + if (quiz_grade_item_update($quiz) == GRADE_UPDATE_ITEM_LOCKED) { + $item_locked = true; + } + quiz_update_grades($quiz); if ($success) { - return commit_sql(); + $result = commit_sql(); + if ($result && $item_locked) { + return GRADE_UPDATE_ITEM_LOCKED; + } else { + return $result; + } } else { rollback_sql(); return false; @@ -428,11 +452,16 @@ * * @param object $quiz The quiz for which the best grade is to be calculated and then saved. * @param integer $userid The userid to calculate the grade for. Defaults to the current user. + * @param bool $test If true, returns the response from the gradebook but does not update the grades. * @return boolean Indicates success or failure. */ -function quiz_save_best_grade($quiz, $userid = null) { +function quiz_save_best_grade($quiz, $userid = null, $test=false) { global $USER; + if ($test) { + return quiz_update_grades($quiz, $userid, true); + } + if (empty($userid)) { $userid = $USER->id; } @@ -466,8 +495,7 @@ } } - quiz_update_grades($quiz, $userid); - return true; + return quiz_update_grades($quiz, $userid); } /** Index: mod/quiz/edit.php =================================================================== RCS file: /cvsroot/moodle/moodle/mod/quiz/edit.php,v retrieving revision 1.107.2.8 diff -u -r1.107.2.8 edit.php --- mod/quiz/edit.php 5 Mar 2008 10:16:17 -0000 1.107.2.8 +++ mod/quiz/edit.php 1 Apr 2008 12:07:33 -0000 @@ -81,6 +81,8 @@ list($thispageurl, $contexts, $cmid, $cm, $quiz, $pagevars) = question_edit_setup('editq', true); + $quiz_item_locked_confirm = false; + //these params are only passed from page request to request while we stay on this page //otherwise they would go in question_edit_setup $quiz_showbreaks = optional_param('showbreaks', -1, PARAM_BOOL); @@ -237,6 +239,7 @@ $oldquestions = explode(",", $quiz->questions); // the questions in the old order $questions = array(); // for questions in the new order $rawgrades = $_POST; + $quiz_grades = $quiz->grades; unset($quiz->grades); foreach ($rawgrades as $key => $value) { /// Parse input for question -> grades @@ -277,10 +280,36 @@ } // If rescaling is required save the new maximum - if (isset($_REQUEST['maxgrade'])) { - if (!quiz_set_grade(optional_param('maxgrade', 0), $quiz)) { + $maxgrade = optional_param('maxgrade', null, PARAM_NUMBER); + + if (!is_null($maxgrade)) { + $result = quiz_set_grade(optional_param('maxgrade', 0), $quiz, true); // only a test + $proceedanyway = optional_param('proceedanyway', false, PARAM_BOOL); + + require_once($CFG->libdir . '/grade/constants.php'); + + if ($proceedanyway || $result != GRADE_UPDATE_ITEM_LOCKED) { + $result = quiz_set_grade(optional_param('maxgrade', 0), $quiz); // this time, the real thing + if (!$result) { error('Could not set a new maximum grade for the quiz'); } + $quiz->grades = $quiz_grades; + } else { + $savechanges = optional_param('savechanges', false, PARAM_BOOL); + + $forward_link = $back_link = $CFG->wwwroot . '/mod/quiz/edit.php'; + $back_params = array('cmid' => $cmid); + $forward_params = array('sesskey' => sesskey(), + 'recurse' => $pagevars['recurse'], + 'qpage' => $pagevars['qpage'], + 'cat' => $pagevars['cat'], + 'cmid' => $cmid, + 'maxgrade' => $maxgrade, + 'savechanges' => $savechanges, + 'proceedanyway' => true); + $confirm_text = get_string('setmaxgradeanyway', 'grades'); + $quiz_item_locked_confirm = quiz_item_locked_confirm($quiz, $back_link, $forward_link, $back_params, $forward_params, $confirm_text, true); + } } } @@ -309,20 +338,24 @@ include('tabs.php'); - print_box_start(); - - echo "';
- print_box_start('generalbox quizquestions');
- print_heading(get_string('questionsinthisquiz', 'quiz'), '', 2);
-
- $sumgrades = quiz_print_question_list($quiz, $thispageurl, true, $quiz_showbreaks, $quiz_reordertool);
- if (!set_field('quiz', 'sumgrades', $sumgrades, 'id', $quiz->instance)) {
- error('Failed to set sumgrades');
+ if ($quiz_item_locked_confirm) {
+ echo $quiz_item_locked_confirm;
+ } else {
+ echo '
| '; - - question_showbank('editq', $contexts, $thispageurl, $cm, $pagevars['qpage'], $pagevars['qperpage'], $pagevars['qsortorder'], $pagevars['qsortorderdecoded'], - $pagevars['cat'], $pagevars['recurse'], $pagevars['showhidden'], $pagevars['showquestiontext']); - - echo ' |