Skip to content

Commit

Permalink
Merge branch 'MDL-72672-310' of https://github.com/junpataleta/moodle …
Browse files Browse the repository at this point in the history 
…into MOODLE_310_STABLE
  • Loading branch information
@junpataleta
junpataleta committed Nov 4, 2021
2 parents 1e95685 + cb57a65 commit 6e8eb03
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 29 deletions.
3 changes: 0 additions & 3 deletions mod/lesson/locallib.php
View file
Expand Up @@ -941,9 +941,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
Expand Down
20 changes: 12 additions & 8 deletions mod/lesson/pagetypes/multichoice.php
View file
Expand Up @@ -351,7 +351,7 @@ public function report_answers($answerpage, $answerdata, $useranswer, $pagestats
}
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) {
Expand All @@ -374,17 +374,19 @@ public function report_answers($answerpage, $answerdata, $useranswer, $pagestats
}
} 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");
Expand All @@ -403,12 +405,14 @@ public function report_answers($answerpage, $answerdata, $useranswer, $pagestats
}
} 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])) {
Expand Down
20 changes: 12 additions & 8 deletions mod/lesson/pagetypes/truefalse.php
View file
Expand Up @@ -267,7 +267,7 @@ public function report_answers($answerpage, $answerdata, $useranswer, $pagestats
}
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) {
Expand All @@ -290,17 +290,19 @@ public function report_answers($answerpage, $answerdata, $useranswer, $pagestats
}
} 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");
Expand All @@ -319,12 +321,14 @@ public function report_answers($answerpage, $answerdata, $useranswer, $pagestats
}
} 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])) {
Expand Down
8 changes: 2 additions & 6 deletions mod/lesson/renderer.php
View file
Expand Up @@ -222,11 +222,6 @@ public function display_edit_collapsed(lesson $lesson, $pageid) {
$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));
Expand All @@ -251,7 +246,7 @@ public function display_edit_collapsed(lesson $lesson, $pageid) {
$pageid = $page->nextpageid;
}

return html_writer::table($table);
return html_writer::div(html_writer::table($table), 'table-responsive');
}

/**
Expand Down Expand Up @@ -451,6 +446,7 @@ public function page_action_links(lesson_page $page, $printmove, $printaddpage=f

$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);
}

Expand Down
6 changes: 2 additions & 4 deletions mod/lesson/report.php
View file
Expand Up @@ -140,7 +140,7 @@
}

// 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;
Expand Down Expand Up @@ -227,7 +227,6 @@
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);

Expand All @@ -238,7 +237,6 @@
$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);
}
Expand Down Expand Up @@ -354,7 +352,7 @@
} 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');
}
Expand Down

0 comments on commit 6e8eb03

Please sign in to comment.