L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-58179-34-fix' of https://github.com/andrewnicols/moodle into MOODLE_34_STABLE

Browse Source
This commit is contained in:
Jake Dallimore
2018-03-22 12:06:26 +08:00
parent d16e97fdcc bfff12f527
commit 6894a65f72
7 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/lesson/locallib.php
+1 -1
View File
@@ -4720,7 +4720,7 @@ abstract class lesson_page extends lesson_base {
$i = 1;
foreach ($answers as $answer) {
$cells = array();
$cells[] = '<label>' . get_string('jump', 'lesson') . ' ' . $i . '</label>';
$cells[] = '<label>' . get_string('jump', 'lesson') . ' ' . $i . '</label>:';
$cells[] = $this->get_jump_name($answer->jumpto);
$table->data[] = new html_table_row($cells);
if ($i === 1){
mod/lesson/pagetypes/branchtable.php
+2 -2
View File
@@ -234,12 +234,12 @@ class lesson_page_type_branchtable extends lesson_page {
continue;
}
$cells = array();
$cells[] = '<label>' . get_string('branch', 'lesson') . ' ' . $i . '</label>';
$cells[] = '<label>' . get_string('branch', 'lesson') . ' ' . $i . '</label>: ';
$cells[] = format_text($answer->answer, $answer->answerformat, $options);
$table->data[] = new html_table_row($cells);
$cells = array();
$cells[] = '<label>' . get_string('jump', 'lesson') . ' ' . $i . '</label>';
$cells[] = '<label>' . get_string('jump', 'lesson') . ' ' . $i . '</label>: ';
$cells[] = $this->get_jump_name($answer->jumpto);
$table->data[] = new html_table_row($cells);
mod/lesson/pagetypes/matching.php
+9 -9
View File
@@ -268,22 +268,22 @@ class lesson_page_type_matching extends lesson_page {
if ($n == 0) {
$cells = array();
$cells[] = '<label>' . get_string('correctanswerscore', 'lesson') . '</label>';
$cells[] = '<label>' . get_string('correctanswerscore', 'lesson') . '</label>: ';
$cells[] = $answer->score;
$table->data[] = new html_table_row($cells);
$cells = array();
$cells[] = '<label>' . get_string('correctanswerjump', 'lesson') . '</label>';
$cells[] = '<label>' . get_string('correctanswerjump', 'lesson') . '</label>: ';
$cells[] = $this->get_jump_name($answer->jumpto);
$table->data[] = new html_table_row($cells);
} elseif ($n == 1) {
$cells = array();
$cells[] = '<label>' . get_string('wronganswerscore', 'lesson') . '</label>';
$cells[] = '<label>' . get_string('wronganswerscore', 'lesson') . '</label>: ';
$cells[] = $answer->score;
$table->data[] = new html_table_row($cells);
$cells = array();
$cells[] = '<label>' . get_string('wronganswerjump', 'lesson') . '</label>';
$cells[] = '<label>' . get_string('wronganswerjump', 'lesson') . '</label>: ';
$cells[] = $this->get_jump_name($answer->jumpto);
$table->data[] = new html_table_row($cells);
}
@@ -297,19 +297,19 @@ class lesson_page_type_matching extends lesson_page {
$cells = array();
if ($this->lesson->custom && $answer->score > 0) {
// if the score is > 0, then it is correct
$cells[] = '<label class="correct">' . get_string('answer', 'lesson') . ' ' . $i . '</label>';
$cells[] = '<label class="correct">' . get_string('answer', 'lesson') . " {$i}</label>: \n";
} else if ($this->lesson->custom) {
$cells[] = '<label>' . get_string('answer', 'lesson') . ' ' . $i . '</label>';
$cells[] = '<label>' . get_string('answer', 'lesson') . " {$i}</label>: \n";
} else if ($this->lesson->jumpto_is_correct($this->properties->id, $answer->jumpto)) {
$cells[] = '<label class="correct">' . get_string('answer', 'lesson') . ' ' . $i . '</label>';
$cells[] = '<label class="correct">' . get_string('answer', 'lesson') . " {$i}</label>: \n";
} else {
$cells[] = '<label>' . get_string('answer', 'lesson') . ' ' . $i . '</label>';
$cells[] = '<label>' . get_string('answer', 'lesson') . " {$i}</label>: \n";
}
$cells[] = format_text($answer->answer, $answer->answerformat, $options);
$table->data[] = new html_table_row($cells);
$cells = array();
$cells[] = '<label>' . get_string('matchesanswer', 'lesson') . ' ' . $i . '</label>';
$cells[] = '<label>' . get_string('matchesanswer', 'lesson') . " {$i}</label>: \n";
$cells[] = format_text($answer->response, $answer->responseformat, $options);
$table->data[] = new html_table_row($cells);
}
mod/lesson/pagetypes/multichoice.php
+7 -7
View File
@@ -277,30 +277,30 @@ class lesson_page_type_multichoice extends lesson_page {
$cells = array();
if ($this->lesson->custom && $answer->score > 0) {
// if the score is > 0, then it is correct
$cells[] = '<label class="correct">' . get_string('answer', 'lesson') . ' ' . $i . '</label>';
$cells[] = '<label class="correct">' . get_string('answer', 'lesson') . " {$i}</label>: \n";
} else if ($this->lesson->custom) {
$cells[] = '<label>' . get_string('answer', 'lesson') . ' ' . $i . '</label>';
$cells[] = '<label>' . get_string('answer', 'lesson') . " {$i}</label>: \n";
} else if ($this->lesson->jumpto_is_correct($this->properties->id, $answer->jumpto)) {
// underline correct answers
$cells[] = '<span class="correct">' . get_string('answer', 'lesson') . ' ' . $i . '</span>:' . "\n";
$cells[] = '<span class="correct">' . get_string('answer', 'lesson') . " {$i}</span>: \n";
} else {
$cells[] = '<label class="correct">' . get_string('answer', 'lesson') . ' ' . $i . '</label>';
$cells[] = '<label class="correct">' . get_string('answer', 'lesson') . " {$i}</label>: \n";
}
$cells[] = format_text($answer->answer, $answer->answerformat, $options);
$table->data[] = new html_table_row($cells);
$cells = array();
$cells[] = '<label>' . get_string('response', 'lesson') . ' ' . $i . '</label>';
$cells[] = '<label>' . get_string('response', 'lesson') . " {$i} </label>:\n";
$cells[] = format_text($answer->response, $answer->responseformat, $options);
$table->data[] = new html_table_row($cells);
$cells = array();
$cells[] = '<label>' . get_string('score', 'lesson') . '</label>';
$cells[] = '<label>' . get_string('score', 'lesson') . '</label>:';
$cells[] = $answer->score;
$table->data[] = new html_table_row($cells);
$cells = array();
$cells[] = '<label>' . get_string('jump', 'lesson') . '</label>';
$cells[] = '<label>' . get_string('jump', 'lesson') . '</label>:';
$cells[] = $this->get_jump_name($answer->jumpto);
$table->data[] = new html_table_row($cells);
if ($i === 1){
mod/lesson/pagetypes/numerical.php
+6 -6
View File
@@ -139,30 +139,30 @@ class lesson_page_type_numerical extends lesson_page {
$cells = array();
if ($this->lesson->custom && $answer->score > 0) {
// if the score is > 0, then it is correct
$cells[] = '<label class="correct">' . get_string('answer', 'lesson') . ' ' . $i . ':</label>';
$cells[] = '<label class="correct">' . get_string('answer', 'lesson') . ' ' . $i . '</label>:';
} else if ($this->lesson->custom) {
$cells[] = '<label>' . get_string('answer', 'lesson') . ' ' . $i . ':</label>';
$cells[] = '<label>' . get_string('answer', 'lesson') . ' ' . $i . '</label>:';
} else if ($this->lesson->jumpto_is_correct($this->properties->id, $answer->jumpto)) {
// underline correct answers
$cells[] = '<span class="correct">' . get_string('answer', 'lesson') . ' ' . $i . '</span>:' . "\n";
} else {
$cells[] = '<label class="correct">' . get_string('answer', 'lesson') . ' ' . $i . '</label>';
$cells[] = '<label class="correct">' . get_string('answer', 'lesson') . ' ' . $i . '</label>:';
}
$cells[] = format_text($answer->answer, $answer->answerformat, $options);
$table->data[] = new html_table_row($cells);
$cells = array();
$cells[] = '<label>' . get_string('response', 'lesson') . ' ' . $i . '</label>';
$cells[] = '<label>' . get_string('response', 'lesson') . ' ' . $i . '</label>:';
$cells[] = format_text($answer->response, $answer->responseformat, $options);
$table->data[] = new html_table_row($cells);
$cells = array();
$cells[] = '<label>' . get_string('score', 'lesson') . '</label>';
$cells[] = '<label>' . get_string('score', 'lesson') . '</label>:';
$cells[] = $answer->score;
$table->data[] = new html_table_row($cells);
$cells = array();
$cells[] = '<label>' . get_string('jump', 'lesson') . '</label>';
$cells[] = '<label>' . get_string('jump', 'lesson') . '</label>:';
$cells[] = $this->get_jump_name($answer->jumpto);
$table->data[] = new html_table_row($cells);
if ($i === 1){
mod/lesson/pagetypes/shortanswer.php
+6 -6
View File
@@ -199,30 +199,30 @@ class lesson_page_type_shortanswer extends lesson_page {
$cells = array();
if ($this->lesson->custom && $answer->score > 0) {
// if the score is > 0, then it is correct
$cells[] = '<label class="correct">' . get_string('answer', 'lesson') . ' ' . $i . '</label>';
$cells[] = '<label class="correct">' . get_string('answer', 'lesson') . ' ' . $i . '</label>:';
} else if ($this->lesson->custom) {
$cells[] = '<label>' . get_string('answer', 'lesson') . ' ' . $i . '</label>';
$cells[] = '<label>' . get_string('answer', 'lesson') . ' ' . $i . '</label>:';
} else if ($this->lesson->jumpto_is_correct($this->properties->id, $answer->jumpto)) {
// underline correct answers
$cells[] = '<span class="correct">' . get_string('answer', 'lesson') . ' ' . $i . '</span>:' . "\n";
} else {
$cells[] = '<label class="correct">' . get_string('answer', 'lesson') . ' ' . $i . '</label>';
$cells[] = '<label class="correct">' . get_string('answer', 'lesson') . ' ' . $i . '</label>:';
}
$cells[] = format_text($answer->answer, $answer->answerformat, $options);
$table->data[] = new html_table_row($cells);
$cells = array();
$cells[] = '<label>' . get_string('response', 'lesson') . ' ' . $i . '</label>';
$cells[] = '<label>' . get_string('response', 'lesson') . ' ' . $i . '</label>:';
$cells[] = format_text($answer->response, $answer->responseformat, $options);
$table->data[] = new html_table_row($cells);
$cells = array();
$cells[] = '<label>' . get_string('score', 'lesson') . '</label>';
$cells[] = '<label>' . get_string('score', 'lesson') . '</label>:';
$cells[] = $answer->score;
$table->data[] = new html_table_row($cells);
$cells = array();
$cells[] = '<label>' . get_string('jump', 'lesson') . '</label>';
$cells[] = '<label>' . get_string('jump', 'lesson') . '</label>:';
$cells[] = $this->get_jump_name($answer->jumpto);
$table->data[] = new html_table_row($cells);
if ($i === 1){
mod/lesson/pagetypes/truefalse.php
+7 -7
View File
@@ -124,30 +124,30 @@ class lesson_page_type_truefalse extends lesson_page {
$cells = array();
if ($this->lesson->custom && $answer->score > 0) {
// if the score is > 0, then it is correct
$cells[] = '<label class="correct">' . get_string('answer', 'lesson') . ' ' . $i . '</label>';
$cells[] = '<label class="correct">' . get_string('answer', 'lesson') . " {$i}</label>: \n";
} else if ($this->lesson->custom) {
$cells[] = '<label>' . get_string('answer', 'lesson') . ' ' . $i . '</label>';
$cells[] = '<label>' . get_string('answer', 'lesson') . " {$i}</label>: \n";
} else if ($this->lesson->jumpto_is_correct($this->properties->id, $answer->jumpto)) {
// underline correct answers
$cells[] = '<span class="correct">' . get_string('answer', 'lesson') . ' ' . $i . '</span>:' . "\n";
$cells[] = '<span class="correct">' . get_string('answer', 'lesson') . " {$i}</span>: \n";
} else {
$cells[] = '<label class="correct">' . get_string('answer', 'lesson') . ' ' . $i . '</label>';
$cells[] = '<label class="correct">' . get_string('answer', 'lesson') . " {$i}</label>: \n";
}
$cells[] = format_text($answer->answer, $answer->answerformat, $options);
$table->data[] = new html_table_row($cells);
$cells = array();
$cells[] = '<label>' . get_string('response', 'lesson') . ' ' . $i . '</label>';
$cells[] = '<label>' . get_string('response', 'lesson') . ' ' . $i . '</label>:';
$cells[] = format_text($answer->response, $answer->responseformat, $options);
$table->data[] = new html_table_row($cells);
$cells = array();
$cells[] = '<label>' . get_string('score', 'lesson') . '</label>';
$cells[] = '<label>' . get_string('score', 'lesson') . '</label>:';
$cells[] = $answer->score;
$table->data[] = new html_table_row($cells);
$cells = array();
$cells[] = '<label>' . get_string('jump', 'lesson') . '</label>';
$cells[] = '<label>' . get_string('jump', 'lesson') . '</label>:';
$cells[] = $this->get_jump_name($answer->jumpto);
$table->data[] = new html_table_row($cells);