mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-22 08:30:04 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-72672-master' of https://github.com/junpataleta/moodle

Browse Source
This commit is contained in:
Jun Pataleta 2021-11-04 18:21:46 +08:00
commit 32be3853c3
5 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mod/lesson/locallib.php
View File

@ -947,9 +947,6 @@ function lesson_get_overview_report_table_and_data(lesson $lesson, $currentgroup
$table->align[$colcount - 2] = 'left';
}
$table->wrap = [];
$table->wrap = array_pad($table->wrap, $colcount, 'nowrap');
$table->attributes['class'] = 'table table-striped';
// print out the $studentdata array

20
mod/lesson/pagetypes/multichoice.php
View File

@ -351,7 +351,7 @@ class lesson_page_type_multichoice extends lesson_page {
}
if (in_array($answer->id, $userresponse)) {
// make checked
$data = "<input readonly=\"readonly\" disabled=\"disabled\" name=\"answer[$i]\" checked=\"checked\" type=\"checkbox\" value=\"1\" />";
$checkboxelement = "<input readonly=\"readonly\" disabled=\"disabled\" name=\"answer[$i]\" checked=\"checked\" type=\"checkbox\" value=\"1\" />";
if (!isset($answerdata->response)) {
if ($answer->response == null) {
if ($useranswer->correct) {
@ -374,17 +374,19 @@ class lesson_page_type_multichoice extends lesson_page {
}
} else {
// unchecked
$data = "<input type=\"checkbox\" readonly=\"readonly\" name=\"answer[$i]\" value=\"0\" disabled=\"disabled\" />";
$checkboxelement = "<input type=\"checkbox\" readonly=\"readonly\" name=\"answer[$i]\" value=\"0\" disabled=\"disabled\" />";
}
if (($answer->score > 0 && $this->lesson->custom) || ($this->lesson->jumpto_is_correct($this->properties->id, $answer->jumpto) && !$this->lesson->custom)) {
$data = "<div class=highlight>".$data.' '.format_text($answer->answer,$answer->answerformat,$formattextdefoptions)."</div>";
$answertext = $checkboxelement . format_text($answer->answer, $answer->answerformat, $formattextdefoptions);
$data = "<div class='highlight'><label>$answertext</label></div>";
} else {
$data .= format_text($answer->answer,$answer->answerformat,$formattextdefoptions);
$answertext = $checkboxelement . format_text($answer->answer, $answer->answerformat, $formattextdefoptions);
$data = "<label>$answertext</label>";
}
} else {
if ($useranswer != null and $answer->id == $useranswer->answerid) {
// make checked
$data = "<input readonly=\"readonly\" disabled=\"disabled\" name=\"answer[$i]\" checked=\"checked\" type=\"checkbox\" value=\"1\" />";
$checkboxelement = "<input readonly=\"readonly\" disabled=\"disabled\" name=\"answer[$i]\" checked=\"checked\" type=\"checkbox\" value=\"1\" />";
if ($answer->response == null) {
if ($useranswer->correct) {
$answerdata->response = get_string("thatsthecorrectanswer", "lesson");
@ -403,12 +405,14 @@ class lesson_page_type_multichoice extends lesson_page {
}
} else {
// unchecked
$data = "<input type=\"checkbox\" readonly=\"readonly\" name=\"answer[$i]\" value=\"0\" disabled=\"disabled\" />";
$checkboxelement = "<input type=\"checkbox\" readonly=\"readonly\" name=\"answer[$i]\" value=\"0\" disabled=\"disabled\" />";
}
if (($answer->score > 0 && $this->lesson->custom) || ($this->lesson->jumpto_is_correct($this->properties->id, $answer->jumpto) && !$this->lesson->custom)) {
$data = "<div class=\"highlight\">".$data.' '.format_text($answer->answer,FORMAT_MOODLE,$formattextdefoptions)."</div>";
$answertext = $checkboxelement . format_text($answer->answer, FORMAT_MOODLE, $formattextdefoptions);
$data = "<div class='highlight'><label>$answertext</label></div>";
} else {
$data .= format_text($answer->answer,$answer->answerformat,$formattextdefoptions);
$answertext = $checkboxelement . format_text($answer->answer, $answer->answerformat, $formattextdefoptions);
$data = "<label>$answertext</label>";
}
}
if (isset($pagestats[$this->properties->id][$answer->id])) {

20
mod/lesson/pagetypes/truefalse.php
View File

@ -267,7 +267,7 @@ class lesson_page_type_truefalse extends lesson_page {
}
if (in_array($answer->id, $userresponse)) {
// make checked
$data = "<input readonly=\"readonly\" disabled=\"disabled\" name=\"answer[$i]\" checked=\"checked\" type=\"checkbox\" value=\"1\" />";
$checkboxelement = "<input readonly=\"readonly\" disabled=\"disabled\" name=\"answer[$i]\" checked=\"checked\" type=\"checkbox\" value=\"1\" />";
if (!isset($answerdata->response)) {
if ($answer->response == null) {
if ($useranswer->correct) {
@ -290,17 +290,19 @@ class lesson_page_type_truefalse extends lesson_page {
}
} else {
// unchecked
$data = "<input type=\"checkbox\" readonly=\"readonly\" name=\"answer[$i]\" value=\"0\" disabled=\"disabled\" />";
$checkboxelement = "<input type=\"checkbox\" readonly=\"readonly\" name=\"answer[$i]\" value=\"0\" disabled=\"disabled\" />";
}
if (($answer->score > 0 && $this->lesson->custom) || ($this->lesson->jumpto_is_correct($this->properties->id, $answer->jumpto) && !$this->lesson->custom)) {
$data .= "<div class=highlight>".format_text($answer->answer, $answer->answerformat, $formattextdefoptions)."</div>";
$answertext = $checkboxelement . format_text($answer->answer, $answer->answerformat, $formattextdefoptions);
$data = "<div class='highlight'><label>$answertext</label></div>";
} else {
$data .= format_text($answer->answer, $answer->answerformat, $formattextdefoptions);
$answertext = $checkboxelement . format_text($answer->answer, $answer->answerformat, $formattextdefoptions);
$data = "<label>$answertext</label>";
}
} else {
if ($useranswer != null and $answer->id == $useranswer->answerid) {
// make checked
$data = "<input readonly=\"readonly\" disabled=\"disabled\" name=\"answer[$i]\" checked=\"checked\" type=\"checkbox\" value=\"1\" />";
$checkboxelement = "<input readonly=\"readonly\" disabled=\"disabled\" name=\"answer[$i]\" checked=\"checked\" type=\"checkbox\" value=\"1\" />";
if ($answer->response == null) {
if ($useranswer->correct) {
$answerdata->response = get_string("thatsthecorrectanswer", "lesson");
@ -319,12 +321,14 @@ class lesson_page_type_truefalse extends lesson_page {
}
} else {
// unchecked
$data = "<input type=\"checkbox\" readonly=\"readonly\" name=\"answer[$i]\" value=\"0\" disabled=\"disabled\" />";
$checkboxelement = "<input type=\"checkbox\" readonly=\"readonly\" name=\"answer[$i]\" value=\"0\" disabled=\"disabled\" />";
}
if (($answer->score > 0 && $this->lesson->custom) || ($this->lesson->jumpto_is_correct($this->properties->id, $answer->jumpto) && !$this->lesson->custom)) {
$data .= "<div class=\"highlight\">".format_text($answer->answer, $answer->answerformat, $formattextdefoptions)."</div>";
$answertext = $checkboxelement . format_text($answer->answer, $answer->answerformat, $formattextdefoptions);
$data = "<div class='highlight'><label>$answertext</label></div>";
} else {
$data .= format_text($answer->answer, $answer->answerformat, $formattextdefoptions);
$answertext = $checkboxelement . format_text($answer->answer, $answer->answerformat, $formattextdefoptions);
$data = "<label>$answertext</label>";
}
}
if (isset($pagestats[$this->properties->id][$answer->id])) {

8
mod/lesson/renderer.php
View File

@ -229,11 +229,6 @@ class mod_lesson_renderer extends plugin_renderer_base {
$table = new html_table();
$table->head = array(get_string('pagetitle', 'lesson'), get_string('qtype', 'lesson'), get_string('jumps', 'lesson'), get_string('actions', 'lesson'));
$table->align = array('left', 'left', 'left', 'center');
$table->wrap = array('', 'nowrap', '', 'nowrap');
$table->tablealign = 'center';
$table->cellspacing = 0;
$table->cellpadding = '2px';
$table->width = '80%';
$table->data = array();
$canedit = has_capability('mod/lesson:edit', context_module::instance($this->page->cm->id));
@ -258,7 +253,7 @@ class mod_lesson_renderer extends plugin_renderer_base {
$pageid = $page->nextpageid;
}
return html_writer::table($table);
return html_writer::div(html_writer::table($table), 'table-responsive');
}
/**
@ -458,6 +453,7 @@ class mod_lesson_renderer extends plugin_renderer_base {
$addpageurl = new moodle_url('/mod/lesson/editpage.php', array('id'=>$this->page->cm->id, 'pageid'=>$page->id, 'sesskey'=>sesskey()));
$addpageselect = new single_select($addpageurl, 'qtype', $options, null, array(''=>get_string('addanewpage', 'lesson').'...'), 'addpageafter'.$page->id);
$addpageselect->attributes = ['aria-label' => get_string('actions', 'lesson')];
$addpageselector = $this->output->render($addpageselect);
}

6
mod/lesson/report.php
View File

@ -140,7 +140,7 @@ if ($action === 'delete') {
}
// The attempts table.
$attemptstable = html_writer::table($table);
$attemptstable = html_writer::div(html_writer::table($table), 'table-responsive');
// The HTML that we will be displaying which includes the attempts table and bulk actions menu, if necessary.
$attemptshtml = $attemptstable;
@ -227,7 +227,6 @@ if ($action === 'delete') {
get_string('highscore', 'lesson'), get_string('lowscore', 'lesson'),
get_string('hightime', 'lesson'), get_string('lowtime', 'lesson'));
$stattable->align = array('center', 'center', 'center', 'center', 'center', 'center');
$stattable->wrap = array('nowrap', 'nowrap', 'nowrap', 'nowrap', 'nowrap', 'nowrap');
$stattable->attributes['class'] = 'standardtable generaltable';
$stattable->data[] = array($data->avescore, $data->avetime, $data->highscore, $data->lowscore, $data->hightime, $data->lowtime);
@ -238,7 +237,6 @@ if ($action === 'delete') {
$stattable->head = array(get_string('averagetime', 'lesson'), get_string('hightime', 'lesson'),
get_string('lowtime', 'lesson'));
$stattable->align = array('center', 'center', 'center');
$stattable->wrap = array('nowrap', 'nowrap', 'nowrap');
$stattable->attributes['class'] = 'standardtable generaltable';
$stattable->data[] = array($data->avetime, $data->hightime, $data->lowtime);
}
@ -354,7 +352,7 @@ if ($action === 'delete') {
} else {
$table->data[] = array(get_string('didnotanswerquestion', 'lesson'), " ");
}
echo html_writer::start_tag('div', array('class' => 'no-overflow'));
echo html_writer::start_tag('div', ['class' => 'no-overflow table-responsive']);
echo html_writer::table($table);
echo html_writer::end_tag('div');
}