L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-9519 - incorrectuse of language strings in quiz. Merged from MOODLE_18_STABLE.

Browse Source
This commit is contained in:
tjhunt
2007-08-06 13:22:59 +00:00
parent 29d509f59a
commit 0675e5eb8f
4 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/quiz/config.html
+1 -1
View File
@@ -224,7 +224,7 @@
<td align="right"><b><?php print_string("grademethod", "quiz") ?>:</b></td>
<td>
<?php
choose_from_menu ($QUIZ_GRADE_METHOD, "grademethod", $form->grademethod, "", "", "");
choose_from_menu (quiz_get_grading_options(), "grademethod", $form->grademethod, "", "", "");
helpbutton("grademethod", get_string("grademethod","quiz"), "quiz");
?>
</td>
mod/quiz/locallib.php
+20 -6
View File
@@ -32,12 +32,6 @@ define("QUIZ_GRADEHIGHEST", "1");
define("QUIZ_GRADEAVERAGE", "2");
define("QUIZ_ATTEMPTFIRST", "3");
define("QUIZ_ATTEMPTLAST", "4");
$QUIZ_GRADE_METHOD = array(
QUIZ_GRADEHIGHEST => get_string("gradehighest", "quiz"),
QUIZ_GRADEAVERAGE => get_string("gradeaverage", "quiz"),
QUIZ_ATTEMPTFIRST => get_string("attemptfirst", "quiz"),
QUIZ_ATTEMPTLAST => get_string("attemptlast", "quiz")
);
/**#@-*/
/// Functions related to attempts /////////////////////////////////////////
@@ -568,6 +562,26 @@ function quiz_calculate_best_attempt($quiz, $attempts) {
}
}
/**
* @return the options for calculating the quiz grade from the individual attempt grades.
*/
function quiz_get_grading_options() {
return array (
QUIZ_GRADEHIGHEST => get_string('gradehighest', 'quiz'),
QUIZ_GRADEAVERAGE => get_string('gradeaverage', 'quiz'),
QUIZ_ATTEMPTFIRST => get_string('attemptfirst', 'quiz'),
QUIZ_ATTEMPTLAST => get_string('attemptlast', 'quiz'));
}
/**
* @param int $option one of the values QUIZ_GRADEHIGHEST, QUIZ_GRADEAVERAGE, QUIZ_ATTEMPTFIRST or QUIZ_ATTEMPTLAST.
* @return the lang string for that option.
*/
function quiz_get_grading_option_name($option) {
$strings = quiz_get_grading_options();
return $strings[$option];
}
/// Other quiz functions ////////////////////////////////////////////////////
/**
mod/quiz/mod_form.php
+2 -2
View File
@@ -8,7 +8,7 @@ class mod_quiz_mod_form extends moodleform_mod {
function definition() {
global $COURSE, $CFG, $QUIZ_GRADE_METHOD;
global $COURSE, $CFG;
$mform =& $this->_form;
//-------------------------------------------------------------------------------
@@ -117,7 +117,7 @@ class mod_quiz_mod_form extends moodleform_mod {
//-------------------------------------------------------------------------------
$mform->addElement('header', 'gradeshdr', get_string('grades', 'grades'));
$mform->addElement('select', 'grademethod', get_string("grademethod", "quiz"), $QUIZ_GRADE_METHOD);
$mform->addElement('select', 'grademethod', get_string("grademethod", "quiz"), quiz_get_grading_options());
$mform->setHelpButton('grademethod', array("grademethod", get_string("grademethod","quiz"), "quiz"));
$mform->setAdvanced('grademethod', $CFG->quiz_fix_grademethod);
$mform->setDefault('grademethod', $CFG->quiz_grademethod);
mod/quiz/view.php
+2 -2
View File
@@ -101,7 +101,7 @@
echo "<p>".get_string("attemptsallowed", "quiz").": $quiz->attempts</p>";
}
if ($quiz->attempts != 1) {
echo "<p>".get_string("grademethod", "quiz").": ".$QUIZ_GRADE_METHOD[$quiz->grademethod]."</p>";
echo "<p>".get_string("grademethod", "quiz").": ".quiz_get_grading_option_name($quiz->grademethod)."</p>";
}
// Print information about timings.
@@ -299,7 +299,7 @@
if ($overallstats) {
if ($available && $moreattempts) {
$a = new stdClass;
$a->method = $QUIZ_GRADE_METHOD[$quiz->grademethod];
$a->method = quiz_get_grading_option_name($quiz->grademethod);
$a->mygrade = $mygrade;
$a->quizgrade = $quiz->grade;
print_heading(get_string('gradesofar', 'quiz', $a));