Skip to content

Commit

Permalink
Merge branch 'MDL-28183' of git://github.com/jmvedrine/moodle
Browse files Browse the repository at this point in the history
  • Loading branch information
@danpoltawski
danpoltawski committed Jan 8, 2013
2 parents f858088 + e9af609 commit b5b418b
Show file tree
Hide file tree
Showing 7 changed files with 232 additions and 7 deletions.
2 changes: 1 addition & 1 deletion question/format/xml/format.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,7 @@ public function import_multianswer($question) {
$qo->penalty = 0.3333333;
}

$this->import_hints($qo, $question, false, false, $this->get_format($qo->questiontextformat));
$this->import_hints($qo, $question, true, false, $this->get_format($qo->questiontextformat));

return $qo;
}
Expand Down
4 changes: 2 additions & 2 deletions question/type/multianswer/edit_multianswer_form.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ protected function definition_inner($mform) {
$mform->addElement('hidden', 'confirm', 0);
}

$this->add_interactive_settings();
$this->add_interactive_settings(true, true);
}


Expand Down Expand Up @@ -419,7 +419,7 @@ public function set_data($question) {
if ($default_values != "") {
$question = (object)((array)$question + $default_values);
}
$question = $this->data_preprocessing_hints($question);
$question = $this->data_preprocessing_hints($question, true, true);
parent::set_data($question);
}

Expand Down
32 changes: 32 additions & 0 deletions question/type/multianswer/question.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,38 @@ public function grade_response(array $response) {
return array($fractionsum / $fractionmax, $overallstate);
}

public function clear_wrong_from_response(array $response) {
foreach ($this->subquestions as $i => $subq) {
$substep = $this->get_substep(null, $i);
$subresp = $substep->filter_array($response);
list($subfraction, $newstate) = $subq->grade_response($subresp);
if ($newstate != question_state::$gradedright) {
foreach ($subresp as $ind => $resp) {
if (($subq->layout == qtype_multichoice_base::LAYOUT_VERTICAL)
|| ($subq->layout == qtype_multichoice_base::LAYOUT_HORIZONTAL)) {
$response[$substep->add_prefix($ind)] = '-1';
} else {
$response[$substep->add_prefix($ind)] = '';
}
}
}
}
return $response;
}

public function get_num_parts_right(array $response) {
$numright = 0;
foreach ($this->subquestions as $i => $subq) {
$substep = $this->get_substep(null, $i);
$subresp = $substep->filter_array($response);
list($subfraction, $newstate) = $subq->grade_response($subresp);
if ($newstate == question_state::$gradedright) {
$numright += 1;
}
}
return array($numright, count($this->subquestions));
}

public function summarise_response(array $response) {
$summary = array();
foreach ($this->subquestions as $i => $subq) {
Expand Down
6 changes: 5 additions & 1 deletion question/type/multianswer/questiontype.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ public function save_question_options($question) {
}
}

$this->save_hints($question);
$this->save_hints($question, true);
}

public function save_question($authorizedquestion, $form) {
Expand All @@ -183,6 +183,10 @@ public function save_question($authorizedquestion, $form) {
return parent::save_question($question, $form);
}

protected function make_hint($hint) {
return question_hint_with_parts::load_from_record($hint);
}

public function delete_question($questionid, $contextid) {
global $DB;
$DB->delete_records('question_multianswer', array('question' => $questionid));
Expand Down
6 changes: 4 additions & 2 deletions question/type/multianswer/tests/helper.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -276,8 +276,10 @@ public function make_multianswer_question_fourmc() {
$mc->layout = qtype_multichoice_base::LAYOUT_DROPDOWN;

$mc->answers = array(
10 * $i => new question_answer(13, 'California', $data['California'] == 'OK', $data['California'], FORMAT_HTML),
10 * $i + 1 => new question_answer(14, 'Arizona', $data['Arizona'] == 'OK', $data['Arizona'], FORMAT_HTML),
10 * $i => new question_answer(13, 'California', (float) ($data['California'] == 'OK'),
$data['California'], FORMAT_HTML),
10 * $i + 1 => new question_answer(14, 'Arizona', (float) ($data['Arizona'] == 'OK'),
$data['Arizona'], FORMAT_HTML),
);
$mc->qtype = question_bank::get_qtype('multichoice');
$mc->maxmark = 1;
Expand Down
65 changes: 64 additions & 1 deletion question/type/multianswer/tests/question_test.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,4 +114,67 @@ public function test_summarise_response() {
array('i' => 2, 'response' => 'Pussy-cat')), $question->summarise_response(
array('sub1_answer' => 'Owl', 'sub2_answer' => reset($rightchoice))));
}
}

public function test_get_num_parts_right() {
$question = test_question_maker::make_question('multianswer');
$question->start_attempt(new question_attempt_step(), 1);

$rightchoice = $question->subquestions[2]->get_correct_response();
$right = reset($rightchoice);

$response = array('sub1_answer' => 'Frog', 'sub2_answer' => $right);
list($numpartsright, $numparts) = $question->get_num_parts_right($response);
$this->assertEquals(1, $numpartsright);
$this->assertEquals(2, $numparts);
$response = array('sub1_answer' => 'Owl', 'sub2_answer' => $right);
list($numpartsright, $numparts) = $question->get_num_parts_right($response);
$this->assertEquals(2, $numpartsright);
$response = array('sub1_answer' => 'Dog', 'sub2_answer' => 3);
list($numpartsright, $numparts) = $question->get_num_parts_right($response);
$this->assertEquals(0, $numpartsright);
$response = array('sub1_answer' => 'Owl');
list($numpartsright, $numparts) = $question->get_num_parts_right($response);
$this->assertEquals(1, $numpartsright);
$response = array('sub1_answer' => 'Dog');
list($numpartsright, $numparts) = $question->get_num_parts_right($response);
$this->assertEquals(0, $numpartsright);
$response = array('sub2_answer' => $right);
list($numpartsright, $numparts) = $question->get_num_parts_right($response);
$this->assertEquals(1, $numpartsright);
}

public function test_get_num_parts_right_fourmc() {
// Create a multianswer question with four mcq.
$question = test_question_maker::make_question('multianswer', 'fourmc');
$question->start_attempt(new question_attempt_step(), 1);

$response = array('sub1_answer' => '1', 'sub2_answer' => '1',
'sub3_answer' => '1', 'sub4_answer' => '1');
list($numpartsright, $numparts) = $question->get_num_parts_right($response);
$this->assertEquals(2, $numpartsright);
}

public function test_clear_wrong_from_response() {
$question = test_question_maker::make_question('multianswer');
$question->start_attempt(new question_attempt_step(), 1);

$rightchoice = $question->subquestions[2]->get_correct_response();
$right = reset($rightchoice);

$response = array('sub1_answer' => 'Frog', 'sub2_answer' => $right);
$this->assertEquals($question->clear_wrong_from_response($response),
array('sub1_answer' => '', 'sub2_answer' => $right));
$response = array('sub1_answer' => 'Owl', 'sub2_answer' => $right);
$this->assertEquals($question->clear_wrong_from_response($response),
array('sub1_answer' => 'Owl', 'sub2_answer' => $right));
$response = array('sub1_answer' => 'Dog', 'sub2_answer' => 3);
$this->assertEquals($question->clear_wrong_from_response($response),
array('sub1_answer' => '', 'sub2_answer' => ''));
$response = array('sub1_answer' => 'Owl');
$this->assertEquals($question->clear_wrong_from_response($response),
array('sub1_answer' => 'Owl'));
$response = array('sub2_answer' => $right);
$this->assertEquals($question->clear_wrong_from_response($response),
array('sub2_answer' => $right));
}
}
124 changes: 124 additions & 0 deletions question/type/multianswer/tests/walkthrough_test.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -198,4 +198,128 @@ public function test_deferred_feedback_numericalzero_0_wrong() {
$this->get_contains_subq_status(question_state::$gradedwrong),
$this->get_does_not_contain_validation_error_expectation());
}

public function test_interactive_feedback() {

// Create a multianswer question.
$q = test_question_maker::make_question('multianswer', 'fourmc');
$q->hints = array(
new question_hint_with_parts(11, 'This is the first hint.', FORMAT_HTML, false, true),
new question_hint_with_parts(12, 'This is the second hint.', FORMAT_HTML, true, true),
);
$choices = array('' => '', '0' => 'Califormia', '1' => 'Arizona');

$this->start_attempt_at_question($q, 'interactive', 4);

// Check the initial state.
$this->check_current_state(question_state::$todo);
$this->check_current_mark(null);
// TODO change to interactivecountback after MDL-36955 is integrated.
$this->assertEquals('interactive',
$this->quba->get_question_attempt($this->slot)->get_behaviour_name());
$this->check_current_output(
$this->get_contains_marked_out_of_summary(),
$this->get_contains_select_expectation('sub1_answer', $choices, null, true),
$this->get_contains_select_expectation('sub2_answer', $choices, null, true),
$this->get_contains_select_expectation('sub3_answer', $choices, null, true),
$this->get_contains_select_expectation('sub4_answer', $choices, null, true),
$this->get_contains_submit_button_expectation(true),
$this->get_does_not_contain_validation_error_expectation(),
$this->get_does_not_contain_feedback_expectation(),
$this->get_tries_remaining_expectation(3),
$this->get_does_not_contain_num_parts_correct(),
$this->get_no_hint_visible_expectation());

// Submit a completely wrong response.
$this->process_submission(array('sub1_answer' => '1', 'sub2_answer' => '0',
'sub3_answer' => '1', 'sub4_answer' => '0', '-submit' => 1));

// Verify.
$this->check_current_state(question_state::$todo);
$this->check_current_mark(null);
$this->check_current_output(
$this->get_contains_select_expectation('sub1_answer', $choices, 1, false),
$this->get_contains_select_expectation('sub2_answer', $choices, 0, false),
$this->get_contains_select_expectation('sub3_answer', $choices, 1, false),
$this->get_contains_select_expectation('sub4_answer', $choices, 0, false),
$this->get_does_not_contain_num_parts_correct(),
$this->get_contains_hidden_expectation(
$this->quba->get_field_prefix($this->slot) . 'sub1_answer', ''),
$this->get_contains_hidden_expectation(
$this->quba->get_field_prefix($this->slot) . 'sub2_answer', ''),
$this->get_contains_hidden_expectation(
$this->quba->get_field_prefix($this->slot) . 'sub3_answer', ''),
$this->get_contains_hidden_expectation(
$this->quba->get_field_prefix($this->slot) . 'sub4_answer', ''),
$this->get_contains_submit_button_expectation(false),
$this->get_contains_try_again_button_expectation(true),
$this->get_does_not_contain_correctness_expectation(),
$this->get_contains_hint_expectation('This is the first hint.'));

// Check that, if we review in this state, the try again button is disabled.
$displayoptions = new question_display_options();
$displayoptions->readonly = true;
$html = $this->quba->render_question($this->slot, $displayoptions);
$this->assert($this->get_contains_try_again_button_expectation(false), $html);

// Try again.
$this->process_submission(array('sub1_answer' => '',
'sub2_answer' => '', 'sub3_answer' => '',
'sub4_answer' => '', '-tryagain' => 1));

// Verify.
$this->check_current_state(question_state::$todo);
$this->check_current_mark(null);
$this->check_current_output(
$this->get_contains_select_expectation('sub1_answer', $choices, null, true),
$this->get_contains_select_expectation('sub2_answer', $choices, null, true),
$this->get_contains_select_expectation('sub3_answer', $choices, null, true),
$this->get_contains_select_expectation('sub4_answer', $choices, null, true),
$this->get_contains_submit_button_expectation(true),
$this->get_does_not_contain_feedback_expectation(),
$this->get_tries_remaining_expectation(2),
$this->get_no_hint_visible_expectation());

// Submit a partially wrong response.
$this->process_submission(array('sub1_answer' => '1', 'sub2_answer' => '1',
'sub3_answer' => '1', 'sub4_answer' => '1', '-submit' => 1));

// Verify.
$this->check_current_state(question_state::$todo);
$this->check_current_mark(null);
$this->check_current_output(
$this->get_contains_select_expectation('sub1_answer', $choices, 1, false),
$this->get_contains_select_expectation('sub2_answer', $choices, 1, false),
$this->get_contains_select_expectation('sub3_answer', $choices, 1, false),
$this->get_contains_select_expectation('sub4_answer', $choices, 1, false),
$this->get_contains_num_parts_correct(2),
$this->get_contains_hidden_expectation(
$this->quba->get_field_prefix($this->slot) . 'sub1_answer', ''),
$this->get_contains_hidden_expectation(
$this->quba->get_field_prefix($this->slot) . 'sub2_answer', '1'),
$this->get_contains_hidden_expectation(
$this->quba->get_field_prefix($this->slot) . 'sub3_answer', ''),
$this->get_contains_hidden_expectation(
$this->quba->get_field_prefix($this->slot) . 'sub4_answer', '1'),
$this->get_contains_submit_button_expectation(false),
$this->get_contains_hint_expectation('This is the second hint.'));

// Try again.
$this->process_submission(array('sub1_answer' => '',
'sub2_answer' => '1', 'sub3_answer' => '',
'sub4_answer' => '1', '-tryagain' => 1));

// Verify.
$this->check_current_state(question_state::$todo);
$this->check_current_mark(null);
$this->check_current_output(
$this->get_contains_select_expectation('sub1_answer', $choices, '', true),
$this->get_contains_select_expectation('sub2_answer', $choices, '1', true),
$this->get_contains_select_expectation('sub3_answer', $choices, '', true),
$this->get_contains_select_expectation('sub4_answer', $choices, '1', true),
$this->get_contains_submit_button_expectation(true),
$this->get_does_not_contain_feedback_expectation(),
$this->get_tries_remaining_expectation(1),
$this->get_no_hint_visible_expectation());
}
}

0 comments on commit b5b418b

Please sign in to comment.