MDL-51745 mod_lesson: Use format_text in response feedback

This commit is contained in:
Josh Ebarvia 2017-06-21 11:44:41 +09:30
parent 8146b1f06d
commit 79189e975c
2 changed files with 4 additions and 8 deletions

View file

@ -92,7 +92,7 @@ if ($lesson->ongoing && !$reviewmode) {
echo $lessonoutput->ongoing_score($lesson); echo $lessonoutput->ongoing_score($lesson);
} }
if (!$reviewmode) { if (!$reviewmode) {
echo $result->feedback; echo format_text($result->feedback, FORMAT_MOODLE, array('context' => $context));
} }
// User is modifying attempts - save button and some instructions // User is modifying attempts - save button and some instructions

View file

@ -4091,13 +4091,8 @@ abstract class lesson_page extends lesson_base {
$result->feedback .= $OUTPUT->box(format_text($this->get_contents(), $this->properties->contentsformat, $options), $result->feedback .= $OUTPUT->box(format_text($this->get_contents(), $this->properties->contentsformat, $options),
'generalbox boxaligncenter'); 'generalbox boxaligncenter');
if (isset($result->studentanswerformat)) {
// This is the student's answer so it should be cleaned.
$studentanswer = format_text($result->studentanswer, $result->studentanswerformat, $studentanswer = format_text($result->studentanswer, $result->studentanswerformat,
array('context' => $context, 'para' => true)); array('context' => $context, 'para' => true));
} else {
$studentanswer = format_string($result->studentanswer);
}
$result->feedback .= '<div class="correctanswer generalbox"><em>' $result->feedback .= '<div class="correctanswer generalbox"><em>'
. get_string("youranswer", "lesson").'</em> : ' . $studentanswer; . get_string("youranswer", "lesson").'</em> : ' . $studentanswer;
if (isset($result->responseformat)) { if (isset($result->responseformat)) {
@ -4476,6 +4471,7 @@ abstract class lesson_page extends lesson_base {
$result->response = ''; $result->response = '';
$result->newpageid = 0; // stay on the page $result->newpageid = 0; // stay on the page
$result->studentanswer = ''; // use this to store student's answer(s) in order to display it on feedback page $result->studentanswer = ''; // use this to store student's answer(s) in order to display it on feedback page
$result->studentanswerformat = FORMAT_MOODLE;
$result->userresponse = null; $result->userresponse = null;
$result->feedback = ''; $result->feedback = '';
$result->nodefaultresponse = false; // Flag for redirecting when default feedback is turned off $result->nodefaultresponse = false; // Flag for redirecting when default feedback is turned off