diff --git a/mod/feedback/analysis.php b/mod/feedback/analysis.php index 3cf894f0eab..2b8e76b93d1 100644 --- a/mod/feedback/analysis.php +++ b/mod/feedback/analysis.php @@ -95,7 +95,7 @@ echo '
'; if ($check_anonymously) { // Print the items in an analysed form. foreach ($items as $item) { - echo ''; + echo "
typ}\">"; $itemobj = feedback_get_item_class($item->typ); $printnr = ($feedback->autonumbering && $item->itemnr) ? ($item->itemnr . '.') : ''; $itemobj->print_analysed($item, $printnr, $mygroupid); diff --git a/mod/feedback/item/info/lib.php b/mod/feedback/item/info/lib.php index dda6a2fe1fc..10824f24ea9 100644 --- a/mod/feedback/item/info/lib.php +++ b/mod/feedback/item/info/lib.php @@ -150,7 +150,7 @@ class feedback_item_info extends feedback_item_base { echo ''; $sizeofdata = count($data); for ($i = 0; $i < $sizeofdata; $i++) { - echo ''; } diff --git a/mod/feedback/item/multichoice/lib.php b/mod/feedback/item/multichoice/lib.php index 3436db81e99..b58b30abbf8 100644 --- a/mod/feedback/item/multichoice/lib.php +++ b/mod/feedback/item/multichoice/lib.php @@ -230,10 +230,10 @@ class feedback_item_multichoice extends feedback_item_base { $str_quotient = ' ('. $quotient . ' %)'; } echo ''; - echo ' - '; - echo ''; - echo ''; foreach ($values->data as $value) { - echo ''; } @@ -161,7 +161,7 @@ class feedback_item_numeric extends feedback_item_base { } else { $avg = '-'; } - echo ''; } diff --git a/mod/feedback/item/textarea/lib.php b/mod/feedback/item/textarea/lib.php index 8d4fe9e1b59..c9198b1d28e 100644 --- a/mod/feedback/item/textarea/lib.php +++ b/mod/feedback/item/textarea/lib.php @@ -141,9 +141,9 @@ class feedback_item_textarea extends feedback_item_base { echo format_text($item->name, FORMAT_HTML, array('noclean' => true, 'para' => false)); echo ''; foreach ($values as $value) { - echo ''; - echo ''; echo ''; diff --git a/mod/feedback/item/textfield/lib.php b/mod/feedback/item/textfield/lib.php index befd5ff1f00..dbff6a6da0d 100644 --- a/mod/feedback/item/textfield/lib.php +++ b/mod/feedback/item/textfield/lib.php @@ -137,8 +137,9 @@ class feedback_item_textfield extends feedback_item_base { echo $this->get_display_name($item); echo ''; foreach ($values as $value) { - echo ''; } } diff --git a/mod/feedback/styles.css b/mod/feedback/styles.css index a13708f109e..741b3275bde 100644 --- a/mod/feedback/styles.css +++ b/mod/feedback/styles.css @@ -140,15 +140,40 @@ body.dir-rtl.path-mod-feedback #region-main .mform.feedback_form .femptylabel .f float: right; } -.path-mod-feedback table.analysis { - width: 100%; -} - .path-mod-feedback .templateslist td.cell.action, .path-mod-feedback .templateslist th.header.action { width: 10%; } +/* Analysis page */ +.path-mod-feedback table.analysis { + width: 100%; + border-top: 1px solid #aaaaaa; + margin-top: 10px; +} + +.path-mod-feedback table.analysis tr:first-child th { + padding-top:10px; +} + +.path-mod-feedback table.analysis tr:hover { + background: #f5f5f5; +} + +.path-mod-feedback table.analysis td.singlevalue:before, +.path-mod-feedback table.analysis td.optionname:before { + content:'- '; +} + +.path-mod-feedback table.analysis.itemtype_textarea td { + padding: 4px 0; +} + +.path-mod-feedback table.analysis tr.isempty { + display:none; +} + +/* Responses list */ .path-mod-feedback #showentrytable td.cell.completed_timemodified, .path-mod-feedback #showentryanontable td.cell.random_response { font-weight: bold;
-  '; + echo '
'; echo str_replace("\n", '
', $data[$i]->show); echo '
- - '.format_text(trim($val->answertext), FORMAT_HTML, array('noclean' => true, 'para' => false)).': + echo '' . + format_text(trim($val->answertext), FORMAT_HTML, array('noclean' => true, 'para' => false)).': + '. ' '.$val->answercount.$str_quotient.' diff --git a/mod/feedback/item/multichoicerated/lib.php b/mod/feedback/item/multichoicerated/lib.php index f728fdf7b62..6e59f1ef75d 100644 --- a/mod/feedback/item/multichoicerated/lib.php +++ b/mod/feedback/item/multichoicerated/lib.php @@ -199,10 +199,10 @@ class feedback_item_multichoicerated extends feedback_item_base { $avg += $val->avg; $quotient = format_float($val->quotient * 100, 2); echo '
'; - echo '- ('.$val->value.') '. + echo ''; + echo '('.$val->value.') '. format_text(trim($val->answertext), FORMAT_HTML, array('noclean' => true, 'para' => false)).':'; + echo ''; echo ''; echo ' '; echo $val->answercount; diff --git a/mod/feedback/item/numeric/lib.php b/mod/feedback/item/numeric/lib.php index 04968ecebba..fb5f6fc5698 100644 --- a/mod/feedback/item/numeric/lib.php +++ b/mod/feedback/item/numeric/lib.php @@ -151,8 +151,8 @@ class feedback_item_numeric extends feedback_item_base { echo '
'; - echo '-  '.$this->format_float($value); + echo '
'; + echo $this->format_float($value); echo '
'; + echo '
'; echo get_string('average', 'feedback').': '.$avg; echo '
'; - echo '-  '; + $class = strlen(trim($value->value)) ? '' : ' class="isempty"'; + echo ''; + echo ''; echo str_replace("\n", '
', $value->value); echo '
'; - echo '-  '.str_replace("\n", '
', $value->value); + $class = strlen(trim($value->value)) ? '' : ' class="isempty"'; + echo '
'; + echo str_replace("\n", '
', $value->value); echo '