Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'MDL-35794_23' of git://github.com/timhunt/moodle into M…

…OODLE_23_STABLE
  • Loading branch information...
commit 5050a19ff7c36b1fc79b06a315b6f82a830e451e 2 parents 0858993 + e349d18
@stronk7 stronk7 authored
View
2  mod/quiz/lang/en/quiz.php
@@ -165,6 +165,7 @@
$string['configmaximumgrade'] = 'The default grade that the quiz grade is scaled to be out of.';
$string['confignewpageevery'] = 'When adding questions to the quiz page breaks will automatically be inserted according to the setting you choose here.';
$string['confignavmethod'] = 'In Free navigation, questions may be answered in any order using navigation. In Sequential, questions must be answered in strict sequence.';
+$string['configoutcomesadvanced'] = 'If this option is turned on, then the Outcomes on the quiz editing form are advanced settings.';
$string['configpenaltyscheme'] = 'Penalty subtracted for each wrong response in adaptive mode.';
$string['configpopup'] = 'Force the attempt to open in a popup window, and use JavaScript tricks to try to restrict copy and paste, etc. during quiz attempts.';
$string['configrequirepassword'] = 'Students must enter this password before they can attempt the quiz.';
@@ -517,6 +518,7 @@
To arrange the questions over a number of pages, click the Repaginate button and select the desired number of questions per page.';
$string['orderingquiz'] = 'Order and paging';
$string['orderingquizx'] = 'Order and paging: {$a}';
+$string['outcomesadvanced'] = 'Outcomes are advanced settings';
$string['outof'] = '{$a->grade} out of a maximum of {$a->maxgrade}';
$string['outofpercent'] = '{$a->grade} out of a maximum of {$a->maxgrade} ({$a->percent}%)';
$string['outofshort'] = '{$a->grade}/{$a->maxgrade}';
View
3  mod/quiz/mod_form.php
@@ -378,6 +378,9 @@ protected function definition() {
// -------------------------------------------------------------------------------
$this->standard_coursemodule_elements();
+ // Check and act on whether setting outcomes is considered an advanced setting.
+ $mform->setAdvanced('modoutcomes', !empty($quizconfig->outcomes_adv));
+
// -------------------------------------------------------------------------------
$this->add_action_buttons();
}
View
7 mod/quiz/settings.php
@@ -193,6 +193,13 @@
get_string('showinsecurepopup', 'quiz'), get_string('configpopup', 'quiz'),
array('value' => '-', 'adv' => true), null));
+// Allow user to specify if setting outcomes is an advanced setting
+if (!empty($CFG->enableoutcomes)) {
+ $quizsettings->add(new admin_setting_configcheckbox('quiz/outcomes_adv',
+ get_string('outcomesadvanced', 'quiz'), get_string('configoutcomesadvanced', 'quiz'),
+ '0'));
+}
+
// Now, depending on whether any reports have their own settings page, add
// the quiz setting page to the appropriate place in the tree.
if (empty($reportsbyname)) {
Please sign in to comment.
Something went wrong with that request. Please try again.