mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-20 07:56:06 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jun Pataleta 2022-07-05 22:14:00 +08:00
commit 1a74206dbc
10 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mod/feedback/analysis_course.php
View File

@ -118,7 +118,7 @@ if ($courseitemfilter > 0) {
echo '<tr>';
echo '<td>'.$shortname.'</td>';
echo '<td align="right">';
echo '<td class="text-right">';
echo format_float(($c->sumvalue / $c->countvalue), 2);
echo '</td>';
echo '</tr>';

2
mod/feedback/complete.php
View File

@ -122,7 +122,7 @@ if ($feedbackcompletion->is_empty()) {
'generalbox boxaligncenter');
}
if (!$PAGE->has_secondary_navigation() && $feedbackcompletion->can_view_analysis()) {
echo '<p align="center">';
echo '<p class="text-center">';
$analysisurl = new moodle_url('/mod/feedback/analysis.php', array('id' => $cm->id, 'courseid' => $courseid));
echo html_writer::link($analysisurl, get_string('completed_feedbacks', 'feedback'));
echo '</p>';

4
mod/feedback/item/info/lib.php
View File

@ -157,7 +157,7 @@ class feedback_item_info extends feedback_item_base {
$analysed_item = $this->get_analysed($item, $groupid, $courseid);
$data = $analysed_item->data;
if (is_array($data)) {
echo '<tr><th colspan="2" align="left">';
echo '<tr><th class="text-left">';
echo $itemnr . ' ';
if (strval($item->label) !== '') {
echo '('. format_string($item->label).') ';
@ -167,7 +167,7 @@ class feedback_item_info extends feedback_item_base {
$sizeofdata = count($data);
for ($i = 0; $i < $sizeofdata; $i++) {
$class = strlen(trim($data[$i]->show)) ? '' : ' class="isempty"';
echo '<tr'.$class.'><td colspan="2" class="singlevalue">';
echo '<tr'.$class.'><td class="singlevalue">';
echo str_replace("\n", '<br />', $data[$i]->show);
echo '</td></tr>';
}

7
mod/feedback/item/multichoice/lib.php
View File

@ -209,14 +209,14 @@ class feedback_item_multichoice extends feedback_item_base {
if ($analysed_item) {
$itemname = $analysed_item[1];
echo "<table class=\"analysis itemtype_{$item->typ}\">";
echo '<tr><th colspan="2" align="left">';
echo '<tr><th class="text-left">';
echo $itemnr . ' ';
if (strval($item->label) !== '') {
echo '('. format_string($item->label).') ';
}
echo format_string($itemname);
echo '</th></tr>';
echo "</table>";
$analysed_vals = $analysed_item[2];
$count = 0;
$data = [];
@ -241,7 +241,8 @@ class feedback_item_multichoice extends feedback_item_base {
$chart->add_series($series);
$chart->set_labels($data['labels']);
echo $OUTPUT->render($chart);
echo '<tr><td>'. $OUTPUT->render($chart) . '</td></tr>';
echo "</table>";
}
}

9
mod/feedback/item/multichoicerated/lib.php
View File

@ -180,14 +180,13 @@ class feedback_item_multichoicerated extends feedback_item_base {
$analysed_item = $this->get_analysed($item, $groupid, $courseid);
if ($analysed_item) {
echo "<table class=\"analysis itemtype_{$item->typ}\">";
echo '<tr><th colspan="2" align="left">';
echo '<tr><th class="text-left">';
echo $itemnr . ' ';
if (strval($item->label) !== '') {
echo '('. format_string($item->label).') ';
}
echo format_string($analysed_item[1]);
echo '</th></tr>';
echo '</table>';
$analysed_vals = $analysed_item[2];
$avg = 0.0;
$count = 0;
@ -215,12 +214,12 @@ class feedback_item_multichoicerated extends feedback_item_base {
$series->set_labels($data['series_labels']);
$chart->add_series($series);
$chart->set_labels($data['labels']);
echo $OUTPUT->render($chart);
echo '<tr><td>'. $OUTPUT->render($chart) . '</td></tr>';
$avg = format_float($avg, 2);
echo '<tr><td align="left" colspan="2"><b>';
echo '<tr><td class="text-left"><b>';
echo get_string('average', 'feedback').': '.$avg.'</b>';
echo '</td></tr>';
echo '</table>';
}
}

6
mod/feedback/item/numeric/lib.php
View File

@ -144,7 +144,7 @@ class feedback_item_numeric extends feedback_item_base {
if (isset($values->data) AND is_array($values->data)) {
echo "<table class=\"analysis itemtype_{$item->typ}\">";
echo '<tr><th colspan="2" align="left">';
echo '<tr><th class="text-left">';
echo $itemnr . ' ';
if (strval($item->label) !== '') {
echo '('. format_string($item->label).') ';
@ -153,7 +153,7 @@ class feedback_item_numeric extends feedback_item_base {
echo '</th></tr>';
foreach ($values->data as $value) {
echo '<tr><td colspan="2" class="singlevalue">';
echo '<tr><td class="singlevalue">';
echo $this->format_float($value);
echo '</td></tr>';
}
@ -163,7 +163,7 @@ class feedback_item_numeric extends feedback_item_base {
} else {
$avg = '-';
}
echo '<tr><td colspan="2"><b>';
echo '<tr><td><b>';
echo get_string('average', 'feedback').': '.$avg;
echo '</b></td></tr>';
echo '</table>';

4
mod/feedback/item/textarea/lib.php
View File

@ -135,7 +135,7 @@ class feedback_item_textarea extends feedback_item_base {
$values = feedback_get_group_values($item, $groupid, $courseid);
if ($values) {
echo "<table class=\"analysis itemtype_{$item->typ}\">";
echo '<tr><th colspan="2" align="left">';
echo '<tr><th class="text-left">';
echo $itemnr . ' ';
if (strval($item->label) !== '') {
echo '('. format_string($item->label).') ';
@ -145,7 +145,7 @@ class feedback_item_textarea extends feedback_item_base {
foreach ($values as $value) {
$class = strlen(trim($value->value)) ? '' : ' class="isempty"';
echo '<tr'.$class.'>';
echo '<td colspan="2" class="singlevalue">';
echo '<td class="singlevalue">';
echo str_replace("\n", '<br />', $value->value);
echo '</td>';
echo '</tr>';

4
mod/feedback/item/textfield/lib.php
View File

@ -131,7 +131,7 @@ class feedback_item_textfield extends feedback_item_base {
$values = feedback_get_group_values($item, $groupid, $courseid);
if ($values) {
echo "<table class=\"analysis itemtype_{$item->typ}\">";
echo '<tr><th colspan="2" align="left">';
echo '<tr><th class="text-left">';
echo $itemnr . ' ';
if (strval($item->label) !== '') {
echo '('. format_string($item->label).') ';
@ -140,7 +140,7 @@ class feedback_item_textfield extends feedback_item_base {
echo '</th></tr>';
foreach ($values as $value) {
$class = strlen(trim($value->value)) ? '' : ' class="isempty"';
echo '<tr'.$class.'><td colspan="2" class="singlevalue">';
echo '<tr'.$class.'><td class="singlevalue">';
echo str_replace("\n", '<br />', $value->value);
echo '</td></tr>';
}

2
mod/feedback/lib.php
View File

@ -489,7 +489,7 @@ function feedback_print_recent_mod_activity($activity, $courseid, $detail, $modn
echo '<table border="0" cellpadding="3" cellspacing="0" class="forum-recent">';
echo "<tr><td class=\"userpicture\" valign=\"top\">";
echo "<tr><td class=\"userpicture align-top\">";
echo $OUTPUT->user_picture($activity->user, array('courseid'=>$courseid));
echo "</td><td>";

4
mod/feedback/tests/behat/behat_mod_feedback.php
View File

@ -149,8 +149,8 @@ class behat_mod_feedback extends behat_base {
*/
public function i_show_chart_data_for_the_feedback($feedbackname) {
$feedbackxpath = "//th[contains(normalize-space(string(.)), \"" . $feedbackname . "\")]/ancestor::table/" .
"following-sibling::div[contains(concat(' ', normalize-space(@class), ' '), ' chart-area ')][1]" .
$feedbackxpath = "//th[contains(normalize-space(string(.)), \"" . $feedbackname . "\")]/ancestor::table//" .
"div[contains(concat(' ', normalize-space(@class), ' '), ' chart-table ')]" .
"//p[contains(concat(' ', normalize-space(@class), ' '), ' chart-table-expand ') and ".
"//a[contains(normalize-space(string(.)), '".get_string('showchartdata')."')]]";