mirror of
https://github.com/moodle/moodle.git
synced 2025-08-08 02:16:41 +02:00
fixed issue MDL-14531
added an option to switch autonumbering on or off
This commit is contained in:
agrabs
parent
914061abe1
commit
efc5916754
22 changed files with 74 additions and 52 deletions
|
|
@ -38,7 +38,7 @@ class feedback_item_captcha extends feedback_item_base {
|
|||
return '';
|
||||
}
|
||||
|
||||
function print_analysed($item, $itemnr = 0, $groupid = false, $courseid = false) {
|
||||
function print_analysed($item, $itemnr = '', $groupid = false, $courseid = false) {
|
||||
return $itemnr;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -51,12 +51,12 @@ class feedback_item_base {
|
|||
|
||||
/**
|
||||
* @param $item the db-object from feedback_item
|
||||
* @param integer $itemnr
|
||||
* @param string $itemnr
|
||||
* @param integer $groupid
|
||||
* @param integer $courseid
|
||||
* @return integer the new itemnr
|
||||
*/
|
||||
function print_analysed($item, $itemnr = 0, $groupid = false, $courseid = false) {
|
||||
function print_analysed($item, $itemnr = '', $groupid = false, $courseid = false) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -133,7 +133,7 @@ class feedback_item_multichoice extends feedback_item_base {
|
|||
return $printval;
|
||||
}
|
||||
|
||||
function print_analysed($item, $itemnr = 0, $groupid = false, $courseid = false) {
|
||||
function print_analysed($item, $itemnr = '', $groupid = false, $courseid = false) {
|
||||
$sep_dec = get_string('separator_decimal', 'feedback');
|
||||
if(substr($sep_dec, 0, 2) == '[['){
|
||||
$sep_dec = FEEDBACK_DECIMAL;
|
||||
|
|
@ -146,9 +146,9 @@ class feedback_item_multichoice extends feedback_item_base {
|
|||
|
||||
$analysedItem = $this->get_analysed($item, $groupid, $courseid);
|
||||
if($analysedItem) {
|
||||
$itemnr++;
|
||||
// $itemnr++;
|
||||
$itemname = stripslashes($analysedItem[1]);
|
||||
echo '<tr><th colspan="2" align="left">'. $itemnr . '.) ' . $itemname .'</th></tr>';
|
||||
echo '<tr><th colspan="2" align="left">'. $itemnr . ' ' . $itemname .'</th></tr>';
|
||||
$analysedVals = $analysedItem[2];
|
||||
$pixnr = 0;
|
||||
foreach($analysedVals as $val) {
|
||||
|
|
@ -164,7 +164,7 @@ class feedback_item_multichoice extends feedback_item_base {
|
|||
echo '<tr><td align="left" valign="top">- ' . trim($val->answertext) . ':</td><td align="left" style="width: '.FEEDBACK_MAX_PIX_LENGTH.'"><img alt="'.$intvalue.'" src="'.$pix.'" height="5" width="'.$pixwidth.'" /> ' . $val->answercount . (($val->quotient > 0)?' ('. $quotient . ' %)':'').'</td></tr>';
|
||||
}
|
||||
}
|
||||
return $itemnr;
|
||||
// return $itemnr;
|
||||
}
|
||||
|
||||
function excelprint_item(&$worksheet, $rowOffset, $item, $groupid, $courseid = false) {
|
||||
|
|
|
|||
|
|
@ -109,7 +109,7 @@ class feedback_item_multichoicerated extends feedback_item_base {
|
|||
return $printval;
|
||||
}
|
||||
|
||||
function print_analysed($item, $itemnr = 0, $groupid = false, $courseid = false) {
|
||||
function print_analysed($item, $itemnr = '', $groupid = false, $courseid = false) {
|
||||
$sep_dec = get_string('separator_decimal', 'feedback');
|
||||
if(substr($sep_dec, 0, 2) == '[['){
|
||||
$sep_dec = FEEDBACK_DECIMAL;
|
||||
|
|
@ -123,8 +123,8 @@ class feedback_item_multichoicerated extends feedback_item_base {
|
|||
$analysedItem = $this->get_analysed($item, $groupid, $courseid);
|
||||
if($analysedItem) {
|
||||
//echo '<table>';
|
||||
$itemnr++;
|
||||
echo '<tr><th colspan="2" align="left">'. $itemnr . '.) ' . stripslashes($analysedItem[1]) .'</th></tr>';
|
||||
// $itemnr++;
|
||||
echo '<tr><th colspan="2" align="left">'. $itemnr . ' ' . stripslashes($analysedItem[1]) .'</th></tr>';
|
||||
$analysedVals = $analysedItem[2];
|
||||
$pixnr = 0;
|
||||
$avg = 0.0;
|
||||
|
|
@ -146,7 +146,7 @@ class feedback_item_multichoicerated extends feedback_item_base {
|
|||
echo '<tr><td align="left" colspan="2"><b>'.get_string('average', 'feedback').': '.$avg.'</b></td></tr>';
|
||||
//echo '</table>';
|
||||
}
|
||||
return $itemnr;
|
||||
// return $itemnr;
|
||||
}
|
||||
|
||||
function excelprint_item(&$worksheet, $rowOffset, $item, $groupid, $courseid = false) {
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ class feedback_item_numeric extends feedback_item_base {
|
|||
return $value->value;
|
||||
}
|
||||
|
||||
function print_analysed($item, $itemnr = 0, $groupid = false, $courseid = false) {
|
||||
function print_analysed($item, $itemnr = '', $groupid = false, $courseid = false) {
|
||||
$sep_dec = get_string('separator_decimal', 'feedback');
|
||||
if(substr($sep_dec, 0, 2) == '[['){
|
||||
$sep_dec = FEEDBACK_DECIMAL;
|
||||
|
|
@ -84,16 +84,20 @@ class feedback_item_numeric extends feedback_item_base {
|
|||
|
||||
if(isset($values->data) AND is_array($values->data)) {
|
||||
//echo '<table>';2
|
||||
$itemnr++;
|
||||
echo '<tr><th colspan="2" align="left">'. $itemnr . '.) ' . stripslashes($item->name) .'</th></tr>';
|
||||
// $itemnr++;
|
||||
echo '<tr><th colspan="2" align="left">'. $itemnr . ' ' . stripslashes($item->name) .'</th></tr>';
|
||||
foreach($values->data as $value) {
|
||||
echo '<tr><td colspan="2" valign="top" align="left">- ' . $value . '</td></tr>';
|
||||
}
|
||||
//echo '</table>';
|
||||
$avg = number_format($values->avg, 2, $sep_dec, $sep_thous);
|
||||
if(isset($values->avg)) {
|
||||
$avg = number_format($values->avg, 2, $sep_dec, $sep_thous);
|
||||
} else {
|
||||
$avg = number_format(0, 2, $sep_dec, $sep_thous);
|
||||
}
|
||||
echo '<tr><td align="left" colspan="2"><b>'.get_string('average', 'feedback').': '.$avg.'</b></td></tr>';
|
||||
}
|
||||
return $itemnr;
|
||||
// return $itemnr;
|
||||
}
|
||||
|
||||
function excelprint_item(&$worksheet, $rowOffset, $item, $groupid, $courseid = false) {
|
||||
|
|
|
|||
|
|
@ -58,18 +58,18 @@ class feedback_item_textarea extends feedback_item_base {
|
|||
return $value->value;
|
||||
}
|
||||
|
||||
function print_analysed($item, $itemnr = 0, $groupid = false, $courseid = false) {
|
||||
function print_analysed($item, $itemnr = '', $groupid = false, $courseid = false) {
|
||||
$values = feedback_get_group_values($item, $groupid, $courseid);
|
||||
if($values) {
|
||||
//echo '<table>';2
|
||||
$itemnr++;
|
||||
echo '<tr><th colspan="2" align="left">'. $itemnr . '.) ' . stripslashes_safe($item->name) .'</th></tr>';
|
||||
// $itemnr++;
|
||||
echo '<tr><th colspan="2" align="left">'. $itemnr . ' ' . stripslashes_safe($item->name) .'</th></tr>';
|
||||
foreach($values as $value) {
|
||||
echo '<tr><td valign="top" align="left">- </td><td align="left" valign="top">' . str_replace("\n", '<br />', $value->value) . '</td></tr>';
|
||||
}
|
||||
//echo '</table>';
|
||||
}
|
||||
return $itemnr;
|
||||
// return $itemnr;
|
||||
}
|
||||
|
||||
function excelprint_item(&$worksheet, $rowOffset, $item, $groupid, $courseid = false) {
|
||||
|
|
|
|||
|
|
@ -57,18 +57,18 @@ class feedback_item_textfield extends feedback_item_base {
|
|||
return $value->value;
|
||||
}
|
||||
|
||||
function print_analysed($item, $itemnr = 0, $groupid = false, $courseid = false) {
|
||||
function print_analysed($item, $itemnr = '', $groupid = false, $courseid = false) {
|
||||
$values = feedback_get_group_values($item, $groupid, $courseid);
|
||||
if($values) {
|
||||
//echo '<table>';2
|
||||
$itemnr++;
|
||||
echo '<tr><th colspan="2" align="left">'. $itemnr . '.) ' . stripslashes_safe($item->name) .'</th></tr>';
|
||||
// $itemnr++;
|
||||
echo '<tr><th colspan="2" align="left">'. $itemnr . ' ' . stripslashes_safe($item->name) .'</th></tr>';
|
||||
foreach($values as $value) {
|
||||
echo '<tr><td colspan="2" valign="top" align="left">- ' . str_replace("\n", '<br />', $value->value) . '</td></tr>';
|
||||
}
|
||||
//echo '</table>';
|
||||
}
|
||||
return $itemnr;
|
||||
// return $itemnr;
|
||||
}
|
||||
|
||||
function excelprint_item(&$worksheet, $rowOffset, $item, $groupid, $courseid = false) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue