diff --git a/lang/en/help/qtype_calculated/calculated.html b/lang/en/help/qtype_calculated/calculated.html deleted file mode 100644 index db07c11fb05..00000000000 --- a/lang/en/help/qtype_calculated/calculated.html +++ /dev/null @@ -1,69 +0,0 @@ -

Calculated questions

- -

Calculated questions offers a way to create individual numerical question by the use of wildcards that are substituted with individual values when the quiz is taken. -
Below is a shrunken view of the main editing page with some example inputs: -

- - - - - - - - - - - - - - - - - - - - - - - - - - - -
Question: - -
Image to display: - -
Correct Answer Formula: -    - -
Tolerance: - ± -
Tolerance Type: - -
Significant Figures: - -
- -

-In the question text input and "Correct Answer Formula" {a} and {b} can be seen. These and any other {name} can be used as a wildcard that is substituted by some value when the quiz is taken. Also, the correct answer is calculated when the quiz is submitted using the expression in "Correct Answer Formula", which is calculated as a numerical expression after the substitution of the wildcards. The possible wildcard values are set or generated on a later page in "editing wizard" for calculated questions... -

-The example formula uses the operator +. Other accepted operators are -*/ and % where % is the modulo operator. It is also possible to use some PHP-style mathematical function. Among these there are 24 single-argument function:
-abs, acos, acosh, asin, asinh, atan, atanh, ceil, cos, cosh, deg2rad, exp, expm1, floor, log, log10, log1p, rad2deg, round, sin, sinh, sqrt, tan, tanh -
and two two-argument functions
-atan2, pow -
and the functions min and max that can take two or more arguments. It is also possible to use the function pi that takes no arguments but do not forget the use the parentheses - the correct usage is pi(). Similarly the other function must have their argument(s) within parentheses. Possible usage is for example sin({a}) + cos({b}) * 2. It should not be any problem to wrap functions within each other like cos(deg2rad({a} + 90)) etc. -
More details on how to use these PHP-style functions can be found in the documentation at the PHP web site -

-As for numerical questions it is possible to allow a margin within which all responses are accepted as correct. The "Tolerance" field is used for this. However, there are three different types of tolerances. These are Relative, Nominal and Geometric. If we say that the correct answer at quiz time is calculated to 200 and the tolerance is set to 0.5 then the different tolerance types work like this: -

Relative: A tolerance interval is calculated by multiplying the correct answer with 0.5, ie in this case we get 100 so for this tolerance the correct response must be between 100 and 300. (200 ± 100)
-This is useful if the magnitude of the correct answer can differ greatly between different wildcard values. -

Nominal: This is the simplest tolerance type but not very powerful. The correct response must be between 199.5 and 200.5 (200 ± 0.5)
-This tolerance type can be useful if the differences between different correct answers are small. -

Geometric: The upper limit of the tolerance interval is calculated as 200 + 0.5*200 and is the same as for the relative case. The lower limit is calculated as 200/(1 + 0.5). The correct response must then be between 133.33 and 300.
-This is useful for complex calculation that must have great tolerances where relative tolerances of 1 or more would be used for the upper limit but clearly not acceptable for the lower limit as it would make zero a correct answer for all cases. -

-The field Significant Figures does only relate to how the correct answer should be presented in the review or the reports. Examples: If it is set to 3 then the correct answer 13.333 would be presented as 13.3; 1236 would be presented as 1240; 23 would be presented as 23.0 etc. -

-The feedback field and the optional unit fields work just like they do for numerical questions. -

\ No newline at end of file diff --git a/lang/en/help/qtype_calculatedsimple/calculatedsimple.html b/lang/en/help/qtype_calculatedsimple/calculatedsimple.html deleted file mode 100644 index 45bb1d6668e..00000000000 --- a/lang/en/help/qtype_calculatedsimple/calculatedsimple.html +++ /dev/null @@ -1,66 +0,0 @@ -

Simple Calculated questions

- -

Simple Calculated questions which are a simplified version of calculated questions, offers a way to create individual numerical question by the use of wildcards that are substituted with individual values when the quiz is taken. -
Below is a shrunken view of the main editing page with some example inputs: -

- - - - - - - - - - - - - - - - - - - - - - - - - - - -
Question: - -
Image to display: - -
Correct Answer Formula: -    - -
Tolerance: - ± -
Tolerance Type: - -
Significant Figures: - -
- -

-In the question text input and "Correct Answer Formula" {a} and {b} can be seen. Only those in "Correct Answer Formula" can be used as a wildcard that is substituted by some value when the quiz is taken. Also, the correct answer is calculated when the quiz is submitted using the expression in "Correct Answer Formula", which is calculated as a numerical expression after the substitution of the wildcards. -The example formula uses the operator +. Other accepted operators are -*/ and % where % is the modulo operator. It is also possible to use some PHP-style mathematical function. Among these there are 24 single-argument function:
-abs, acos, acosh, asin, asinh, atan, atanh, ceil, cos, cosh, deg2rad, exp, expm1, floor, log, log10, log1p, rad2deg, round, sin, sinh, sqrt, tan, tanh -
and two two-argument functions
-atan2, pow -
and the functions min and max that can take two or more arguments. It is also possible to use the function pi that takes no arguments but do not forget the use the parentheses - the correct usage is pi(). Similarly the other function must have their argument(s) within parentheses. Possible usage is for example sin({a}) + cos({b}) * 2. It should not be any problem to wrap functions within each other like cos(deg2rad({a} + 90)) etc. -
More details on how to use these PHP-style functions can be found in the documentation at the PHP web site -

-As for numerical questions it is possible to allow a margin within which all responses are accepted as correct. The "Tolerance" field is used for this. However, there are three different types of tolerances. These are Relative, Nominal and Geometric. If we say that the correct answer at quiz time is calculated to 200 and the tolerance is set to 0.5 then the different tolerance types work like this: -

Relative: A tolerance interval is calculated by multiplying the correct answer with 0.5, ie in this case we get 100 so for this tolerance the correct response must be between 100 and 300. (200 ± 100)
-This is useful if the magnitude of the correct answer can differ greatly between different wildcard values. -

Nominal: This is the simplest tolerance type but not very powerful. The correct response must be between 199.5 and 200.5 (200 ± 0.5)
-This tolerance type can be useful if the differences between different correct answers are small. -

-The field Significant Figures does only relate to how the correct answer should be presented in the review or the reports. Examples: If it is set to 3 then the correct answer 13.333 would be presented as 13.3; 1236 would be presented as 1240; 23 would be presented as 23.0 etc. -

-The feedback field and the optional unit fields work just like they do for numerical questions. -

\ No newline at end of file diff --git a/lang/en/help/qtype_description/description.html b/lang/en/help/qtype_description/description.html deleted file mode 100644 index 5da94aeb6ff..00000000000 --- a/lang/en/help/qtype_description/description.html +++ /dev/null @@ -1,11 +0,0 @@ -

Description

- -

This type of question is not really a question.

- -

All it does is print some text without requiring any answers.

- -

It can be used to print a descriptive text to be used by a following group of questions.

- -

The General feedback can be used if you have some text that you want to appear on the review -page only. The 'Question text' appears both during the attempt and on the review page.

- \ No newline at end of file diff --git a/lang/en/help/qtype_essay/essay.html b/lang/en/help/qtype_essay/essay.html deleted file mode 100644 index 5159174a2f2..00000000000 --- a/lang/en/help/qtype_essay/essay.html +++ /dev/null @@ -1,14 +0,0 @@ -

Essay questions

- -

In response to a question (that may include an image) the respondent writes - an answer in essay format. Three fields may be edited when creating the essay question: - the question title, the body of the question, and feedback that can be displayed at a time - chosen by the facilitator.

- -

The essay question will not be assigned a grade until it has been reviewed by a teacher - question, the grader will be able to enter a custom comment in response the respondent's - essay and be able to assign a score for the essay.

- -

Normally, the student can type their answer using the rich-text editor. However, - if there is more than one essay question on a page, the rich-text editor is - only used for the first essay question.

\ No newline at end of file diff --git a/lang/en/help/qtype_match/match.html b/lang/en/help/qtype_match/match.html deleted file mode 100644 index def45f61b4e..00000000000 --- a/lang/en/help/qtype_match/match.html +++ /dev/null @@ -1,11 +0,0 @@ -

Matching questions

- -

After an optional introduction, the respondent is presented with - several sub-questions and several jumbled answers. There is one - correct answer for each question.

- -

The respondent must select an answer to match each sub-question.

- -

Each sub-question is equally weighted to contribute towards the - grade for the total question.

- diff --git a/lang/en/help/qtype_multianswer/multianswer.html b/lang/en/help/qtype_multianswer/multianswer.html deleted file mode 100644 index 9e3b916b880..00000000000 --- a/lang/en/help/qtype_multianswer/multianswer.html +++ /dev/null @@ -1,160 +0,0 @@ -

Embedded answers (Cloze)

- -

This very flexible question type is similar to a -popular format known as the Cloze format.

- -

Questions consist of a passage of text (in Moodle format) that has various sub-questions -embedded within it, including

- -

There is currently no graphical interface to create these -questions - you need to specify the question format using the text box or by -importing them from external files.

- -

Here is an example of the input text used to specify such a question:

- -

Note that for multiple choice vertical or horizontal rendering there is no automatic numbering. It can added at each answer as shown here.

- -

- -

This example will appear to students as follows:

- -
-
- Question 1 -
- Marks: --/13.00
-
-
-
.
-
- The multichoice question can also be shown in the vertical display of the standard moodle multiple choice
-
-
- - - - - - - - - - - - - - - - - - - - - -
- - - -
- - - -
- - - -
- - - -
-
-
Or in an horizontal display that is included here in a table

- - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - -
-
- A shortanswer question where case must match. Write moodle in upper case letters
-
Note that addresses like www.moodle.org and smileys smile all work as normal:
- a) How good is this?

Good luck! -
-
-
-
-
diff --git a/lang/en/help/qtype_multichoice/multichoice.html b/lang/en/help/qtype_multichoice/multichoice.html deleted file mode 100644 index ede45935096..00000000000 --- a/lang/en/help/qtype_multichoice/multichoice.html +++ /dev/null @@ -1,15 +0,0 @@ -

Multiple Choice questions

- -

In response to a question (that may include a image) the respondent - chooses from multiple answers. There are two types of multiple choice - questions - single answer and multiple answer.

- -

Single-answer questions allow one and only one answer to be chosen. - Generally all the grades for such a question should be positive.

- -

Multiple-answer questions allow one or more answers to be chosen - each answer may carry a positive or negative grade, so that choosing ALL the options will not necessarily result in good grade. If the total grade is negative then the total grade for this question will be zero. Note that in a multiple-answer question, the grades must add up to 100%.

- -

Finally, each answer (right or wrong) should include feedback - this feedback - will be shown to the respondent next to each of their answers (if the quiz - itself is configured to show feedback). -

diff --git a/lang/en/help/qtype_multichoice/multichoiceshuffle.html b/lang/en/help/qtype_multichoice/multichoiceshuffle.html deleted file mode 100644 index 83922bb43b6..00000000000 --- a/lang/en/help/qtype_multichoice/multichoiceshuffle.html +++ /dev/null @@ -1,9 +0,0 @@ -

Shuffle answers

- -

If you set this option to "Yes", then the order of the answers - is randomly shuffled each time a student starts an attempt at a quiz - containing this question - provided that "Shuffle within questions" in - the Quiz settings is set to "Yes".

- -

The intention is simply to make it a little harder for students - to copy from each other.

\ No newline at end of file diff --git a/lang/en/help/qtype_numerical/numerical.html b/lang/en/help/qtype_numerical/numerical.html deleted file mode 100644 index ca4e54a90a4..00000000000 --- a/lang/en/help/qtype_numerical/numerical.html +++ /dev/null @@ -1,16 +0,0 @@ -

Numerical questions

- -

From the student perspective, a numerical question looks just -like a short-answer question.

- -

The difference is that numerical answers are allowed -to have an accepted error. This allows a continuous range of answers -to be set. For example, if the answer is 30 with an accepted error of 5, -then any number between 25 and 35 will be accepted as correct.

- -

Like with short answer questions, different answers, or the same -answer with different precisions can be given. In this case, the first -matching answer is used to determine the score and the feedback.

- -

To provide feedback for responses that do not match any of the answers -you entered, provide some feedback with a '*' in the answer box.

\ No newline at end of file diff --git a/lang/en/help/qtype_randomsamatch/randomsamatch.html b/lang/en/help/qtype_randomsamatch/randomsamatch.html deleted file mode 100644 index 0ea1fad84bb..00000000000 --- a/lang/en/help/qtype_randomsamatch/randomsamatch.html +++ /dev/null @@ -1,19 +0,0 @@ -

Random Short-Answer Matching questions

- -

After an optional introduction, the respondent is presented with - several sub-questions and several jumbled answers. There is one - correct answer for each question.

- -

The respondent must select an answer to match each sub-question.

- -

Each sub-question is equally weighted to contribute towards the - grade for the total question.

- -

The questions and answers are randomly drawn from the pool of - "Short Answer" questions in the current category. Each attempt - on a quiz may therefore have different questions and answers. - You must make sure that the category contains enough unused - short-answer questions, otherwise the student will be shown - a friendly error message. The more short-answer questions you - provide the more likely it is that students will see a new - selection on each attempt.

diff --git a/lang/en/help/qtype_shortanswer/shortanswer.html b/lang/en/help/qtype_shortanswer/shortanswer.html deleted file mode 100644 index 16c647914fa..00000000000 --- a/lang/en/help/qtype_shortanswer/shortanswer.html +++ /dev/null @@ -1,15 +0,0 @@ -

Short Answer questions

- -

In response to a question (that may include a image) the respondent - types a word or short phrase.

- -

There may be several possible correct answers, each with a different - grade. If the "Case sensitive" option is selected, then you can - have different scores for "Word" or "word".

- -

You can use the asterisk character (*) as a wildcard to match - any series of characters. For example, use ran*ing to match any word - or phrase starting with "ran" and ending with "ing". If you really - do want to match an asterisk then use a backslash like this: \*

- -

Without wildcards the answers are compared exactly, so be careful with your spelling!

diff --git a/lang/en/help/qtype_truefalse/truefalse.html b/lang/en/help/qtype_truefalse/truefalse.html deleted file mode 100644 index 9749814947f..00000000000 --- a/lang/en/help/qtype_truefalse/truefalse.html +++ /dev/null @@ -1,11 +0,0 @@ -

True/False questions

- - -

In response to a question (that may include a image) the respondent - chooses from True or False.

- -

If feedback is enabled, then the appropriate feedback message is - shown to the respondent after answering the quiz. For example, - if the correct answer is "False", but they answer "True" (getting - it wrong) then the "True" feedback is shown. -

diff --git a/lang/en/help/question/categories.html b/lang/en/help/question/categories.html deleted file mode 100644 index 2485f36e032..00000000000 --- a/lang/en/help/question/categories.html +++ /dev/null @@ -1,37 +0,0 @@ -

Question categories

- -

Rather than keeping all your questions in one big list, - you can create categories to keep them in.

- -

Categories can be created or deleted at will. But:

- - -

You can arrange your categories in a hierarchy so - that they are easier to manage. Editing categories is done under the 'Categories' - tab in the question bank.

- - - - -

See also :

- \ No newline at end of file diff --git a/lang/en/help/question/categorycontexts.html b/lang/en/help/question/categorycontexts.html deleted file mode 100644 index 966e2f00bb2..00000000000 --- a/lang/en/help/question/categorycontexts.html +++ /dev/null @@ -1,19 +0,0 @@ -

Question Category Contexts

-

Question categories are separated into different contexts from Moodle 1.9. -Each different context has a separate question category hierarchy. -Question category contexts are :

- -

You will not be able to see / use the contexts from categories above course level unless your site admin has given you permission to do so.

-

See also :

- \ No newline at end of file diff --git a/lang/en/help/question/categoryparent.html b/lang/en/help/question/categoryparent.html deleted file mode 100644 index 9373145e9ab..00000000000 --- a/lang/en/help/question/categoryparent.html +++ /dev/null @@ -1,18 +0,0 @@ -

Parent

- -

The category in which this one will be placed. 'Top' means that this category -is not contained in any other category.

- -

Normally you will see several category 'contexts' which you will see in bold type, notice -that each context contains it's own category hierarchy. See below for more info on contexts. If you -do not see several contexts then it may be because you do not have permission to access other contexts.

- -

If there is only one category in a context, you will not be able to move the category as there must be -at least one category in each context.

- -

See also :

- \ No newline at end of file diff --git a/lang/en/help/question/permissions.html b/lang/en/help/question/permissions.html deleted file mode 100644 index c14ed646bda..00000000000 --- a/lang/en/help/question/permissions.html +++ /dev/null @@ -1,13 +0,0 @@ -

Question permissions

- -

By default a course teacher does not have permission to do anything with -questions shared in areas outside the course in which they are assigned a teacher -role. So if you are a teacher and your site admin has not assigned you permission -to share or use questions shared in levels above the course level you will not -see questions categories above the course level.

- -

See also :

- \ No newline at end of file diff --git a/lang/en/help/question/types.html b/lang/en/help/question/types.html deleted file mode 100644 index 56c58eabd04..00000000000 --- a/lang/en/help/question/types.html +++ /dev/null @@ -1,4 +0,0 @@ -

Creating a new question

- -

You can create questions of various different types:

- diff --git a/lang/en/help/quiz/analysisdownload.html b/lang/en/help/quiz/analysisdownload.html deleted file mode 100644 index c7d160813bf..00000000000 --- a/lang/en/help/quiz/analysisdownload.html +++ /dev/null @@ -1,21 +0,0 @@ -

Analysis Download

- -

You may want to download the data displayed in the on-screen -table for further analysis. You can choose between three file -formats for downloaded data.
In each case data will be -presented as a table with appropriate titles, as on the screen. If -the table is paged, all data for all pages will be downloaded in a -single file.

- -

Excel Spreadsheet format:

You will get an .xls -spreadsheet document.

- -

OpenOffice Writer format:

The data will we -presented within a table in an OpenOffice .sxw text document.
- -This format will be available only if you have installed the -PHPWriter library in the /moodle/lib subdirectory.

- -

Text format

In this case, data will be stored as a -regular text file. A line for each row in the table with data -separated by tabstops.

diff --git a/lang/en/help/quiz/analysisoptions.html b/lang/en/help/quiz/analysisoptions.html deleted file mode 100644 index ddc50625d65..00000000000 --- a/lang/en/help/quiz/analysisoptions.html +++ /dev/null @@ -1,21 +0,0 @@ -

Analysis Options

- -

You can determine which quiz attempts are included in the -analysis by setting the following parameters:

- -

Attempt selection:

It may be convenient to analyze -just one quiz attempt for each user. This particular attempt may be -the one with the highest overall score, the first attempt or the -last attempt of those performed. Alternatively all attempts data may -be combined for a cumulative analysis.

- -

Rejection of low scores:

Sometimes users are just -browsing the quiz, exploring it, and not going through it for a -grade. It is common that such 'trial' attempts get very low scores. -These attempts can be excluded from analysis by setting a low limit -for the score of the attempts to analyze. This limit is specified as -a percentage (0-100) of the maximum grade achievable in the -quiz.

- -

Page size:

You choose how many questions per page -you want to see displayed on screen.

diff --git a/lang/en/help/quiz/calculated.html b/lang/en/help/quiz/calculated.html deleted file mode 100644 index 23889e88790..00000000000 --- a/lang/en/help/quiz/calculated.html +++ /dev/null @@ -1,69 +0,0 @@ -

Calculated questions

- -

Calculated questions offers a way to create individual numerical question by the use of wildcards that are substituted with individual values when the quiz is taken. -
Below is a shrunken view of the main editing page with some example inputs: -

- - - - - - - - - - - - - - - - - - - - - - - - - - - -
Question: - -
Image to display: - -
Correct Answer Formula: -    - -
Tolerance: - ± -
Tolerance Type: - -
Significant Figures: - -
- -

-In the question text input and "Correct Answer Formula" {a} and {b} can be seen. These and any other {name} can be used as a wildcard that is substituted by some value when the quiz is taken. Also, the correct answer is calculated when the quiz is submitted using the expression in "Correct Answer Formula", which is calculated as a numerical expression after the substitution of the wildcards. The possible wildcard values are set or generated on a later page in "editing wizard" for calculated questions... -

-The example formula uses the operator +. Other accepted operators are -*/ and % where % is the modulo operator. It is also possible to use some PHP-style mathematical function. Among these there are 24 single-argument function:
-abs, acos, acosh, asin, asinh, atan, atanh, ceil, cos, cosh, deg2rad, exp, expm1, floor, log, log10, log1p, rad2deg, round, sin, sinh, sprt, tan, tanh -
and two two-argument functions
-atan2, pow -
and the functions min and max that can take two or more arguments. It is also possible to use the function pi that takes no arguments but do not forget the use the parentheses - the correct usage is pi(). Similarly the other function must have their argument(s) within parentheses. Possible usage is for example sin({a}) + cos({b}) * 2. It should not be any problem to wrap functions within each other like cos(deg2rad({a} + 90)) etc. -
More details on how to use these PHP-style functions can be found in the documentation at the PHP web site -

-As for numerical questions it is possible to allow a margin within which all responses are accepted as correct. The "Tolerance" field is used for this. However, there are three different types of tolerances. These are Relative, Nominal and Geometric. If we say that the correct answer at quiz time is calculated to 200 and the tolerance is set to 0.5 then the different tolerance types work like this: -

Relative: A tolerance interval is calculated by multiplying the correct answer with 0.5, ie in this case we get 100 so for this tolerance the correct response must be between 100 and 300. (200 ± 100)
-This is useful if the magnitude of the correct answer can differ greatly between different wildcard values. -

Nominal: This is the simplest tolerance type but not very powerful. The correct response must be between 199.5 and 200.5 (200 ± 0.5)
-This tolerance type can be useful if the differences between different correct answers are small. -

Geometric: The upper limit of the tolerance interval is calculated as 200 + 0.5*200 and is the same as for the relative case. The lower limit is calculated as 200/(1 + 0.5). The correct response must then be between 133.33 and 300.
-This is useful for complex calculation that must have great tolerances where relative tolerances of 1 or more would be used for the upper limit but clearly not acceptable for the lower limit as it would make zero a correct answer for all cases. -

-The field Significant Figures does only relate to how the correct answer should be presented in the review or the reports. Examples: If it is set to 3 then the correct answer 13.333 would be presented as 13.3; 1236 would be presented as 1240; 23 would be presented as 23.0 etc. -

-The feedback field and the optional unit fields work just like they do for numerical questions. -

\ No newline at end of file diff --git a/lang/en/help/quiz/categories.html b/lang/en/help/quiz/categories.html deleted file mode 100644 index 11d453f3fa3..00000000000 --- a/lang/en/help/quiz/categories.html +++ /dev/null @@ -1,29 +0,0 @@ -

Question categories

- -

Rather than keeping all your questions in one big list, - you can create categories to keep them in.

- -

Categories can be created or deleted at will. But :

- - -

You can arrange your categories in a hierarchy so

- that they are easier to manage. - - -

See also :

- \ No newline at end of file diff --git a/lang/en/help/quiz/categories_edit.html b/lang/en/help/quiz/categories_edit.html deleted file mode 100644 index e79ceecf807..00000000000 --- a/lang/en/help/quiz/categories_edit.html +++ /dev/null @@ -1,24 +0,0 @@ -

Question categories

- -

Rather than keeping all your questions in one big list, - you can create categories to keep them in.

- -

Each category consists of a name and a short description.

- -

Each category can also be "published", which means - that the category (and all questions in it) will be - available to all courses on this server, so that - other courses can use your questions in their quizzes.

- -

Field descriptions

- -

Parent: The category in which this one will be placed. If - no other categories have been created, only 'Top' will be - available

- -

Category: The name of the category.

- -

Category info: A brief description of the category.

- -

Publish: Whether or not to immediately publish this - category.

diff --git a/lang/en/help/quiz/correctanswers.html b/lang/en/help/quiz/correctanswers.html deleted file mode 100644 index 5f044593e73..00000000000 --- a/lang/en/help/quiz/correctanswers.html +++ /dev/null @@ -1,6 +0,0 @@ -

Show correct answers

- -

If you enable correct answers, then the -feedback will show also show the correct answer -for each question (highlighted in a bright colour). -

diff --git a/lang/en/help/quiz/createmultiple.html b/lang/en/help/quiz/createmultiple.html deleted file mode 100644 index 42be858f275..00000000000 --- a/lang/en/help/quiz/createmultiple.html +++ /dev/null @@ -1,10 +0,0 @@ -

Create multiple questions

- -

This page allows you to create multiple questions at once.

- -

Currently it will only allow you to create a number of - Random Questions and (optionally) add them to the current - quiz.

- -

Eventually this page will evolve into a larger wizard that - will have more options.

diff --git a/lang/en/help/quiz/description.html b/lang/en/help/quiz/description.html deleted file mode 100644 index 5da94aeb6ff..00000000000 --- a/lang/en/help/quiz/description.html +++ /dev/null @@ -1,11 +0,0 @@ -

Description

- -

This type of question is not really a question.

- -

All it does is print some text without requiring any answers.

- -

It can be used to print a descriptive text to be used by a following group of questions.

- -

The General feedback can be used if you have some text that you want to appear on the review -page only. The 'Question text' appears both during the attempt and on the review page.

- \ No newline at end of file diff --git a/lang/en/help/quiz/discrimination.html b/lang/en/help/quiz/discrimination.html deleted file mode 100755 index 05629d7ef2e..00000000000 --- a/lang/en/help/quiz/discrimination.html +++ /dev/null @@ -1,10 +0,0 @@ -

Discrimination Index

- -

This provides a rough indicator of the performance of each item. It is calculated by counting the number of students who scored in top third on this quiz for each question and dividing this figure by the number of students who scored in the bottom third.

- -

For example, if 30 students took the quiz, there would be 10 students each in the top third and bottom third. If, on item #1, 9 of the best students got it right, but only 3 of the poorest third got it right, the discrimination index would be 9/3 = 3.0. The numbers in parentheses are: (top third correct responses/bottom third correct responses).

- -

If the index goes below 1.0 it means that more of the weaker students got the item right than the stronger students. Such items should be discarded as worthless. In fact, they reduce the accuracy of the overall score for the quiz.

- -

If no weak students got the item correct, the denominator would be 0 which would yield a result of infinity. The program substitutes a '10' for any such items.

- diff --git a/lang/en/help/quiz/essay.html b/lang/en/help/quiz/essay.html deleted file mode 100644 index 5159174a2f2..00000000000 --- a/lang/en/help/quiz/essay.html +++ /dev/null @@ -1,14 +0,0 @@ -

Essay questions

- -

In response to a question (that may include an image) the respondent writes - an answer in essay format. Three fields may be edited when creating the essay question: - the question title, the body of the question, and feedback that can be displayed at a time - chosen by the facilitator.

- -

The essay question will not be assigned a grade until it has been reviewed by a teacher - question, the grader will be able to enter a custom comment in response the respondent's - essay and be able to assign a score for the essay.

- -

Normally, the student can type their answer using the rich-text editor. However, - if there is more than one essay question on a page, the rich-text editor is - only used for the first essay question.

\ No newline at end of file diff --git a/lang/en/help/quiz/export.html b/lang/en/help/quiz/export.html deleted file mode 100644 index d3e6b754971..00000000000 --- a/lang/en/help/quiz/export.html +++ /dev/null @@ -1,20 +0,0 @@ -

Exporting questions from a Category

- -

This function allows you to export a complete category (and all its - subcategories) of questions to a text file.

- -

Please note that in many file formats some information is lost - when the questions are exported. This is because many formats do - not possess all the features that exist in Moodle questions. You should - not expect to export and import questions and for them to be - identical. Also some question types may not export at all. - You are advised to check exported data before using - it in a production environment.

- -

A number of file formats are supported. See in the individual help files -and the Moodle Docs -for details.

- - -

Import and Export formats are a pluggable resource. Other optional formats may be available in the - Modules and Plugins database.

diff --git a/lang/en/help/quiz/exportcategory.html b/lang/en/help/quiz/exportcategory.html deleted file mode 100644 index a48edb08e15..00000000000 --- a/lang/en/help/quiz/exportcategory.html +++ /dev/null @@ -1,13 +0,0 @@ -

Export Category

- -

The Category: drop-down is used to select the -category from which the exported questions -will be taken.

- -

Some import formats (GIFT and XML Format) permit the category -to be included in the writtenfile, enabling the categories to -(optionally) be recreated on import. In order for this data to -be included the Write category to file box must be ticked. -If this is selected you can also embed the category context -by ticking Write context to file. Deselect the context -option for compatibility with older versions of Moodle.

diff --git a/lang/en/help/quiz/feedback.html b/lang/en/help/quiz/feedback.html deleted file mode 100644 index 6e1ed1c7d34..00000000000 --- a/lang/en/help/quiz/feedback.html +++ /dev/null @@ -1,5 +0,0 @@ -

Feedback

- -

If you enable quiz feedback, then students will receive - question feedback on every answer (right or wrong).

- diff --git a/lang/en/help/quiz/generalfeedback.html b/lang/en/help/quiz/generalfeedback.html deleted file mode 100644 index ae42dffa13c..00000000000 --- a/lang/en/help/quiz/generalfeedback.html +++ /dev/null @@ -1,14 +0,0 @@ -

Question general feedback

- -

Question general feedback is some text that gets shown to the -student after they have attempted the question. Unlike feedback, -which depends on the question type and what response the student gave, -the same general feedback text is shown to all students.

- -

You can control when general feedback is shown to students using -the "Students may review:" check-boxes on the quiz editing form.

- -

You can use the general feedback to give students some background -to what knownledge the question was testing. Or to give them a -link to more information they can use if they did not understand the -questions.

\ No newline at end of file diff --git a/lang/en/help/quiz/import.html b/lang/en/help/quiz/import.html deleted file mode 100644 index 5b5387cf790..00000000000 --- a/lang/en/help/quiz/import.html +++ /dev/null @@ -1,24 +0,0 @@ -

Importing new questions

- -

This function allows you to import questions from - external text files, uploaded through a form, - or by choosing a suitable file already in the - course Files area.

- -

A note about character encodings

- -

If your file contains non-ascii characters then it must use UTF-8 encoding. - You may be able to select or convert to UTF-8 using your favourite editor, - or it may be an option in the exporting software. - Be particularly cautious with files generated by Microsoft Office applications, - as these commonly use special encoding which will not be handled correctly. - XML based import formats will be handled - automatically provided your Moodle server is running PHP 5.

- -

A number of file formats are supported. See in the individual help files -and the Moodle Docs -for details.

- - -

Import and Export formats are a pluggable resource. Other optional formats may be available in the - Modules and Plugins database.

diff --git a/lang/en/help/quiz/importcategory.html b/lang/en/help/quiz/importcategory.html deleted file mode 100644 index fa39452f13e..00000000000 --- a/lang/en/help/quiz/importcategory.html +++ /dev/null @@ -1,17 +0,0 @@ -

Import Category

- -

The Category: drop-down is used to select the -category into which the imported questions -will go.

- -

Some import formats (GIFT and XML Format) permit the category -to be specified inside the import file. In order for this to -happen the Get category from file box must be ticked. If it is not, -the questions will go into the selected category regardless -of any instructions in the file. Formats exported from -Moodle may also contain the category context embedded in -the category string. Deselect Get context from file to -force the default context to be used.

- -

When categories are specified inside an import file, if they -do not exist they will be created.

diff --git a/lang/en/help/quiz/match.html b/lang/en/help/quiz/match.html deleted file mode 100644 index def45f61b4e..00000000000 --- a/lang/en/help/quiz/match.html +++ /dev/null @@ -1,11 +0,0 @@ -

Matching questions

- -

After an optional introduction, the respondent is presented with - several sub-questions and several jumbled answers. There is one - correct answer for each question.

- -

The respondent must select an answer to match each sub-question.

- -

Each sub-question is equally weighted to contribute towards the - grade for the total question.

- diff --git a/lang/en/help/quiz/matchgrades.html b/lang/en/help/quiz/matchgrades.html deleted file mode 100644 index fc76764dfb5..00000000000 --- a/lang/en/help/quiz/matchgrades.html +++ /dev/null @@ -1,46 +0,0 @@ -

Match Grades

- -

Imported grades must match one of the -fixed list of valid grades, as follows...

- - - -

negative values of the above list -are also permitted.

- -

There are two settings for this switch. They affect how -the import routine treats values that do not exactly -match one of the values in the above list

- - - -

Note: some custom import formats write directly to the database and may bypass -this check

diff --git a/lang/en/help/quiz/matchshuffle.html b/lang/en/help/quiz/matchshuffle.html deleted file mode 100644 index 6c70341c276..00000000000 --- a/lang/en/help/quiz/matchshuffle.html +++ /dev/null @@ -1,11 +0,0 @@ -

Shuffle

- -

If you set this option to "Yes", then the order of the - subquestions - is randomly shuffled each time a student starts an attempt at a quiz - containing this question - provided that - "Shuffle within questions" in - the Quiz settings is set to "Yes".

- -

The intention is simply to make it a little harder for students - to copy from each other.

\ No newline at end of file diff --git a/lang/en/help/quiz/mods.html b/lang/en/help/quiz/mods.html deleted file mode 100644 index f666842d662..00000000000 --- a/lang/en/help/quiz/mods.html +++ /dev/null @@ -1,12 +0,0 @@ -

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/help/quiz/multichoice.html b/lang/en/help/quiz/multichoice.html deleted file mode 100644 index fbc95a1c415..00000000000 --- a/lang/en/help/quiz/multichoice.html +++ /dev/null @@ -1,21 +0,0 @@ - -

Multiple Choice questions

- -

In response to a question (that may include a image) the respondent - chooses from multiple answers. There are two types of multiple choice - questions - single answer and multiple answer.

- -

Single-answer questions allow one and only one answer to be chosen. - Generally all the grades for such a question should be positive.

- -

Multiple-answer questions allow one or more answers to be chosen - each answer - may carry a positive or negative grade, so that choosing ALL the options - will not necessarily result in good grade. If the total grade is negative - then the total grade for this question will be zero. Careful, it is - possible to create questions that have scores greater than 100%.

- -

Finally, each answer (right or wrong) should include feedback - this feedback - will be shown to the respondent next to each of their answers (if the quiz - itself is configured to show feedback). -

diff --git a/lang/en/help/quiz/multichoiceshuffle.html b/lang/en/help/quiz/multichoiceshuffle.html deleted file mode 100644 index bde0ff7da93..00000000000 --- a/lang/en/help/quiz/multichoiceshuffle.html +++ /dev/null @@ -1,11 +0,0 @@ - -

Shuffle answers

- -

If you set this option to "Yes", then the order of the answers - is randomly shuffled each time a student starts an attempt at a quiz - containing this question - provided that "Shuffle within questions" in - the Quiz settings is set to "Yes".

- -

The intention is simply to make it a little harder for students - to copy from each other.

\ No newline at end of file diff --git a/lang/en/help/quiz/numerical.html b/lang/en/help/quiz/numerical.html deleted file mode 100644 index ca4e54a90a4..00000000000 --- a/lang/en/help/quiz/numerical.html +++ /dev/null @@ -1,16 +0,0 @@ -

Numerical questions

- -

From the student perspective, a numerical question looks just -like a short-answer question.

- -

The difference is that numerical answers are allowed -to have an accepted error. This allows a continuous range of answers -to be set. For example, if the answer is 30 with an accepted error of 5, -then any number between 25 and 35 will be accepted as correct.

- -

Like with short answer questions, different answers, or the same -answer with different precisions can be given. In this case, the first -matching answer is used to determine the score and the feedback.

- -

To provide feedback for responses that do not match any of the answers -you entered, provide some feedback with a '*' in the answer box.

\ No newline at end of file diff --git a/lang/en/help/quiz/overallfeedback.html b/lang/en/help/quiz/overallfeedback.html deleted file mode 100644 index 05c4fa973fb..00000000000 --- a/lang/en/help/quiz/overallfeedback.html +++ /dev/null @@ -1,24 +0,0 @@ -

Overall feedback

- -

The overall feedback is some text that is shown to a student after -they have completed an attempt at the quiz. The text that is shown -can depend on the grade the student got.

- -

For example, if you enter:

- -

Grade boundary: 100%
-Feedback: Well done
-Grade boundary: 40%
-Feedback: Please study this week's work again
-...
-Grade boundary: 0%

- -

Then students who score between 100% and 40% will see the -"Well done" message, and students who score between 39.99% and 0% -will see the other message. That is, the grade boundaries define -ranges of grades, and each feedback string is displayed to -scores within the appropriate range.

- -

The grade boundaries can be specified either as a percentage, for example "31.41%", or -as a number, for example "7". If your quiz is out of 10 marks, a grade boundary of 7 means -7/10 or better.

\ No newline at end of file diff --git a/lang/en/help/quiz/overviewdownload.html b/lang/en/help/quiz/overviewdownload.html deleted file mode 100644 index 72638e8f090..00000000000 --- a/lang/en/help/quiz/overviewdownload.html +++ /dev/null @@ -1,15 +0,0 @@ -

Overview Download

- -

You may want to download the data displayed in the on-screen -table for further analysis. You can choose between two file -formats for downloaded data.
In each case data will be -presented as a table with appropriate titles, as on the screen. If -the table is paged, all data for all pages will be downloaded in a -single file.

- -

Excel Spreadsheet format:

You will get an .xls -spreadsheet document.

- -

Text format

In this case, data will be stored as a -regular text file. A line for each row in the table with data -separated by tabstops.

diff --git a/lang/en/help/quiz/popup.html b/lang/en/help/quiz/popup.html deleted file mode 100644 index 8d4ef6cab94..00000000000 --- a/lang/en/help/quiz/popup.html +++ /dev/null @@ -1,21 +0,0 @@ -

Use a 'secure' popup window for attempts

- -

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 - 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 - 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, - glossary building, wiki writing, workshops, assignments etc.

diff --git a/lang/en/help/quiz/questiondatasets.html b/lang/en/help/quiz/questiondatasets.html deleted file mode 100644 index a1a906c945e..00000000000 --- a/lang/en/help/quiz/questiondatasets.html +++ /dev/null @@ -1,21 +0,0 @@ -

Question datasets

- -

A dataset is a collection of data used to create a question - (such as a calculated question), where it is inserted in - place of a variable within the question.

- -

You can create a "private" dataset for a specific question, - or a "reusable" dataset that can be used within all - questions within a category.

- -

When creating a question that uses datasets, you'll be prompted - with two screens.

- -

The first screen allows you to assign a particular dataset to be - substituted for each variable.

- -

The second screen allows you to add and remove sets of numbers in - the dataset. The numbers used for individual questions presented - to students will be selected from this set.

- - diff --git a/lang/en/help/quiz/questiontext.html b/lang/en/help/quiz/questiontext.html deleted file mode 100644 index 36feb5f0097..00000000000 --- a/lang/en/help/quiz/questiontext.html +++ /dev/null @@ -1,7 +0,0 @@ -

Question text

- -

Different question types all display differently, -but they all start with some text which is entered here. -Depending on the question type, there may be more -settings to control the rest of the question display -lower down this form.

\ No newline at end of file diff --git a/lang/en/help/quiz/questiontypes.html b/lang/en/help/quiz/questiontypes.html deleted file mode 100644 index c74b6be4d10..00000000000 --- a/lang/en/help/quiz/questiontypes.html +++ /dev/null @@ -1,96 +0,0 @@ -

Creating a new question

- -

You can add a variety of different types of questions to a category:

- -

Multiple Choice

-
-

In response to a question (that may include a image) the respondent - chooses from multiple answers. There are two types of multiple choice - questions - single answer and multiple answer.

-

More info about Multiple Choice questions

-
- -

Short Answer

-
-

In response to a question (that may include a image), the respondent - types a word or phrase. There may several possible correct answers, - with different grades. Answers may or may not be sensitive to case. -

-

More info about Short Answer questions

-
- -

Numerical

-
-

From the student perspective, a numerical question looks just - like a short-answer question. - The difference is that numerical answers are allowed - to have an accepted error. This allows a continuous range of answers - to be set. -

-

More info about Numerical questions

-
- -

True/False

-
-

In response to a question (that may include a image), the respondent - selects from two options: True or False. -

-

More info about True/False questions

-
- -

Matching

-
-

A list of sub questions is provided, along with a list of answers. The - respondent must "match" the correct answers with each question. -

-

More info about Matching questions

-
- -

Embedded Answers (Cloze)

-
-

These very flexible questions consist of a passage of text (in Moodle format) that - has various answers embedded within it, including multiple choice, - short answers and numerical answers. -

-

More info about Embedded Answers questions

-
- -

Random Short-Answer Matching

-
-

From the student perspective, this looks just like a Matching question. - The difference is that the subquestions are drawn randomly from Short Answer questions - in the current category. -

-

More info about Matching questions

-
- -

Random

-
-

A Random question in a quiz is replaced by a randomly-chosen question - from the category that was set. -

-

More info about Random questions

-
- -

Description

-
-

This is not a real question. It simply prints some text (and possibly graphics) - without requiring an answer. This can be used to provide some information to - be used by a following group of questions, for example. -

-

More info about Description questions

-
- -

Calculated

-
-

Calculated questions offer a way to create individual numerical questions by the - use of wildcards that are substituted with individual values when the quiz is taken. -

-

More info about Calculated questions

-
- -

Essay

-
-

In response to a question (that may include an image) the respondent writes an answer in essay format.

-

More info about Essay questions

-
\ No newline at end of file diff --git a/lang/en/help/quiz/randomsamatch.html b/lang/en/help/quiz/randomsamatch.html deleted file mode 100644 index 0ea1fad84bb..00000000000 --- a/lang/en/help/quiz/randomsamatch.html +++ /dev/null @@ -1,19 +0,0 @@ -

Random Short-Answer Matching questions

- -

After an optional introduction, the respondent is presented with - several sub-questions and several jumbled answers. There is one - correct answer for each question.

- -

The respondent must select an answer to match each sub-question.

- -

Each sub-question is equally weighted to contribute towards the - grade for the total question.

- -

The questions and answers are randomly drawn from the pool of - "Short Answer" questions in the current category. Each attempt - on a quiz may therefore have different questions and answers. - You must make sure that the category contains enough unused - short-answer questions, otherwise the student will be shown - a friendly error message. The more short-answer questions you - provide the more likely it is that students will see a new - selection on each attempt.

diff --git a/lang/en/help/quiz/reorderingtool.html b/lang/en/help/quiz/reorderingtool.html deleted file mode 100644 index 4801045eeb6..00000000000 --- a/lang/en/help/quiz/reorderingtool.html +++ /dev/null @@ -1,16 +0,0 @@ -

The question reordering tool

- -

The reordering tool displays line number fields at the front of the - question list. These line numbers increase in steps of 10 to leave room for - you to insert questions in between. You can then reorder the questions by - changing the line numbers and clicking "Save changes". The questions will be - reordered according to the line numbers you specified.

- -

Line numbers do not have to be integers, you can also use numbers with - a decimal point if you find that convenient.

- -

Page breaks are given line numbers as well, to allow you to move them - around in the same manner. If you have unticked the "Show page breaks" - box then you will not see the page breaks and the corresponding line - numbers are not displayed, explaining the gaps in the line number sequence - that you may observe.

\ No newline at end of file diff --git a/lang/en/help/quiz/requiresubnet.html b/lang/en/help/quiz/requiresubnet.html deleted file mode 100644 index 24ea28f0e7a..00000000000 --- a/lang/en/help/quiz/requiresubnet.html +++ /dev/null @@ -1,30 +0,0 @@ -

Require network addresses

- -

This field is optional.

- -

You can restrict access for a quiz to particular subnets - on the LAN or Internet by specifying a comma-separated list of - partial or full IP address numbers.

- -

This is especially useful for a proctored quiz, where you want - to be sure that only people in a certain room are able to - access the quiz.

- -

For example: 192.168. , 231.54.211.0/20, 231.3.56.211, 231.3.56.10-20

- -

There are four types of numbers you can use (you can not use - text based domain names like example.com):

- -
    -
  1. Full IP addresses, such as 192.168.10.1 which will match - a single computer (or proxy).
  2. -
  3. Partial addresses, such as 192.168 which will match anything - starting with those numbers.
  4. -
  5. CIDR notation, such as 231.54.211.0/20 which allows you to specify - more detailed subnets.
  6. -
  7. A range of IP addresses 231.3.56.10-20 The range applies to the last - part of the address, so this means all the IP addresses from 231.3.56.10 - to 231.3.56.20.
  8. -
- -

Spaces are ignored.

diff --git a/lang/en/help/quiz/responsesdownload.html b/lang/en/help/quiz/responsesdownload.html deleted file mode 100644 index 1f94aeacf93..00000000000 --- a/lang/en/help/quiz/responsesdownload.html +++ /dev/null @@ -1,17 +0,0 @@ -

Responses Download

- -

You may want to download the data displayed in the on-screen -table. You can choose between two file formats for downloaded data.
-In each case data will be presented as a table with appropriate titles, -as on the screen but without the user pictures.
-If the table is paged or ordered on screen, -all data for all pages will always be downloaded in a -single file. Users with no attempt for this quiz will be included -in the file if you check the corresponding option.

- -

Excel Spreadsheet format:

You will get an .xls -spreadsheet document.

- -

Text format

In this case, data will be stored as a -regular text file. A line for each row in the table with data -separated by tabstops.

diff --git a/lang/en/help/quiz/responsesoptions.html b/lang/en/help/quiz/responsesoptions.html deleted file mode 100644 index 7607842a2dd..00000000000 --- a/lang/en/help/quiz/responsesoptions.html +++ /dev/null @@ -1,9 +0,0 @@ -

Responses Options

- -

Page size:

You choose how many attempts per page -you want to see displayed on screen.

- -

Show students with no attempts:

It may be convenient -to not only show students with attempts for this quiz but also -students that not yet attempted it.

- diff --git a/lang/en/help/quiz/review.html b/lang/en/help/quiz/review.html deleted file mode 100644 index 93f9e96bc3b..00000000000 --- a/lang/en/help/quiz/review.html +++ /dev/null @@ -1,6 +0,0 @@ -

Allow review once quiz is closed

- -

If you enable this option, then students will be able to - review their past attempts at this quiz.

- -

This is only enabled once the quiz is closed.

diff --git a/lang/en/help/quiz/review2.html b/lang/en/help/quiz/review2.html deleted file mode 100644 index 69ecf976b12..00000000000 --- a/lang/en/help/quiz/review2.html +++ /dev/null @@ -1,6 +0,0 @@ -

Allow review

- -

This option controls whether and when students will be able to - review their past attempts at this quiz.

- - \ No newline at end of file diff --git a/lang/en/help/quiz/reviewoptions.html b/lang/en/help/quiz/reviewoptions.html deleted file mode 100644 index 348613c5315..00000000000 --- a/lang/en/help/quiz/reviewoptions.html +++ /dev/null @@ -1,18 +0,0 @@ -

Allow review

- -

These options control what information users can see when they review a -quiz attempt or look at the quiz reports.

- -

Immediately after the attempt means within two minutes of the attempt being -finished by the user clicking 'Submit all and finish'.

- -

Later, while the quiz is still open means after this, and before the quiz -close date.

- -

After the quiz is closed means after the quiz close date has passed. If -the quiz does not have a close date, this state is never reached.

- -

Users with the capability 'View hidden grades' [moodle/grade:viewhidden] -(typically teachers and administrators) are not affected by these settings -and will always by able to review all information about a student's attempt -at any time.

\ No newline at end of file diff --git a/lang/en/help/quiz/rqp.html b/lang/en/help/quiz/rqp.html deleted file mode 100644 index f23026b3133..00000000000 --- a/lang/en/help/quiz/rqp.html +++ /dev/null @@ -1,5 +0,0 @@ -

Remote Questions (RQP)

- - -

The Remote Question Protocol may be used to include questions in a quiz with all processing occurring on a remote server. Questions may be included in any format for which a server is available without any change to Moodle.

- diff --git a/lang/en/help/quiz/shortanswer.html b/lang/en/help/quiz/shortanswer.html deleted file mode 100644 index 16c647914fa..00000000000 --- a/lang/en/help/quiz/shortanswer.html +++ /dev/null @@ -1,15 +0,0 @@ -

Short Answer questions

- -

In response to a question (that may include a image) the respondent - types a word or short phrase.

- -

There may be several possible correct answers, each with a different - grade. If the "Case sensitive" option is selected, then you can - have different scores for "Word" or "word".

- -

You can use the asterisk character (*) as a wildcard to match - any series of characters. For example, use ran*ing to match any word - or phrase starting with "ran" and ending with "ing". If you really - do want to match an asterisk then use a backslash like this: \*

- -

Without wildcards the answers are compared exactly, so be careful with your spelling!

diff --git a/lang/en/help/quiz/stoponerror.html b/lang/en/help/quiz/stoponerror.html deleted file mode 100644 index 4b62cd7fe4e..00000000000 --- a/lang/en/help/quiz/stoponerror.html +++ /dev/null @@ -1,11 +0,0 @@ -

Stop on error

- -

Questions are imported in two passes. First the -imput file is 'parsed' and checked for validity. Then -it is written to the database. If this option is -selected (default) and an error is detected in the -parsing pass then no attempt will be made to write -to the database.

- -

If it is not checked, an attempt will be made to -write any valid questions to the database.

diff --git a/lang/en/help/quiz/timedelay2.html b/lang/en/help/quiz/timedelay2.html deleted file mode 100644 index 7d1b946ede1..00000000000 --- a/lang/en/help/quiz/timedelay2.html +++ /dev/null @@ -1,5 +0,0 @@ -

Time Delay between additional quiz 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/help/quiz/truefalse.html b/lang/en/help/quiz/truefalse.html deleted file mode 100644 index 9749814947f..00000000000 --- a/lang/en/help/quiz/truefalse.html +++ /dev/null @@ -1,11 +0,0 @@ -

True/False questions

- - -

In response to a question (that may include a image) the respondent - chooses from True or False.

- -

If feedback is enabled, then the appropriate feedback message is - shown to the respondent after answering the quiz. For example, - if the correct answer is "False", but they answer "True" (getting - it wrong) then the "True" feedback is shown. -

diff --git a/question/category_class.php b/question/category_class.php index cadc27ece56..1fa539644b8 100644 --- a/question/category_class.php +++ b/question/category_class.php @@ -252,7 +252,7 @@ class question_category_object { public function output_edit_lists() { global $OUTPUT; - echo $OUTPUT->heading_with_help(get_string('editcategories', 'quiz'), 'categories', 'question'); + echo $OUTPUT->heading_with_help(get_string('editcategories', 'question'), 'editcategories', 'question'); foreach ($this->editlists as $context => $list){ $listhtml = $list->to_html(0, array('str'=>$this->str)); diff --git a/question/category_form.php b/question/category_form.php index 131efd9fb88..22ece91b741 100644 --- a/question/category_form.php +++ b/question/category_form.php @@ -17,13 +17,13 @@ class question_category_edit_form extends moodleform { //-------------------------------------------------------------------------------- $mform->addElement('header', 'categoryheader', get_string('addcategory', 'quiz')); - $questioncategoryel = $mform->addElement('questioncategory', 'parent', get_string('parent', 'quiz'), + $questioncategoryel = $mform->addElement('questioncategory', 'parent', get_string('parentcategory', 'question'), array('contexts'=>$contexts, 'top'=>true, 'currentcat'=>$currentcat, 'nochildrenof'=>$currentcat)); $mform->setType('parent', PARAM_SEQUENCE); if (question_is_only_toplevel_category_in_context($currentcat)) { $mform->hardFreeze('parent'); } - $mform->setHelpButton('parent', array('categoryparent', get_string('parent', 'quiz'), 'question')); + $mform->addHelpButton('parent', 'parentcategory', 'question'); $mform->addElement('text','name', get_string('name'),'maxlength="254" size="50"'); $mform->setDefault('name', ''); diff --git a/question/category_form_randomquestion.php b/question/category_form_randomquestion.php index 8e6315036dd..bdf08b6fe8f 100644 --- a/question/category_form_randomquestion.php +++ b/question/category_form_randomquestion.php @@ -13,10 +13,10 @@ class question_category_edit_form_randomquestion extends moodleform { //-------------------------------------------------------------------------------- $mform->addElement('header', 'categoryheader', get_string('createcategoryfornewrandomquestion', 'quiz')); - $questioncategoryel = $mform->addElement('questioncategory', 'parent', get_string('parentcategory', 'quiz'), + $questioncategoryel = $mform->addElement('questioncategory', 'parent', get_string('parentcategory', 'question'), array('contexts'=>$contexts, 'top'=>true, 'currentcat'=>$currentcat, 'nochildrenof'=>$currentcat)); $mform->setType('parent', PARAM_SEQUENCE); - $mform->setHelpButton('parent', array('categoryparent', get_string('parent', 'quiz'), 'question')); + $mform->addHelpButton('parent', 'parentcategory', 'question'); $mform->addElement('text','name', get_string('name'),'maxlength="254" size="50"'); $mform->setDefault('name', ''); diff --git a/question/editlib.php b/question/editlib.php index b4e0ee03293..c5d06a5a631 100644 --- a/question/editlib.php +++ b/question/editlib.php @@ -1778,7 +1778,6 @@ function create_new_question_button($categoryid, $params, $caption, $tooltip = ' $url = new moodle_url('/question/addquestion.php', $params); echo $OUTPUT->single_button($url, $caption, 'get', array('disabled'=>$disabled, 'title'=>$tooltip)); - echo $OUTPUT->old_help_icon('types', get_string('createnewquestion', 'question'), 'question'); $PAGE->requires->yui2_lib('dragdrop'); $PAGE->requires->yui2_lib('container'); if (!$choiceformprinted) { diff --git a/question/export.php b/question/export.php index fd832593d2a..294175b0af5 100644 --- a/question/export.php +++ b/question/export.php @@ -19,7 +19,7 @@ question_edit_setup('export', '/question/export.php'); // get display strings - $strexportquestions = get_string('exportquestions', 'quiz'); + $strexportquestions = get_string('exportquestions', 'question'); // make sure we are using the user's most recent category choice if (empty($categoryid)) { @@ -35,7 +35,7 @@ /// Header $PAGE->set_url($thispageurl->out()); - $PAGE->set_title($strexportquestions); + $PAGE->set_title($strexportquestions); $PAGE->set_heading($COURSE->fullname); echo $OUTPUT->header(); @@ -108,7 +108,7 @@ } /// Display export form - echo $OUTPUT->heading_with_help($strexportquestions, 'export', 'quiz'); + echo $OUTPUT->heading_with_help($strexportquestions, 'exportquestions', 'question'); $export_form->display(); diff --git a/question/export_form.php b/question/export_form.php index a3c33af2d3f..3528ed2f2a2 100644 --- a/question/export_form.php +++ b/question/export_form.php @@ -21,18 +21,18 @@ class question_export_form extends moodleform { $i = 0 ; foreach ($fileformatnames as $shortname => $fileformatname) { $currentgrp1 = array(); - $currentgrp1[] = &$mform->createElement('radio','format','',$fileformatname,$shortname); + $currentgrp1[] = &$mform->createElement('radio','format','',$fileformatname,$shortname); $mform->addGroup($currentgrp1,"formathelp[$i]",'',array('
'),false); - $mform->setHelpButton("formathelp[$i]", array("$shortname",$fileformatname,"qformat_$shortname")); + $mform->addHelpButton("formathelp[$i]", $shortname, 'qformat_'.$shortname); $i++ ; } $mform->addRule("formathelp[0]",null,'required',null,'client'); //-------------------------------------------------------------------------------- $mform->addElement('header','general', get_string('general', 'form')); - $mform->addElement('questioncategory', 'category', get_string('category','quiz'), compact('contexts')); + $mform->addElement('questioncategory', 'category', get_string('exportcategory', 'question'), compact('contexts')); $mform->setDefault('category', $defaultcategory); - $mform->setHelpButton('category', array('exportcategory', get_string('exportcategory','question'), 'quiz')); + $mform->addHelpButton('category', 'exportcategory', 'question'); $categorygroup = array(); $categorygroup[] =& $mform->createElement('checkbox', 'cattofile', '', get_string('tofilecategory', 'question')); @@ -42,11 +42,9 @@ class question_export_form extends moodleform { $mform->setDefault('cattofile', 1); $mform->setDefault('contexttofile', 1); - // $fileformatnames = get_import_export_formats('export'); // $mform->addElement('select', 'format', get_string('fileformat','quiz'), $fileformatnames); // $mform->setDefault('format', 'gift'); -// $mform->setHelpButton('format', array('export', get_string('exportquestions', 'quiz'), 'quiz')); $mform->addElement('text', 'exportfilename', get_string('exportname', 'quiz'), array('size'=>40)); $mform->setDefault('exportfilename', $defaultfilename); diff --git a/question/import.php b/question/import.php index b5c8b87020b..a068d1588d2 100644 --- a/question/import.php +++ b/question/import.php @@ -19,7 +19,7 @@ list($thispageurl, $contexts, $cmid, $cm, $module, $pagevars) = // get display strings $txt = new stdClass(); $txt->importerror = get_string('importerror','quiz'); -$txt->importquestions = get_string("importquestions", "quiz"); +$txt->importquestions = get_string('importquestions', 'question'); list($catid, $catcontext) = explode(',', $pagevars['cat']); if (!$category = $DB->get_record("question_categories", array("id" => $catid))) { @@ -136,7 +136,7 @@ if ($form = $import_form->get_data()) { } } -echo $OUTPUT->heading_with_help($txt->importquestions, 'import', 'quiz'); +echo $OUTPUT->heading_with_help($txt->importquestions, 'importquestions', 'question'); /// Print upload form $import_form->display(); diff --git a/question/import_form.php b/question/import_form.php index 98dca601d84..f585e29e51e 100644 --- a/question/import_form.php +++ b/question/import_form.php @@ -23,16 +23,16 @@ class question_import_form extends moodleform { $currentgrp1 = array(); $currentgrp1[] = &$mform->createElement('radio','format','',$fileformatname,$shortname); $mform->addGroup($currentgrp1,"formathelp[$i]",'',array('
'),false); - $mform->setHelpButton("formathelp[$i]", array("$shortname",$fileformatname,"qformat_$shortname")); + $mform->addHelpButton("formathelp[$i]", $shortname, 'qformat_'.$shortname); $i++ ; } $mform->addRule("formathelp[0]", null, 'required', null, 'client' ); //-------------------------------------------------------------------------------- $mform->addElement('header','general', get_string('general', 'form')); - $mform->addElement('questioncategory', 'category', get_string('category','quiz'), compact('contexts')); + $mform->addElement('questioncategory', 'category', get_string('importcategory', 'question'), compact('contexts')); $mform->setDefault('category', $defaultcategory); - $mform->setHelpButton('category', array('importcategory', get_string('importcategory','quiz'), 'quiz')); + $mform->addHelpButton('category', 'importcategory', 'question'); $categorygroup = array(); $categorygroup[] =& $mform->createElement('checkbox', 'catfromfile', '', get_string('getcategoryfromfile', 'question')); @@ -46,13 +46,13 @@ class question_import_form extends moodleform { $matchgrades = array(); $matchgrades['error'] = get_string('matchgradeserror','quiz'); $matchgrades['nearest'] = get_string('matchgradesnearest','quiz'); - $mform->addElement('select', 'matchgrades', get_string('matchgrades','quiz'), $matchgrades); - $mform->setHelpButton('matchgrades', array('matchgrades', get_string('matchgrades','quiz'), 'quiz')); + $mform->addElement('select', 'matchgrades', get_string('matchgrades', 'question'), $matchgrades); + $mform->addHelpButton('matchgrades', 'matchgrades', 'question'); $mform->setDefault('matchgrades', 'error'); - $mform->addElement('selectyesno', 'stoponerror', get_string('stoponerror', 'quiz')); + $mform->addElement('selectyesno', 'stoponerror', get_string('stoponerror', 'question')); $mform->setDefault('stoponerror', 1); - $mform->setHelpButton('stoponerror', array('stoponerror', get_string('stoponerror', 'quiz'), 'quiz')); + $mform->addHelpButton('stoponerror', 'stoponerror', 'question'); //-------------------------------------------------------------------------------- $mform->addElement('header', 'importfileupload', get_string('importfromthisfile','quiz')); diff --git a/question/type/calculatedmulti/edit_calculatedmulti_form.php b/question/type/calculatedmulti/edit_calculatedmulti_form.php index 497430dd000..3b81121d8cb 100644 --- a/question/type/calculatedmulti/edit_calculatedmulti_form.php +++ b/question/type/calculatedmulti/edit_calculatedmulti_form.php @@ -116,7 +116,7 @@ class question_edit_calculatedmulti_form extends question_edit_form { $mform->setDefault('single', 1); $mform->addElement('advcheckbox', 'shuffleanswers', get_string('shuffleanswers', 'qtype_multichoice'), null, null, array(0,1)); - $mform->setHelpButton('shuffleanswers', array('multichoiceshuffle', get_string('shuffleanswers','qtype_multichoice'), 'qtype_multichoice')); + $mform->addHelpButton('shuffleanswers', 'shuffleanswers', 'qtype_multichoice'); $mform->setDefault('shuffleanswers', 1); $numberingoptions = $QTYPES['multichoice']->get_numbering_styles(); diff --git a/question/type/description/lang/en/qtype_description.php b/question/type/description/lang/en/qtype_description.php index 0eeca9ba35f..c35d87107e5 100644 --- a/question/type/description/lang/en/qtype_description.php +++ b/question/type/description/lang/en/qtype_description.php @@ -23,10 +23,10 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -$string['addingdescription'] = 'Adding a Description'; -$string['addingdescription_help'] = 'A description is not really a question type. It simply enables text to be displayed without requiring any answers, similar to a label on the course page. +$string['addingdescription'] = 'Adding a description'; +$string['description'] = 'Description'; +$string['description_help'] = 'A description is not really a question type. It simply enables text to be displayed without requiring any answers, similar to a label on the course page. The question text is displayed both during the attempt and on the review page. Any general feedback is displayed on the review page only.'; -$string['description'] = 'Description'; $string['descriptionsummary'] = 'This is not actually a question. Instead it is a way to add some instructions, rubric or other content to the quiz. This is similar to the way that labels can be used to add content to the course page.'; $string['editingdescription'] = 'Editing a Description'; diff --git a/question/type/edit_question_form.php b/question/type/edit_question_form.php index 86dd5b38019..21b0ed26034 100644 --- a/question/type/edit_question_form.php +++ b/question/type/edit_question_form.php @@ -143,7 +143,7 @@ class question_edit_form extends moodleform { $mform->addElement('htmleditor', 'generalfeedback', get_string('generalfeedback', 'quiz'), array('rows' => 10, 'course' => $this->coursefilesid)); $mform->setType('generalfeedback', PARAM_RAW); - $mform->setHelpButton('generalfeedback', array('generalfeedback', get_string('generalfeedback', 'quiz'), 'quiz')); + $mform->addHelpButton('generalfeedback', 'generalfeedback', 'quiz'); // Any questiontype specific fields. $this->definition_inner($mform); diff --git a/question/type/essay/lang/en/qtype_essay.php b/question/type/essay/lang/en/qtype_essay.php index f397c536ded..bfcf00057ef 100644 --- a/question/type/essay/lang/en/qtype_essay.php +++ b/question/type/essay/lang/en/qtype_essay.php @@ -24,8 +24,8 @@ */ $string['addingessay'] = 'Adding an Essay question'; -$string['addingessay_help'] = 'In response to a question (that may include an image) the respondent writes an answer of a paragraph or two. The essay question will not be assigned a grade until it has been reviewed by a teacher and manually graded.'; $string['addingessay_link'] = 'question/type/essay'; $string['editingessay'] = 'Editing a Essay question'; $string['essay'] = 'Essay'; +$string['essay_help'] = 'In response to a question (that may include an image) the respondent writes an answer of a paragraph or two. The essay question will not be assigned a grade until it has been reviewed by a teacher and manually graded.'; $string['essaysummary'] = 'Allows a response of a few sentences or paragraphs. This must then be graded manually.'; diff --git a/question/type/match/edit_match_form.php b/question/type/match/edit_match_form.php index f9e7c9b47ad..880bc5966d6 100644 --- a/question/type/match/edit_match_form.php +++ b/question/type/match/edit_match_form.php @@ -31,8 +31,8 @@ class question_edit_match_form extends question_edit_form { * @param object $mform the form being built. */ function definition_inner(&$mform) { - $mform->addElement('advcheckbox', 'shuffleanswers', get_string('shuffle', 'quiz'), null, null, array(0,1)); - $mform->setHelpButton('shuffleanswers', array('matchshuffle', get_string('shuffle','quiz'), 'quiz')); + $mform->addElement('advcheckbox', 'shuffleanswers', get_string('shuffle', 'qtype_match'), null, null, array(0,1)); + $mform->addHelpButton('shuffleanswers', 'shuffle', 'qtype_match'); $mform->setDefault('shuffleanswers', 1); $mform->addElement('static', 'answersinstruct', get_string('choices', 'quiz'), get_string('filloutthreeqsandtwoas', 'qtype_match')); diff --git a/question/type/multichoice/edit_multichoice_form.php b/question/type/multichoice/edit_multichoice_form.php index 3e1c056af57..f25a4eeec9e 100644 --- a/question/type/multichoice/edit_multichoice_form.php +++ b/question/type/multichoice/edit_multichoice_form.php @@ -26,7 +26,7 @@ class question_edit_multichoice_form extends question_edit_form { $mform->setDefault('single', 1); $mform->addElement('advcheckbox', 'shuffleanswers', get_string('shuffleanswers', 'qtype_multichoice'), null, null, array(0,1)); - $mform->setHelpButton('shuffleanswers', array('multichoiceshuffle', get_string('shuffleanswers','qtype_multichoice'), 'qtype_multichoice')); + $mform->addHelpButton('shuffleanswers', 'shuffleanswers', 'qtype_multichoice'); $mform->setDefault('shuffleanswers', 1); $numberingoptions = $QTYPES[$this->qtype()]->get_numbering_styles(); diff --git a/question/type/multichoice/lang/en/qtype_multichoice.php b/question/type/multichoice/lang/en/qtype_multichoice.php index 34e4d680d3c..bc00a317edf 100644 --- a/question/type/multichoice/lang/en/qtype_multichoice.php +++ b/question/type/multichoice/lang/en/qtype_multichoice.php @@ -24,8 +24,6 @@ */ $string['addingmultichoice'] = 'Adding a Multiple choice question'; -$string['addingmultichoice_help'] = 'In response to a question (that may include a image) the respondent chooses from multiple answers. There are two types of multiple choice questions - one answer and multiple answer.'; -$string['addingmultichoice_link'] = 'question/type/multichoice'; $string['addmorechoiceblanks'] = 'Blanks for {no} more choices'; $string['answerhowmany'] = 'One or multiple answers?'; $string['answernumbering'] = 'Number the choices?'; @@ -48,6 +46,8 @@ $string['choiceno'] = 'Choice {$a}'; $string['choices'] = 'Available choices'; $string['incorrectfeedback'] = 'For any incorrect response'; $string['multichoice'] = 'Multiple choice'; +$string['multichoice_help'] = 'In response to a question (that may include a image) the respondent chooses from multiple answers. There are two types of multiple choice questions - one answer and multiple answer.'; +$string['multichoice_link'] = 'question/type/multichoice'; $string['multichoicesummary'] = 'Allows the selection of a single or multiple responses from a pre-defined list.'; $string['notenoughanswers'] = 'This type of question requires at least {$a} choices'; $string['overallcorrectfeedback'] = 'Feedback for any correct response'; diff --git a/question/type/numerical/lang/en/qtype_numerical.php b/question/type/numerical/lang/en/qtype_numerical.php index a457cec4053..a9e304d8aa0 100644 --- a/question/type/numerical/lang/en/qtype_numerical.php +++ b/question/type/numerical/lang/en/qtype_numerical.php @@ -28,52 +28,51 @@ $string['addmoreanswerblanks'] = 'Blanks for {no} More Answers'; $string['addmoreunitblanks'] = 'Blanks for {no} More Units'; $string['answermustbenumberorstar'] = 'The answer must be a number, or \'*\'.'; $string['answerno'] = 'Answer {$a}'; -$string['decfractionof'] = 'AS' ; -$string['decfractionofquestiongrade'] = 'as decimal fraction (0-1) of question grade' ; -$string['decfractionofresponsegrade'] = 'as decimal fraction (0-1) of response grade' ; -$string['editableunittext'] = 'Text input element' ; +$string['decfractionof'] = 'AS'; +$string['decfractionofquestiongrade'] = 'as decimal fraction (0-1) of question grade'; +$string['decfractionofresponsegrade'] = 'as decimal fraction (0-1) of response grade'; +$string['editableunittext'] = 'Text input element'; $string['editingnumerical'] = 'Editing a Numerical question'; $string['errornomultiplier'] = 'You must specify a multiplier for this unit.'; $string['errorrepeatedunit'] = 'You cannot have two units with the same name.'; -$string['instructions'] = 'Instructions ' ; -$string['leftexample'] = 'LEFT as $1.00' ; -$string['noneditableunittext'] = 'NON editable text of Unit No1' ; +$string['instructions'] = 'Instructions '; +$string['leftexample'] = 'LEFT as $1.00'; +$string['noneditableunittext'] = 'NON editable text of Unit No1'; $string['notenoughanswers'] = 'You must enter at least one answer.'; -$string['nounitdisplay'] = 'No unit grading' ; +$string['nounitdisplay'] = 'No unit grading'; $string['numerical'] = 'Numerical'; -$string['numerical_help'] = 'From the student perspective, a numerical question looks just like a short-answer question. The difference is that numerical answers are allowed to have an accepted error. This allows a fixed range of answers to be evaluated as one answer. For example, if the answer is 10 with an accepted error of 2, then any number between 8 and 12 will be accepted as correct. '; +$string['numerical_help'] = 'From the student perspective, a numerical question looks just like a short-answer question. The difference is that numerical answers are allowed to have an accepted error. This allows a fixed range of answers to be evaluated as one answer. For example, if the answer is 10 with an accepted error of 2, then any number between 8 and 12 will be accepted as correct. '; $string['numerical_link'] = 'question/type/numerical'; $string['numericalsummary'] = 'Allows a numerical response, possibly with units, that is graded by comparing against various model answers, possibly with tolerances.'; -$string['numericalinstructions'] = 'Instructions'; +$string['numericalinstructions'] = 'Instructions'; $string['numericalinstructions_help'] = 'Specific instructions related to the question as * Examples of number formats -* Complex units'; -$string['numericalmultiplier'] = 'Multiplier'; +* Complex units'; +$string['numericalmultiplier'] = 'Multiplier'; $string['numericalmultiplier_help'] = 'The multiplier is the factor by which the correct numerical response will be multiplied. The first unit (Unit 1) has a default multiplier of 1. Thus if the correct numerical response is 5500 and you set W as unit at Unit 1 which has 1 as default multiplier, the correct response is 5500 W. If you add the unit kW with a multiplier of 0.001, this will add a correct response of 5.5 kW. This means that the answers 5500W or 5.5kW would be marked correct. -Note that the accepted error is also multiplied, so an allowed error of 100W would become an error of 0.1kW.'; -$string['onlynumerical'] = 'Only NUMERICAL ANSWER will be graded' ; -$string['rightexample'] = 'RIGHT as 1.00cm' ; -$string['selectunits'] = 'Select units' ; -$string['studentunitanswer'] = 'UNIT ANSWER displayed as a ' ; -$string['unitchoice'] = 'Multichoice (radio elements)' ; -$string['unitdisplay'] = 'Display Unit1' ; -$string['unitedit'] = 'Edit unit' ; -$string['unitgraded'] = ' NUMERICAL ANSWER and UNIT ANSWER will be graded ' ; -$string['unitgraded1'] = 'UNIT GRADED' ; +Note that the accepted error is also multiplied, so an allowed error of 100W would become an error of 0.1kW.'; +$string['onlynumerical'] = 'Only NUMERICAL ANSWER will be graded'; +$string['rightexample'] = 'RIGHT as 1.00cm'; +$string['selectunits'] = 'Select units'; +$string['studentunitanswer'] = 'UNIT ANSWER displayed as a '; +$string['unitchoice'] = 'Multichoice (radio elements)'; +$string['unitdisplay'] = 'Display Unit1'; +$string['unitedit'] = 'Edit unit'; +$string['unitgraded'] = ' NUMERICAL ANSWER and UNIT ANSWER will be graded '; +$string['unitgraded1'] = 'UNIT GRADED'; $string['unithdr'] = 'Unit {$a}'; -$string['unitnotgraded'] = 'UNIT NOT GRADED' ; +$string['unitnotgraded'] = 'UNIT NOT GRADED'; $string['unitnotvalid'] = ' Unit not valid with this numerical value'; $string['unitunknown'] = ' Undefined unit '; -$string['unitpenalty'] = 'Penalty for bad unit' ; -$string['unitappliedpenalty'] = 'These marks include a penalty of {$a} for bad unit.' ; -$string['unitposition'] = 'Unit position' ; -$string['unitshandling'] = 'Units handling' ; +$string['unitpenalty'] = 'Penalty for bad unit'; +$string['unitappliedpenalty'] = 'These marks include a penalty of {$a} for bad unit.'; +$string['unitposition'] = 'Unit position'; +$string['unitshandling'] = 'Units handling'; $string['validnumberformats'] = 'Valid number formats'; $string['validnumbers'] = ' 13500.67 : 13 500.67 : 13,500.67 : 13500,67: 13 500,67 : 1.350067 E4 : 1.350067 E04 '; - diff --git a/question/type/numerical/questiontype.php b/question/type/numerical/questiontype.php index 4a490061d51..33062593a56 100644 --- a/question/type/numerical/questiontype.php +++ b/question/type/numerical/questiontype.php @@ -920,10 +920,10 @@ class question_numerical_qtype extends question_shortanswer_qtype { } /** - * function used in function definition_inner() - * of edit_..._form.php for - * numerical, calculated, calculatedsimple - */ + * function used in function definition_inner() + * of edit_..._form.php for + * numerical, calculated, calculatedsimple + */ function add_units_options(&$mform, &$that){ $mform->addElement('header', 'unithandling', get_string('unitshandling', 'qtype_numerical')); // Units are graded @@ -955,26 +955,25 @@ class question_numerical_qtype extends question_shortanswer_qtype { $mform->setType('unitpenalty', PARAM_NUMBER); $mform->setDefault('unitpenalty', 0.1); $mform->setDefault('unitgradingtype', 1); - $mform->setHelpButton('penaltygrp', array('penaltygrp', get_string('unitpenalty', 'qtype_numerical'), 'qtype_numerical')); + // $mform->addHelpButton('penaltygrp', 'unitpenalty', 'qtype_numerical'); // TODO help did not exist before MDL-21695 $mform->setDefault('showunits0', 0); $mform->setDefault('showunits1', 3); $mform->setDefault('unitsleft', 0); $mform->setType('instructions', PARAM_RAW); - $mform->setHelpButton('instructions', array('numericalinstructions', get_string('numericalinstructions', 'qtype_numerical'), 'qtype_numerical')); + $mform->addHelpButton('instructions', 'numericalinstructions', 'qtype_numerical'); $mform->disabledIf('penaltygrp', 'unitrole','eq','1'); $mform->disabledIf('unitgradingtype', 'unitrole','eq','1'); $mform->disabledIf('instructions', 'unitrole','eq','1'); $mform->disabledIf('unitsleft', 'showunits1','eq','3'); $mform->disabledIf('showunits1','unitrole','eq','0'); $mform->disabledIf('showunits0','unitrole','eq','1'); - - } -/** - * function used in in function definition_inner() - * of edit_..._form.php for - * numerical, calculated, calculatedsimple - */ + + /** + * function used in in function definition_inner() + * of edit_..._form.php for + * numerical, calculated, calculatedsimple + */ function add_units_elements(& $mform,& $that) { $repeated = array(); $repeated[] =& $mform->createElement('header', 'unithdr', get_string('unithdr', 'qtype_numerical', '{no}')); @@ -1002,16 +1001,15 @@ class question_numerical_qtype extends question_shortanswer_qtype { $firstunit->freeze(); $firstunit->setValue('1.0'); $firstunit->setPersistantFreeze(true); - $mform->setHelpButton('multiplier[0]', array('numericalmultiplier', get_string('numericalmultiplier', 'qtype_numerical'), 'qtype_numerical')); + $mform->addHelpButton('multiplier[0]', 'numericalmultiplier', 'qtype_numerical'); } } - -/** - * function used in in function setdata () - * of edit_..._form.php for - * numerical, calculated, calculatedsimple - */ - + + /** + * function used in in function setdata () + * of edit_..._form.php for + * numerical, calculated, calculatedsimple + */ function set_numerical_unit_data(&$question,&$default_values){ if (isset($question->options)){