diff --git a/question/behaviour/behaviourbase.php b/question/behaviour/behaviourbase.php index 15969f78a33..46add1df672 100644 --- a/question/behaviour/behaviourbase.php +++ b/question/behaviour/behaviourbase.php @@ -261,7 +261,7 @@ abstract class question_behaviour { * @return string|null a plain text summary of this question. */ public function get_question_summary() { - return $this->question->get_question_summary($this->qa); + return $this->question->get_question_summary(); } /** diff --git a/question/engine/bank.php b/question/engine/bank.php index d58b76f0541..42b5e937087 100644 --- a/question/engine/bank.php +++ b/question/engine/bank.php @@ -65,7 +65,6 @@ abstract class question_bank { } $file = get_plugin_directory('qtype', $qtypename) . '/questiontype.php'; if (!is_readable($file)) { - echo 'problem'; if ($mustexist || $qtypename == 'missingtype') { throw new Exception('Unknown question type ' . $qtypename); } else { diff --git a/question/engine/renderer.php b/question/engine/renderer.php index 0f54ff2ff6b..9cd8fe7e992 100644 --- a/question/engine/renderer.php +++ b/question/engine/renderer.php @@ -231,7 +231,6 @@ class core_question_renderer extends renderer_base { * @return string the img tag. */ protected function get_flag_html($flagged, $id = '') { - global $CFG; if ($id) { $id = 'id="' . $id . '" '; } @@ -240,7 +239,7 @@ class core_question_renderer extends renderer_base { } else { $img = 'unflagged.png'; } - return 'pix_url('/i/' . $img) . '" alt="' . get_string('flagthisquestion', 'question') . '" />'; } diff --git a/question/todo/diffstat.txt b/question/todo/diffstat.txt index 27c868ba047..804ebe92daa 100644 --- a/question/todo/diffstat.txt +++ b/question/todo/diffstat.txt @@ -284,9 +284,9 @@ DONE question/behaviour/opaque/lang/en_utf8/qbehaviour_opaque.php | 4 + question/type/calculated/questiontype.php | 19 +- question/type/calculated/version.php | 2 - - question/type/datasetdependent/abstractqtype.php | 4 +- - question/type/datasetdependent/datasetdefinitions_form.php | 1 - - question/type/datasetdependent/datasetitems_form.php | 1 - +DONE question/type/datasetdependent/abstractqtype.php | 4 +- +DONE question/type/datasetdependent/datasetdefinitions_form.php | 1 - +DONE question/type/datasetdependent/datasetitems_form.php | 1 - question/type/ddwtos/db/install.xml | 23 + question/type/ddwtos/db/upgrade.php | 83 + @@ -304,23 +304,23 @@ DONE question/behaviour/opaque/lang/en_utf8/qbehaviour_opaque.php | 4 + question/type/ddwtos/styles.css | 67 + question/type/ddwtos/version.php | 4 + - question/type/description/edit_description_form.php | 15 +- - question/type/description/lang/en_utf8/qtype_description.php | 5 + - question/type/description/question.html | 19 - - question/type/description/question.php | 35 + - question/type/description/questiontype.php | 90 +- - question/type/description/renderer.php | 41 + - question/type/description/simpletest/testquestiontype.php | 65 + +DONE question/type/description/edit_description_form.php | 15 +- +DONE question/type/description/lang/en_utf8/qtype_description.php | 5 + +DONE question/type/description/question.html | 19 - +DONE question/type/description/question.php | 35 + +DONE question/type/description/questiontype.php | 90 +- +DONE question/type/description/renderer.php | 41 + +DONE question/type/description/simpletest/testquestiontype.php | 65 + - question/type/essay/display.html | 22 - - question/type/essay/edit_essay_form.php | 31 +- - question/type/essay/lang/en_utf8/qtype_essay.php | 5 + - question/type/essay/question.php | 64 + - question/type/essay/questiontype.php | 164 +- - question/type/essay/renderer.php | 65 + - question/type/essay/simpletest/testquestion.php | 50 + - question/type/essay/simpletest/testquestiontype.php | 71 + - question/type/essay/version.php | 2 - +DONE question/type/essay/display.html | 22 - +DONE question/type/essay/edit_essay_form.php | 31 +- +DONE question/type/essay/lang/en_utf8/qtype_essay.php | 5 + +DONE question/type/essay/question.php | 64 + +DONE question/type/essay/questiontype.php | 164 +- +DONE question/type/essay/renderer.php | 65 + +DONE question/type/essay/simpletest/testquestion.php | 50 + +DONE question/type/essay/simpletest/testquestiontype.php | 71 + +DONE question/type/essay/version.php | 2 - question/type/match/db/install.xml | 6 +- question/type/match/db/upgrade.php | 44 + diff --git a/question/type/essay/simpletest/testquestion.php b/question/type/essay/simpletest/testquestion.php index 7c646be2f9b..2959025dc8e 100644 --- a/question/type/essay/simpletest/testquestion.php +++ b/question/type/essay/simpletest/testquestion.php @@ -37,8 +37,7 @@ class qtype_essay_question_test extends UnitTestCase { public function test_get_question_summary() { $essay = test_question_maker::make_an_essay_question(); $essay->questiontext = 'Hello world'; - $this->assertEqual('Hello [world]', $essay->get_question_summary( - test_question_maker::get_a_qa($essay))); + $this->assertEqual('Hello [world]', $essay->get_question_summary()); } public function test_summarise_response() { diff --git a/question/type/missingtype/display.html b/question/type/missingtype/display.html deleted file mode 100644 index 01d65085e2e..00000000000 --- a/question/type/missingtype/display.html +++ /dev/null @@ -1,20 +0,0 @@ -
- -
- - -
-
- -
- - - - - - -
- text; ?> -
-
- diff --git a/question/type/missingtype/old_questiontype.php b/question/type/missingtype/old_questiontype.php deleted file mode 100644 index b728f840b4b..00000000000 --- a/question/type/missingtype/old_questiontype.php +++ /dev/null @@ -1,78 +0,0 @@ -options->answers; - - $formatoptions = new stdClass; - $formatoptions->noclean = true; - $formatoptions->para = false; - - // Print formulation - $questiontext = format_text($question->questiontext, - $question->questiontextformat, - $formatoptions, $cmoptions->course); - - // Print each answer in a separate row if there are any - $anss = array(); - if ($answers) { - foreach ($answers as $answer) { - $a = new stdClass; - $a->text = format_text($answer->answer, $answer->answerformat, $formatoptions, $cmoptions->course); - - $anss[] = clone($a); - } - } - include("$CFG->dirroot/question/type/missingtype/display.html"); - } - - function grade_responses(&$question, &$state, $cmoptions) { - return true; - } - - function display_question_editing_page(&$mform, $question, $wizardnow){ - global $OUTPUT; - echo $OUTPUT->heading(get_string('warningmissingtype', 'qtype_missingtype')); - - $mform->display(); - - } -} -//// END OF CLASS //// - -////////////////////////////////////////////////////////////////////////// -//// INITIATION - Without this line the question type is not in use... /// -////////////////////////////////////////////////////////////////////////// -question_register_questiontype(new question_missingtype_qtype()); - - diff --git a/question/type/multichoice/display.html b/question/type/multichoice/display.html deleted file mode 100644 index 9acf11fd914..00000000000 --- a/question/type/multichoice/display.html +++ /dev/null @@ -1,34 +0,0 @@ -
- -
- -
-
- -
- - - - - - - - - -
- control; ?> - - -
- -
- -
- - print_question_submit_buttons($question, $state, $cmoptions, $options); ?> -
diff --git a/question/type/questionbase.php b/question/type/questionbase.php index 71513a88513..efa5bc9df4e 100644 --- a/question/type/questionbase.php +++ b/question/type/questionbase.php @@ -158,8 +158,8 @@ abstract class question_definition { * inappropriate. * @return string|null a plain text summary of this question. */ - public function get_question_summary(question_attempt $qa) { - return html_to_text($this->format_questiontext($qa), 0, false); + public function get_question_summary() { + return $this->html_to_text($this->questiontext); } /** @@ -197,7 +197,7 @@ abstract class question_definition { * @return qtype_renderer the renderer to use for outputting this question. */ public function get_renderer() { - global $PAGE; + global $PAGE; // TODO get rid of this global. return $PAGE->get_renderer('qtype_' . $this->qtype->name()); } @@ -236,6 +236,7 @@ abstract class question_definition { * @return string the text formatted for output by format_text. */ public function format_text($text, $qa, $component, $filearea, $itemid, $clean = false) { + // TODO format. $formatoptions = new stdClass; $formatoptions->noclean = !$clean; $formatoptions->para = false; @@ -243,6 +244,18 @@ abstract class question_definition { return format_text($text, $this->questiontextformat, $formatoptions); } + /** + * Convert some part of the question text to plain text. This might be used, + * for example, by get_response_summary(). + * @param string $text The HTML to reduce to plain text. + */ + public function html_to_text($text) { + $formatoptions = new stdClass; + $formatoptions->noclean = true; + return html_to_text(format_text($text, $this->questiontextformat, $formatoptions), + 0, false); + } + /** @return the result of applying {@link format_text()} to the question text. */ public function format_questiontext($qa) { return $this->format_text($this->questiontext, $qa, diff --git a/question/type/shortanswer/simpletest/testquestion.php b/question/type/shortanswer/simpletest/testquestion.php index 66aad6810d5..be906bde46d 100644 --- a/question/type/shortanswer/simpletest/testquestion.php +++ b/question/type/shortanswer/simpletest/testquestion.php @@ -116,7 +116,7 @@ class qtype_shortanswer_question_test extends UnitTestCase { public function test_get_question_summary() { $sa = test_question_maker::make_a_shortanswer_question(); - $qsummary = $sa->get_question_summary(test_question_maker::get_a_qa($sa)); + $qsummary = $sa->get_question_summary(); $this->assertEqual('Name an amphibian: __________', $qsummary); } diff --git a/question/type/truefalse/simpletest/testquestion.php b/question/type/truefalse/simpletest/testquestion.php index 0d389083509..1c4d67ed288 100644 --- a/question/type/truefalse/simpletest/testquestion.php +++ b/question/type/truefalse/simpletest/testquestion.php @@ -73,7 +73,7 @@ class qtype_truefalse_question_test extends UnitTestCase { public function test_get_question_summary() { $tf = test_question_maker::make_a_truefalse_question(); - $qsummary = $tf->get_question_summary(test_question_maker::get_a_qa($tf)); + $qsummary = $tf->get_question_summary(); $this->assertEqual('The answer is true.', $qsummary); }