mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-20 15:40:17 +01:00
Code Issues Projects Releases Wiki Activity

MDL-79863 qtype_ordering: qtype_ordering imrpove code readability when setting flags to pass to methods to retrieve/check answers

Browse Source
This commit is contained in:
Gordon Bateson 2016-10-26 13:41:04 +09:00 committed by Mathew May
parent 89692628f0
commit 9d114318ec
3 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
question/type/ordering/question.php
View File

@ -322,10 +322,9 @@ class qtype_ordering_question extends question_graded_automatically {
case self::GRADING_RELATIVE_NEXT_EXCLUDE_LAST:
case self::GRADING_RELATIVE_NEXT_INCLUDE_LAST:
$currentresponse = $this->get_next_answerids($this->currentresponse,
($gradingtype == self::GRADING_RELATIVE_NEXT_INCLUDE_LAST));
$correctresponse = $this->get_next_answerids($this->correctresponse,
($gradingtype == self::GRADING_RELATIVE_NEXT_INCLUDE_LAST));
$lastitem = ($gradingtype == self::GRADING_RELATIVE_NEXT_INCLUDE_LAST);
$currentresponse = $this->get_next_answerids($this->currentresponse, $lastitem);
$correctresponse = $this->get_next_answerids($this->correctresponse, $lastitem);
foreach ($correctresponse as $thisanswerid => $nextanswerid) {
if (isset($currentresponse[$thisanswerid])) {
if ($currentresponse[$thisanswerid] == $nextanswerid) {
@ -338,10 +337,9 @@ class qtype_ordering_question extends question_graded_automatically {
case self::GRADING_RELATIVE_ONE_PREVIOUS_AND_NEXT:
case self::GRADING_RELATIVE_ALL_PREVIOUS_AND_NEXT:
$currentresponse = $this->get_previous_and_next_answerids($this->currentresponse,
($gradingtype == self::GRADING_RELATIVE_ALL_PREVIOUS_AND_NEXT));
$correctresponse = $this->get_previous_and_next_answerids($this->correctresponse,
($gradingtype == self::GRADING_RELATIVE_ALL_PREVIOUS_AND_NEXT));
$all = ($gradingtype == self::GRADING_RELATIVE_ALL_PREVIOUS_AND_NEXT);
$currentresponse = $this->get_previous_and_next_answerids($this->currentresponse, $all);
$correctresponse = $this->get_previous_and_next_answerids($this->correctresponse, $all);
foreach ($correctresponse as $thisanswerid => $answerids) {
if (isset($currentresponse[$thisanswerid])) {
$prev = $currentresponse[$thisanswerid]->prev;
@ -358,7 +356,8 @@ class qtype_ordering_question extends question_graded_automatically {
case self::GRADING_LONGEST_ORDERED_SUBSET:
case self::GRADING_LONGEST_CONTIGUOUS_SUBSET:
$subset = $this->get_ordered_subset($gradingtype == self::GRADING_LONGEST_CONTIGUOUS_SUBSET);
$contiguous = ($gradingtype == self::GRADING_LONGEST_CONTIGUOUS_SUBSET);
$subset = $this->get_ordered_subset($contiguous);
$countcorrect = count($subset);
$countanswers = count($this->currentresponse);
break;

26
question/type/ordering/renderer.php
View File

@ -89,7 +89,7 @@ class qtype_ordering_renderer extends qtype_with_combined_feedback_renderer {
$result = '';
if ($options->readonly) {
// items cannot be dragged in readonly mode.
// Items cannot be dragged in readonly mode.
} else {
$script = "\n";
$script .= "//<![CDATA[\n";
@ -161,12 +161,13 @@ class qtype_ordering_renderer extends qtype_with_combined_feedback_renderer {
}
$class = trim("$class $layoutclass");
// The original "id" revealed the correct order of the answers
// because $answer->fraction holds the correct order number.
// Therefore we use the $answer's md5key as the "id" for the LI.
// Format the answer text.
$answer = $question->answers[$answerid];
$answer->answer = $question->format_text($answer->answer, $answer->answerformat,
$qa, 'question', 'answer', $answerid);
// The original "id" revealed the correct order of the answers
// because $answer->fraction holds the correct order number.
// Therefore we use the $answer's md5key for the "id".
$params = array('class' => $class, 'id' => $answer->md5key);
$result .= html_writer::tag('li', $img.$answer->answer, $params);
}
@ -343,25 +344,24 @@ class qtype_ordering_renderer extends qtype_with_combined_feedback_renderer {
case qtype_ordering_question::GRADING_RELATIVE_NEXT_EXCLUDE_LAST:
case qtype_ordering_question::GRADING_RELATIVE_NEXT_INCLUDE_LAST:
$this->correctinfo = $question->get_next_answerids($question->correctresponse,
$gradingtype == qtype_ordering_question::GRADING_RELATIVE_NEXT_INCLUDE_LAST);
$this->currentinfo = $question->get_next_answerids($question->currentresponse,
$gradingtype == qtype_ordering_question::GRADING_RELATIVE_NEXT_INCLUDE_LAST);
$lastitem = ($gradingtype == qtype_ordering_question::GRADING_RELATIVE_NEXT_INCLUDE_LAST);
$this->correctinfo = $question->get_next_answerids($question->correctresponse, $lastitem);
$this->currentinfo = $question->get_next_answerids($question->currentresponse, $lastitem);
break;
case qtype_ordering_question::GRADING_RELATIVE_ONE_PREVIOUS_AND_NEXT:
case qtype_ordering_question::GRADING_RELATIVE_ALL_PREVIOUS_AND_NEXT:
$this->correctinfo = $question->get_previous_and_next_answerids($question->correctresponse,
$gradingtype == qtype_ordering_question::GRADING_RELATIVE_ALL_PREVIOUS_AND_NEXT);
$this->currentinfo = $question->get_previous_and_next_answerids($question->currentresponse,
$gradingtype == qtype_ordering_question::GRADING_RELATIVE_ALL_PREVIOUS_AND_NEXT);
$all = ($gradingtype == qtype_ordering_question::GRADING_RELATIVE_ALL_PREVIOUS_AND_NEXT);
$this->correctinfo = $question->get_previous_and_next_answerids($question->correctresponse, $all);
$this->currentinfo = $question->get_previous_and_next_answerids($question->currentresponse, $all);
break;
case qtype_ordering_question::GRADING_LONGEST_ORDERED_SUBSET:
case qtype_ordering_question::GRADING_LONGEST_CONTIGUOUS_SUBSET:
$this->correctinfo = $question->correctresponse;
$this->currentinfo = $question->currentresponse;
$subset = $question->get_ordered_subset($gradingtype == qtype_ordering_question::GRADING_LONGEST_CONTIGUOUS_SUBSET);
$contiguous = ($gradingtype == qtype_ordering_question::GRADING_LONGEST_CONTIGUOUS_SUBSET);
$subset = $question->get_ordered_subset($contiguous);
foreach ($this->currentinfo as $position => $answerid) {
if (array_search($position, $subset) === false) {
$this->currentinfo[$position] = 0;

4
question/type/ordering/version.php
View File

@ -29,5 +29,5 @@ $plugin->cron = 0;
$plugin->component = 'qtype_ordering';
$plugin->maturity = MATURITY_STABLE;
$plugin->requires = 2011070100; // Moodle 2.1.
$plugin->version = 2016102656;
$plugin->release = '2016-10-26 (56)';
$plugin->version = 2016102657;
$plugin->release = '2016-10-26 (57)';