Skip to content

Commit

Permalink
quiz settings: MDL-18583 When a quiz has no grade, make it clear that…
Browse files Browse the repository at this point in the history 
… you can only enter one lot of overall feedback.

When the maximum grade for the quiz is 0, we disable all the overall feedback form controls except for the first, and display an explanitory message.
  • Loading branch information
tjhunt committed Mar 18, 2009
1 parent 414f7be commit e0b7cfc
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 14 deletions.
1 change: 1 addition & 0 deletions lang/en_utf8/quiz.php
View file
Expand Up @@ -446,6 +446,7 @@
$string['nodataset'] = 'nothing - it is not a wild card';
$string['nodatasubmitted'] = 'No data was submitted.';
$string['noessayquestionsfound'] = 'No manually graded questions found';
$string['nogradewarning'] = 'This quiz is not graded, so you cannot set overall feedback that differs by grade.';
$string['nomatchinganswer'] = 'You must specify an answer matching the question \'$a\'.';
$string['nominal'] = 'Nominal';
$string['nomoreattempts'] = 'No more attempts are allowed';
Expand Down
8 changes: 5 additions & 3 deletions mod/quiz/lib.php
View file
Expand Up @@ -827,9 +827,11 @@ function quiz_process_options(&$quiz) {
$numboundaries = $i;

// Check there is nothing in the remaining unused fields.
for ($i = $numboundaries; $i < count($quiz->feedbackboundaries); $i += 1) {
if (!empty($quiz->feedbackboundaries[$i]) && trim($quiz->feedbackboundaries[$i]) != '') {
return get_string('feedbackerrorjunkinboundary', 'quiz', $i + 1);
if (!empty($quiz->feedbackboundaries)) {
for ($i = $numboundaries; $i < count($quiz->feedbackboundaries); $i += 1) {
if (!empty($quiz->feedbackboundaries[$i]) && trim($quiz->feedbackboundaries[$i]) != '') {
return get_string('feedbackerrorjunkinboundary', 'quiz', $i + 1);
}
}
}
for ($i = $numboundaries + 1; $i < count($quiz->feedbacktext); $i += 1) {
Expand Down
42 changes: 31 additions & 11 deletions mod/quiz/mod_form.php
View file
Expand Up @@ -88,8 +88,6 @@ function definition() {
$mform->setDefault('grademethod', $quizconfig->grademethod);
$mform->disabledIf('grademethod', 'attempts', 'eq', 1);

$mform->addElement('hidden', 'grade', $quizconfig->maximumgrade);

//-------------------------------------------------------------------------------
$mform->addElement('header', 'layouthdr', get_string('layout', 'quiz'));

Expand Down Expand Up @@ -274,11 +272,23 @@ function definition() {
$mform->addElement('header', 'overallfeedbackhdr', get_string('overallfeedback', 'quiz'));
$mform->setHelpButton('overallfeedbackhdr', array('overallfeedback', get_string('overallfeedback', 'quiz'), 'quiz'));

$mform->addElement('hidden', 'grade', $quizconfig->maximumgrade);
if (empty($this->_cm)) {
$needwarning = $quizconfig->maximumgrade == 0;
} else {
$needwarning = $DB->get_field('quiz', 'grade', array('id' => $this->_instance));
}
if ($needwarning) {
$mform->addElement('static', 'nogradewarning', '', get_string('nogradewarning', 'quiz'));
}

$mform->addElement('static', 'gradeboundarystatic1', get_string('gradeboundary', 'quiz'), '100%');

$repeatarray=array();
$repeatarray = array();
$repeatarray[] = &MoodleQuickForm::createElement('text', 'feedbacktext', get_string('feedback', 'quiz'), array('size' => 50));
$mform->setType('feedbacktext', PARAM_RAW);
$repeatarray[] = &MoodleQuickForm::createElement('text', 'feedbackboundaries', get_string('gradeboundary', 'quiz'), array('size' => 10));
$mform->setType('feedbackboundaries', PARAM_NOTAGS);

if (!empty($this->_instance)) {
$this->_feedbacks = $DB->get_records('quiz_feedback', array('quizid'=>$this->_instance), 'mingrade DESC');
Expand All @@ -287,20 +297,24 @@ function definition() {
}
$numfeedbacks = max(count($this->_feedbacks) * 1.5, 5);

$mform->setType('feedbacktext', PARAM_RAW);
$mform->setType('feedbackboundaries', PARAM_NOTAGS);

$nextel=$this->repeat_elements($repeatarray, $numfeedbacks - 1,
array(), 'boundary_repeats', 'boundary_add_fields', 3,
get_string('addmoreoverallfeedbacks', 'quiz'), true);

//put some extra elements in before the button
// Put some extra elements in before the button
$insertEl = &MoodleQuickForm::createElement('text', "feedbacktext[$nextel]", get_string('feedback', 'quiz'), array('size' => 50));
$mform->insertElementBefore($insertEl, 'boundary_add_fields');

$insertEl = &MoodleQuickForm::createElement('static', 'gradeboundarystatic2', get_string('gradeboundary', 'quiz'), '0%');
$mform->insertElementBefore($insertEl, 'boundary_add_fields');

// Add the disabledif rules. We cannot do this using the $repeatoptions parameter to
// repeat_elements becuase we don't want to dissable the first feedbacktext.
for ($i = 0; $i < $nextel; $i++) {
$mform->disabledIf('feedbackboundaries[' . $i . ']', 'grade', 'eq', 0);
$mform->disabledIf('feedbacktext[' . ($i + 1) . ']', 'grade', 'eq', 0);
}

//-------------------------------------------------------------------------------
$features = new stdClass;
$features->groups = true;
Expand All @@ -314,6 +328,10 @@ function definition() {
}

function data_preprocessing(&$default_values){
if (isset($default_values['grade'])) {
$default_values['grade'] = $default_values['grade'] + 0; // Convert to a real number, so we don't get 0.0000.
}

if (count($this->_feedbacks)) {
$key = 0;
foreach ($this->_feedbacks as $feedback){
Expand Down Expand Up @@ -400,12 +418,14 @@ function validation($data, $files) {
$numboundaries = $i;

// Check there is nothing in the remaining unused fields.
for ($i = $numboundaries; $i < count($data['feedbackboundaries'] ); $i += 1) {
if (!empty($data['feedbackboundaries'][$i] ) && trim($data['feedbackboundaries'][$i] ) != '') {
$errors["feedbackboundaries[$i]"] = get_string('feedbackerrorjunkinboundary', 'quiz', $i + 1);
if (!empty($data['feedbackboundaries'])) {
for ($i = $numboundaries; $i < count($data['feedbackboundaries']); $i += 1) {
if (!empty($data['feedbackboundaries'][$i] ) && trim($data['feedbackboundaries'][$i] ) != '') {
$errors["feedbackboundaries[$i]"] = get_string('feedbackerrorjunkinboundary', 'quiz', $i + 1);
}
}
}
for ($i = $numboundaries + 1; $i < count($data['feedbacktext'] ); $i += 1) {
for ($i = $numboundaries + 1; $i < count($data['feedbacktext']); $i += 1) {
if (!empty($data['feedbacktext'][$i] ) && trim($data['feedbacktext'][$i] ) != '') {
$errors["feedbacktext[$i]"] = get_string('feedbackerrorjunkinfeedback', 'quiz', $i + 1);
}
Expand Down

0 comments on commit e0b7cfc

Please sign in to comment.