From: Francois Marier Date: Wed, 11 Mar 2009 13:16:54 +0000 (+0000) Subject: Fix drift with CVS X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=200164446a2afd50b048125160376d731bee6d6e;p=moodle.git Fix drift with CVS --- diff --git a/admin/settings/development.php b/admin/settings/development.php index ba722ae21c..484cf51a07 100644 --- a/admin/settings/development.php +++ b/admin/settings/development.php @@ -13,6 +13,7 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page $item = new admin_setting_configcheckbox('enablehtmlpurifier', get_string('enablehtmlpurifier', 'admin'), get_string('configenablehtmlpurifier', 'admin'), 0); $item->set_updatedcallback('reset_text_filters_cache'); $temp->add($item); + $temp->add(new admin_setting_configcheckbox('experimentalsplitrestore', get_string('experimentalsplitrestore', 'admin'), get_string('configexperimentalsplitrestore', 'admin'), 0)); $ADMIN->add('experimental', $temp); diff --git a/lang/en_utf8/help/quiz/decimalpoints.html b/lang/en_utf8/help/quiz/decimalpoints.html index 6052a44779..6af89e6044 100644 --- a/lang/en_utf8/help/quiz/decimalpoints.html +++ b/lang/en_utf8/help/quiz/decimalpoints.html @@ -1,9 +1,9 @@ -

Decimal digits

+

Decimal places

By using this setting you can select the number of digits that should be shown after the decimal point when displaying student scores or grades. -For example choosing '0' means the displayed grades will be rounded to integers. -

-This setting only effects the display of grades. It does not affect the internal -calculations and rounding of the grades. -

+For example choosing '0' means the displayed grades will be rounded to integers.

+ +

This setting only effects the display of grades. It does not affect the grades +stored in the database, nor the internal calculations, which are always carried +out to full precision.

diff --git a/lang/en_utf8/help/quiz/mods.html b/lang/en_utf8/help/quiz/mods.html index 00b89f6da5..f666842d66 100644 --- a/lang/en_utf8/help/quiz/mods.html +++ b/lang/en_utf8/help/quiz/mods.html @@ -1,11 +1,12 @@ -

 Quizzes

-
-This module allows the teacher to design and set quiz tests, consisting of -multiple choice, true-false, and short answer questions. These -questions are kept in a categorised database, and can be re-used -within courses and even between courses. Quizzes can allow -multiple attempts. Each attempt is automatically marked, and the -teacher can choose whether to give feedback or to show correct answers. -This module includes grading facilities. -
+

Quizzes

+

This module allows the teacher to design and set quiz tests. The quiz can +comprise questonis of a variety of type, including multiple choice, short answer +and matching.

+ +

Quizzes can allow one or more attempts, with many options for when students +can attempts the quiz, and what they see when they do.

+ +

Most questions are graded automatically, however, there is a facility for +questions that have to be graded manually by the teacher. The teacher can also +manually override the automatically awarded grade for any question.

diff --git a/lang/en_utf8/help/quiz/popup.html b/lang/en_utf8/help/quiz/popup.html index 7493663cef..8d4ef6cab9 100644 --- a/lang/en_utf8/help/quiz/popup.html +++ b/lang/en_utf8/help/quiz/popup.html @@ -1,8 +1,7 @@ -

Display in a "secure" window

+

Use a 'secure' popup window for attempts

-

The "secure" window tries to provide a little more security for quizzes - (making copying and cheating more difficult) by restricting some of the things - that students can do with their browsers.

+

The 'secure' window tries to make some simpler forms of copying and cheating +more difficult during quiz attempts.

What happens is that:

-

NOTE: This security is NOT watertight. Do NOT rely on these protections +

NOTE: This security is not watertight. Do not rely on these protections as your sole strategy. It is impossible to implement complete protection of quizzes in a web environment so please do not rely on this option if - you are really worried about students cheating. Other strategies you can + you are really worried about students cheating. Other strategies you can try are to create really large databases of questions from which you randomly choose questions, or even better, rethink your overall assessment to put more value on constructive forms of activity such as forum discussions, diff --git a/lang/en_utf8/help/quiz/timedelay1.html b/lang/en_utf8/help/quiz/timedelay1.html index 8c5d98fa0a..f33668cf6a 100644 --- a/lang/en_utf8/help/quiz/timedelay1.html +++ b/lang/en_utf8/help/quiz/timedelay1.html @@ -1,4 +1,5 @@

Time Delay between first and second attempt

-

If you set a time delay, then a student has to wait for that time before they can attempt a quiz after the first attempt.

- +

If you set a time delay, then the student has to wait for that amount of time +to pass after the end of their first attempt before they can start their second attempt.

+ diff --git a/lang/en_utf8/help/quiz/timedelay2.html b/lang/en_utf8/help/quiz/timedelay2.html index 1615b524bf..7d1b946ede 100644 --- a/lang/en_utf8/help/quiz/timedelay2.html +++ b/lang/en_utf8/help/quiz/timedelay2.html @@ -1,4 +1,5 @@

Time Delay between additional quiz attempts

-

If you set a time delay here, then a student has to wait for that time before they can attempt their third or later attempts.

+

If you set a time delay, then the student has to wait for that amount of time +to pass after the end of their previous attempt before they can start their third or later attempt.

diff --git a/lang/en_utf8/help/quiz/timelimit.html b/lang/en_utf8/help/quiz/timelimit.html index c24be7058e..ec47a54b59 100644 --- a/lang/en_utf8/help/quiz/timelimit.html +++ b/lang/en_utf8/help/quiz/timelimit.html @@ -1,17 +1,10 @@

Time limit

-

By default, quizzes do not have a time limit, which allows - students as much time as they need to complete the quiz.

+

By default, quizzes do not have a time limit, which allows students as much +time as they need to complete the quiz, providing they finish before any close +date.

-

If you do specify a time limit, then several things are done to try and - ensure that quizzes are completed within that time:

- - +

If you do specify a time limit, a countdown clock appears on-screen, and the +quiz is automatically submitted when the time runs out. With a time limit, the +student must submit their attempt before the time limit, or they will not +receive a grade.

diff --git a/lang/en_utf8/help/quiz/timeopen.html b/lang/en_utf8/help/quiz/timeopen.html index e4985a029f..881b83301f 100644 --- a/lang/en_utf8/help/quiz/timeopen.html +++ b/lang/en_utf8/help/quiz/timeopen.html @@ -1,5 +1,5 @@

Opening and closing the quiz

-

You can specify times when the quiz is accessible for people to make attempts.

- -

Before the opening time, and after the closing time, the quiz will be unavailable.

+

You can specify a (possbily open-ended) range of times during which people +may attempt the quiz. Outside these times, the quiz may not be attempted, but +the person creating the quiz may preview it, to ensure it works as intended.

diff --git a/mod/quiz/report/overview/overview_table.php b/mod/quiz/report/overview/overview_table.php index 31c25d6d9f..1e318e74a8 100644 --- a/mod/quiz/report/overview/overview_table.php +++ b/mod/quiz/report/overview/overview_table.php @@ -216,12 +216,12 @@ class quiz_report_overview_table extends table_sql { $stateforqinattempt = false; } if ($stateforqinattempt && question_state_is_graded($stateforqinattempt)) { - $grade = quiz_rescale_grade($stateforqinattempt->grade, $this->quiz); + $grade = quiz_rescale_grade($stateforqinattempt->grade, $this->quiz, 'question'); if (!$this->is_downloading()) { if (isset($this->regradedqs[$attempt->attemptuniqueid][$questionid])){ $gradefromdb = $grade; - $newgrade = quiz_rescale_grade($this->regradedqs[$attempt->attemptuniqueid][$questionid]->newgrade, $this->quiz); - $oldgrade = quiz_rescale_grade($this->regradedqs[$attempt->attemptuniqueid][$questionid]->oldgrade, $this->quiz); + $newgrade = quiz_rescale_grade($this->regradedqs[$attempt->attemptuniqueid][$questionid]->newgrade, $this->quiz, 'question'); + $oldgrade = quiz_rescale_grade($this->regradedqs[$attempt->attemptuniqueid][$questionid]->oldgrade, $this->quiz, 'question'); $grade = ''.$oldgrade.'
'. $newgrade; @@ -255,9 +255,9 @@ class quiz_report_overview_table extends table_sql { function col_feedbacktext($attempt){ if ($attempt->timefinish) { if (!$this->is_downloading()) { - return quiz_report_feedback_for_grade(quiz_rescale_grade($attempt->sumgrades, $this->quiz), $this->quiz->id); + return quiz_report_feedback_for_grade(quiz_rescale_grade($attempt->sumgrades, $this->quiz, false), $this->quiz->id); } else { - return strip_tags(quiz_report_feedback_for_grade(quiz_rescale_grade($attempt->sumgrades, $this->quiz), $this->quiz->id)); + return strip_tags(quiz_report_feedback_for_grade(quiz_rescale_grade($attempt->sumgrades, $this->quiz, false), $this->quiz->id)); } } else { return '-'; diff --git a/mod/quiz/report/overview/report.php b/mod/quiz/report/overview/report.php index f2a8c19fe3..136200411e 100644 --- a/mod/quiz/report/overview/report.php +++ b/mod/quiz/report/overview/report.php @@ -355,7 +355,7 @@ class quiz_overview_report extends quiz_default_report { } else { $header .=' '; } - $header .='--/'.quiz_rescale_grade($question->maxgrade, $quiz); + $header .='--/'.quiz_rescale_grade($question->maxgrade, $quiz, 'question'); $headers[] = $header; } }