From 49898ef3b4ab0c722ed15329818c83cdd3de51a6 Mon Sep 17 00:00:00 2001 From: Adrian Greeve Date: Mon, 3 Dec 2018 15:51:05 +0100 Subject: [PATCH] MDL-59081 mod_lesson: Shortanswer form update. Catch all. The short answer question type now has a form element that will catch all other responses. --- mod/lesson/pagetypes/shortanswer.php | 96 +++++++++++++++++++++++++++- 1 file changed, 95 insertions(+), 1 deletion(-) diff --git a/mod/lesson/pagetypes/shortanswer.php b/mod/lesson/pagetypes/shortanswer.php index 9b5c9301c90..e59cce84234 100644 --- a/mod/lesson/pagetypes/shortanswer.php +++ b/mod/lesson/pagetypes/shortanswer.php @@ -71,6 +71,44 @@ class lesson_page_type_shortanswer extends lesson_page { $event->trigger(); return $mform->display(); } + + /** + * Creates answers for this page type. + * + * @param object $properties The answer properties. + */ + public function create_answers($properties) { + if (isset($properties->enableotheranswers) && $properties->enableotheranswers) { + $properties->response_editor = array_values($properties->response_editor); + $properties->jumpto = array_values($properties->jumpto); + $properties->score = array_values($properties->score); + $wrongresponse = end($properties->response_editor); + $wrongkey = key($properties->response_editor); + $properties->answer_editor[$wrongkey] = LESSON_OTHER_ANSWERS; + } + parent::create_answers($properties); + } + + /** + * Update the answers for this page type. + * + * @param object $properties The answer properties. + * @param context $context The context for this module. + * @param int $maxbytes The maximum bytes for any uploades. + */ + public function update($properties, $context = null, $maxbytes = null) { + if ($properties->enableotheranswers) { + $properties->response_editor = array_values($properties->response_editor); + $properties->jumpto = array_values($properties->jumpto); + $properties->score = array_values($properties->score); + $wrongresponse = end($properties->response_editor); + $wrongkey = key($properties->response_editor); + $properties->answer_editor[$wrongkey] = LESSON_OTHER_ANSWERS; + } + parent::update($properties, $context, $maxbytes); + } + + public function check_answer() { global $CFG; $result = parent::check_answer(); @@ -175,6 +213,26 @@ class lesson_page_type_shortanswer extends lesson_page { break; // quit answer analysis immediately after a match has been found } } + + // We could check here to see if we have a wrong answer jump to use. + if ($result->answerid == 0) { + // Use the all other answers jump details if it is set up. + $lastanswer = end($answers); + // Double check that this is the @#wronganswer#@ answer. + if (strpos($lastanswer->answer, LESSON_OTHER_ANSWERS) !== false) { + $otheranswers = end($answers); + $result->newpageid = $otheranswers->jumpto; + $options = new stdClass(); + $options->para = false; + $result->response = format_text($otheranswers->response, $otheranswers->responseformat, $options); + // Does this also need to do the jumpto_is_correct? + if ($this->lesson->custom) { + $result->correctanswer = ($otheranswers->score > 0); + } + $result->answerid = $otheranswers->id; + } + } + $result->userresponse = $studentanswer; //clean student answer as it goes to output. $result->studentanswer = s($studentanswer); @@ -324,6 +382,33 @@ class lesson_page_type_shortanswer extends lesson_page { } return $answerpage; } + + /** + * Make updates to the form data if required. In this case to put the all other answer data into the write section of the form. + * + * @param stdClass $data The form data to update. + * @return stdClass The updated fom data. + */ + public function update_form_data(stdClass $data) : stdClass { + $answercount = count($this->get_answers()); + // Check for other answer entry. + $lastanswer = $data->{'answer_editor[' . ($answercount - 1) . ']'}; + if (strpos($lastanswer, LESSON_OTHER_ANSWERS) !== false) { + $data->{'answer_editor[' . ($this->lesson->maxanswers + 1) . ']'} = + $data->{'answer_editor[' . ($answercount - 1) . ']'}; + $data->{'response_editor[' . ($this->lesson->maxanswers + 1) . ']'} = + $data->{'response_editor[' . ($answercount - 1) . ']'}; + $data->{'jumpto[' . ($this->lesson->maxanswers + 1) . ']'} = $data->{'jumpto[' . ($answercount - 1) . ']'}; + $data->{'score[' . ($this->lesson->maxanswers + 1) . ']'} = $data->{'score[' . ($answercount - 1) . ']'}; + $data->enableotheranswers = true; + // Unset the old values. + unset($data->{'answer_editor[' . ($answercount - 1) . ']'}); + unset($data->{'response_editor[' . ($answercount - 1) . ']'}); + unset($data->{'jumpto[' . ($answercount - 1) . ']'}); + unset($data->{'score[' . ($answercount - 1) . ']'}); + } + return $data; + } } @@ -339,7 +424,8 @@ class lesson_add_page_form_shortanswer extends lesson_add_page_form_base { $this->_form->setDefault('qoption', 0); $this->_form->addHelpButton('qoption', 'casesensitive', 'lesson'); - for ($i = 0; $i < $this->_customdata['lesson']->maxanswers; $i++) { + $answercount = $this->_customdata['lesson']->maxanswers; + for ($i = 0; $i < $answercount; $i++) { $this->_form->addElement('header', 'answertitle'.$i, get_string('answer').' '.($i+1)); // Only first answer is required. $this->add_answer($i, null, ($i < 1)); @@ -347,6 +433,14 @@ class lesson_add_page_form_shortanswer extends lesson_add_page_form_base { $this->add_jumpto($i, null, ($i == 0 ? LESSON_NEXTPAGE : LESSON_THISPAGE)); $this->add_score($i, null, ($i===0)?1:0); } + + // Other answer jump. + $this->_form->addElement('header', 'wronganswer', get_string('allotheranswers', 'lesson')); + $newcount = $answercount + 1; + $this->_form->addElement('advcheckbox', 'enableotheranswers', get_string('enabled', 'lesson')); + $this->add_response($newcount); + $this->add_jumpto($newcount, get_string('allotheranswersjump', 'lesson'), LESSON_NEXTPAGE); + $this->add_score($newcount, get_string('allotheranswersscore', 'lesson'), 0); } } -- 2.17.1